46e049d0ce
This patch implements the vector types (i.e:`float2`) by making heavy usage of templating. All vector functions are now outside of the vector classes (inside the `blender::math` namespace) and are not vector size dependent for the most part. In the ongoing effort to make shaders less GL centric, we are aiming to share more code between GLSL and C++ to avoid code duplication. ####Motivations: - We are aiming to share UBO and SSBO structures between GLSL and C++. This means we will use many of the existing vector types and others we currently don't have (uintX, intX). All these variations were asking for many more code duplication. - Deduplicate existing code which is duplicated for each vector size. - We also want to share small functions. Which means that vector functions should be static and not in the class namespace. - Reduce friction to use these types in new projects due to their incompleteness. - The current state of the `BLI_(float|double|mpq)(2|3|4).hh` is a bit of a let down. Most clases are incomplete, out of sync with each others with different codestyles, and some functions that should be static are not (i.e: `float3::reflect()`). ####Upsides: - Still support `.x, .y, .z, .w` for readability. - Compact, readable and easilly extendable. - All of the vector functions are available for all the vectors types and can be restricted to certain types. Also template specialization let us define exception for special class (like mpq). - With optimization ON, the compiler unroll the loops and performance is the same. ####Downsides: - Might impact debugability. Though I would arge that the bugs are rarelly caused by the vector class itself (since the operations are quite trivial) but by the type conversions. - Might impact compile time. I did not saw a significant impact since the usage is not really widespread. - Functions needs to be rewritten to support arbitrary vector length. For instance, one can't call `len_squared_v3v3` in `math::length_squared()` and call it a day. - Type cast does not work with the template version of the `math::` vector functions. Meaning you need to manually cast `float *` and `(float *)[3]` to `float3` for the function calls. i.e: `math::distance_squared(float3(nearest.co), positions[i]);` - Some parts might loose in readability: `float3::dot(v1.normalized(), v2.normalized())` becoming `math::dot(math::normalize(v1), math::normalize(v2))` But I propose, when appropriate, to use `using namespace blender::math;` on function local or file scope to increase readability. `dot(normalize(v1), normalize(v2))` ####Consideration: - Include back `.length()` method. It is quite handy and is more C++ oriented. - I considered the GLM library as a candidate for replacement. It felt like too much for what we need and would be difficult to extend / modify to our needs. - I used Macros to reduce code in operators declaration and potential copy paste bugs. This could reduce debugability and could be reverted. - This touches `delaunay_2d.cc` and the intersection code. I would like to know @howardt opinion on the matter. - The `noexcept` on the copy constructor of `mpq(2|3)` is being removed. But according to @JacquesLucke it is not a real problem for now. I would like to give a huge thanks to @JacquesLucke who helped during this and pushed me to reduce the duplication further. Reviewed By: brecht, sergey, JacquesLucke Differential Revision: https://developer.blender.org/D13791
131 lines
3.4 KiB
C++
131 lines
3.4 KiB
C++
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Copyright 2011, Blender Foundation.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "BLI_math_vec_types.hh"
|
|
|
|
#include "DNA_vec_types.h"
|
|
|
|
namespace blender::compositor {
|
|
|
|
using Size2f = float2;
|
|
|
|
enum class eExecutionModel {
|
|
/**
|
|
* Operations are executed from outputs to inputs grouped in execution groups and rendered
|
|
* in tiles.
|
|
*/
|
|
Tiled,
|
|
/** Operations are fully rendered in order from inputs to outputs. */
|
|
FullFrame
|
|
};
|
|
|
|
enum class eDimension { X, Y };
|
|
|
|
/**
|
|
* \brief possible data types for sockets
|
|
* \ingroup Model
|
|
*/
|
|
enum class DataType {
|
|
/** \brief Value data type */
|
|
Value = 0,
|
|
/** \brief Vector data type */
|
|
Vector = 1,
|
|
/** \brief Color data type */
|
|
Color = 2,
|
|
};
|
|
|
|
/**
|
|
* Utility to get the number of channels of the given data type.
|
|
*/
|
|
constexpr int COM_data_type_num_channels(const DataType datatype)
|
|
{
|
|
switch (datatype) {
|
|
case DataType::Value:
|
|
return 1;
|
|
case DataType::Vector:
|
|
return 3;
|
|
case DataType::Color:
|
|
default:
|
|
return 4;
|
|
}
|
|
}
|
|
|
|
constexpr int COM_data_type_bytes_len(DataType data_type)
|
|
{
|
|
return COM_data_type_num_channels(data_type) * sizeof(float);
|
|
}
|
|
|
|
constexpr int COM_DATA_TYPE_VALUE_CHANNELS = COM_data_type_num_channels(DataType::Value);
|
|
constexpr int COM_DATA_TYPE_VECTOR_CHANNELS = COM_data_type_num_channels(DataType::Vector);
|
|
constexpr int COM_DATA_TYPE_COLOR_CHANNELS = COM_data_type_num_channels(DataType::Color);
|
|
|
|
constexpr float COM_COLOR_TRANSPARENT[4] = {0.0f, 0.0f, 0.0f, 0.0f};
|
|
constexpr float COM_VECTOR_ZERO[3] = {0.0f, 0.0f, 0.0f};
|
|
constexpr float COM_COLOR_BLACK[4] = {0.0f, 0.0f, 0.0f, 1.0f};
|
|
constexpr float COM_VALUE_ZERO[1] = {0.0f};
|
|
constexpr float COM_VALUE_ONE[1] = {1.0f};
|
|
|
|
/**
|
|
* Utility to get data type for given number of channels.
|
|
*/
|
|
constexpr DataType COM_num_channels_data_type(const int num_channels)
|
|
{
|
|
switch (num_channels) {
|
|
case 1:
|
|
return DataType::Value;
|
|
case 3:
|
|
return DataType::Vector;
|
|
case 4:
|
|
default:
|
|
return DataType::Color;
|
|
}
|
|
}
|
|
|
|
/* Configurable items.
|
|
*
|
|
* Chunk size determination.
|
|
*
|
|
* Chunk order. */
|
|
/**
|
|
* \brief The order of chunks to be scheduled
|
|
* \ingroup Execution
|
|
*/
|
|
enum class ChunkOrdering {
|
|
/** \brief order from a distance to centerX/centerY */
|
|
CenterOut = 0,
|
|
/** \brief order randomly */
|
|
Random = 1,
|
|
/** \brief no ordering */
|
|
TopDown = 2,
|
|
/** \brief experimental ordering with 9 hot-spots. */
|
|
RuleOfThirds = 3,
|
|
|
|
Default = ChunkOrdering::CenterOut,
|
|
};
|
|
|
|
constexpr float COM_PREVIEW_SIZE = 140.f;
|
|
constexpr float COM_RULE_OF_THIRDS_DIVIDER = 100.0f;
|
|
constexpr float COM_BLUR_BOKEH_PIXELS = 512;
|
|
|
|
constexpr rcti COM_AREA_NONE = {0, 0, 0, 0};
|
|
constexpr rcti COM_CONSTANT_INPUT_AREA_OF_INTEREST = COM_AREA_NONE;
|
|
|
|
} // namespace blender::compositor
|