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
136 lines
5.3 KiB
C++
136 lines
5.3 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.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <string.h>
|
|
|
|
#include "BLI_math_vec_types.hh"
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "DNA_node_types.h"
|
|
|
|
#include "BKE_node.h"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "NOD_geometry.h"
|
|
#include "NOD_geometry_exec.hh"
|
|
#include "NOD_socket_declarations.hh"
|
|
#include "NOD_socket_declarations_geometry.hh"
|
|
|
|
#include "node_util.h"
|
|
|
|
void geo_node_type_base(struct bNodeType *ntype, int type, const char *name, short nclass);
|
|
bool geo_node_poll_default(struct bNodeType *ntype,
|
|
struct bNodeTree *ntree,
|
|
const char **r_disabled_hint);
|
|
|
|
namespace blender::nodes {
|
|
/**
|
|
* Update the availability of a group of input sockets with the same name,
|
|
* used for switching between attribute inputs or single values.
|
|
*
|
|
* \param mode: Controls which socket of the group to make available.
|
|
* \param name_is_available: If false, make all sockets with this name unavailable.
|
|
*/
|
|
void update_attribute_input_socket_availabilities(bNodeTree &ntree,
|
|
bNode &node,
|
|
const StringRef name,
|
|
GeometryNodeAttributeInputMode mode,
|
|
bool name_is_available = true);
|
|
|
|
Array<uint32_t> get_geometry_element_ids_as_uints(const GeometryComponent &component,
|
|
AttributeDomain domain);
|
|
|
|
void transform_mesh(Mesh &mesh,
|
|
const float3 translation,
|
|
const float3 rotation,
|
|
const float3 scale);
|
|
|
|
void transform_geometry_set(GeometrySet &geometry,
|
|
const float4x4 &transform,
|
|
const Depsgraph &depsgraph);
|
|
|
|
Mesh *create_line_mesh(const float3 start, const float3 delta, int count);
|
|
|
|
Mesh *create_grid_mesh(int verts_x, int verts_y, float size_x, float size_y);
|
|
|
|
struct ConeAttributeOutputs {
|
|
StrongAnonymousAttributeID top_id;
|
|
StrongAnonymousAttributeID bottom_id;
|
|
StrongAnonymousAttributeID side_id;
|
|
};
|
|
|
|
Mesh *create_cylinder_or_cone_mesh(float radius_top,
|
|
float radius_bottom,
|
|
float depth,
|
|
int circle_segments,
|
|
int side_segments,
|
|
int fill_segments,
|
|
GeometryNodeMeshCircleFillType fill_type,
|
|
ConeAttributeOutputs &attribute_outputs);
|
|
|
|
Mesh *create_cuboid_mesh(float3 size, int verts_x, int verts_y, int verts_z);
|
|
|
|
/**
|
|
* Copies the point domain attributes from `in_component` that are in the mask to `out_component`.
|
|
*/
|
|
void copy_point_attributes_based_on_mask(const GeometryComponent &in_component,
|
|
GeometryComponent &result_component,
|
|
Span<bool> masks,
|
|
bool invert);
|
|
/**
|
|
* Returns the parts of the geometry that are on the selection for the given domain. If the domain
|
|
* is not applicable for the component, e.g. face domain for point cloud, nothing happens to that
|
|
* component. If no component can work with the domain, then `error_message` is set to true.
|
|
*/
|
|
void separate_geometry(GeometrySet &geometry_set,
|
|
AttributeDomain domain,
|
|
GeometryNodeDeleteGeometryMode mode,
|
|
const Field<bool> &selection_field,
|
|
bool invert,
|
|
bool &r_is_error);
|
|
|
|
struct CurveToPointsResults {
|
|
int result_size;
|
|
MutableSpan<float3> positions;
|
|
MutableSpan<float> radii;
|
|
MutableSpan<float> tilts;
|
|
|
|
Map<AttributeIDRef, GMutableSpan> point_attributes;
|
|
|
|
MutableSpan<float3> tangents;
|
|
MutableSpan<float3> normals;
|
|
MutableSpan<float3> rotations;
|
|
};
|
|
/**
|
|
* Create references for all result point cloud attributes to simplify accessing them later on.
|
|
*/
|
|
CurveToPointsResults curve_to_points_create_result_attributes(PointCloudComponent &points,
|
|
const CurveEval &curve);
|
|
|
|
void curve_create_default_rotation_attribute(Span<float3> tangents,
|
|
Span<float3> normals,
|
|
MutableSpan<float3> rotations);
|
|
|
|
std::optional<CustomDataType> node_data_type_to_custom_data_type(eNodeSocketDatatype type);
|
|
std::optional<CustomDataType> node_socket_to_custom_data_type(const bNodeSocket &socket);
|
|
|
|
} // namespace blender::nodes
|