[Bf-blender-cvs] [172e713cc69] temp-geometry-nodes-fields-prototype: Add curve parameter node
Hans Goudey
noreply at git.blender.org
Tue Aug 10 00:12:28 CEST 2021
Commit: 172e713cc69a26b1cbfa4f58fe1d093885ab6eab
Author: Hans Goudey
Date: Mon Aug 9 17:12:19 2021 -0500
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB172e713cc69a26b1cbfa4f58fe1d093885ab6eab
Add curve parameter node
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_field.hh
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/blenkernel/intern/spline_base.cc
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/geometry/node_geometry_util.cc
A source/blender/nodes/geometry/nodes/node_geo_curve_parameter.cc
M source/blender/nodes/geometry/nodes/node_geo_normal.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 2fc5b386d07..407db589779 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -536,6 +536,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeAttribute"),
NodeItem("GeometryNodeIndex"),
NodeItem("GeometryNodeNormal"),
+ NodeItem("GeometryNodeCurveParameter"),
]),
GeometryNodeCategory("GEO_MATERIAL", "Material", items=[
NodeItem("GeometryNodeMaterialAssign"),
@@ -560,7 +561,6 @@ geometry_node_categories = [
NodeItem("GeometryNodeMeshLine"),
NodeItem("GeometryNodeMeshUVSphere"),
]),
-
GeometryNodeCategory("GEO_POINT", "Point", items=[
NodeItem("GeometryNodePointDistribute"),
NodeItem("GeometryNodePointInstance"),
diff --git a/source/blender/blenkernel/BKE_field.hh b/source/blender/blenkernel/BKE_field.hh
index 1fceeeadf08..9ec7077e0f7 100644
--- a/source/blender/blenkernel/BKE_field.hh
+++ b/source/blender/blenkernel/BKE_field.hh
@@ -87,6 +87,26 @@ class IndexFieldInputKey : public FieldInputKey {
}
};
+class CurveParameterFieldInputKey : public FieldInputKey {
+ public:
+ uint64_t hash() const override
+ {
+ /* Arbitrary number. */
+ return 928347504059;
+ }
+
+ const CPPType &type() const override
+ {
+ return CPPType::get<int>();
+ }
+
+ private:
+ bool is_same_as(const FieldInputKey &other) const override
+ {
+ return dynamic_cast<const CurveParameterFieldInputKey *>(&other) != nullptr;
+ }
+};
+
class AnonymousAttributeFieldInputKey : public FieldInputKey {
private:
AnonymousCustomDataLayerID *layer_id_;
@@ -429,6 +449,8 @@ class AnonymousAttributeField : public GVArrayInputField<AnonymousAttributeField
class IndexField : public GVArrayInputField<IndexFieldInputKey> {
};
+class CurveParameterField : public GVArrayInputField<CurveParameterFieldInputKey> {
+};
class FieldRefBase {
protected:
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index b0bce26f1c9..8604698b69a 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1483,6 +1483,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_ATTRIBUTE_STORE_ANONYMOUS 1078
#define GEO_NODE_ATTRIBUTE_EXTRACT 1079
#define GEO_NODE_NORMAL 1080
+#define GEO_NODE_CURVE_PARAMETER 1081
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 04103565245..c653835eef1 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5142,6 +5142,7 @@ static void registerGeometryNodes()
register_node_type_geo_convex_hull();
register_node_type_geo_curve_endpoints();
register_node_type_geo_curve_length();
+ register_node_type_geo_curve_parameter();
register_node_type_geo_curve_primitive_bezier_segment();
register_node_type_geo_curve_primitive_circle();
register_node_type_geo_curve_primitive_line();
diff --git a/source/blender/blenkernel/intern/spline_base.cc b/source/blender/blenkernel/intern/spline_base.cc
index dda7abea0fc..732fabc6582 100644
--- a/source/blender/blenkernel/intern/spline_base.cc
+++ b/source/blender/blenkernel/intern/spline_base.cc
@@ -123,7 +123,7 @@ int Spline::evaluated_edges_size() const
float Spline::length() const
{
Span<float> lengths = this->evaluated_lengths();
- return (lengths.size() == 0) ? 0 : this->evaluated_lengths().last();
+ return lengths.is_empty() ? 0.0f : this->evaluated_lengths().last();
}
int Spline::segments_size() const
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 979b215500e..58d0122d261 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -171,6 +171,7 @@ set(SRC
geometry/nodes/node_geo_convex_hull.cc
geometry/nodes/node_geo_curve_endpoints.cc
geometry/nodes/node_geo_curve_length.cc
+ geometry/nodes/node_geo_curve_parameter.cc
geometry/nodes/node_geo_curve_primitive_bezier_segment.cc
geometry/nodes/node_geo_curve_primitive_circle.cc
geometry/nodes/node_geo_curve_primitive_line.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index 53043bc0d4f..ea01c36e75f 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -57,6 +57,7 @@ void register_node_type_geo_collection_info(void);
void register_node_type_geo_convex_hull(void);
void register_node_type_geo_curve_endpoints(void);
void register_node_type_geo_curve_length(void);
+void register_node_type_geo_curve_parameter(void);
void register_node_type_geo_curve_primitive_bezier_segment(void);
void register_node_type_geo_curve_primitive_circle(void);
void register_node_type_geo_curve_primitive_line(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index fd45bca5ab4..9aed7895014 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -298,6 +298,7 @@ DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info, "COLLEC
DefNode(GeometryNode, GEO_NODE_CONVEX_HULL, 0, "CONVEX_HULL", ConvexHull, "Convex Hull", "")
DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINTS, 0, "CURVE_ENDPOINTS", CurveEndpoints, "Curve Endpoints", "")
DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength, "Curve Length", "")
+DefNode(GeometryNode, GEO_NODE_CURVE_PARAMETER, 0, "CURVE_PARAMETER", CurveParameter, "Curve Parameter", "")
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, def_geo_curve_primitive_bezier_segment, "CURVE_PRIMITIVE_BEZIER_SEGMENT", CurvePrimitiveBezierSegment, "Bezier Segment", "")
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_CIRCLE, def_geo_curve_primitive_circle, "CURVE_PRIMITIVE_CIRCLE", CurvePrimitiveCircle, "Curve Circle", "")
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_LINE, def_geo_curve_primitive_line, "CURVE_PRIMITIVE_LINE", CurvePrimitiveLine, "Curve Line", "")
@@ -332,7 +333,7 @@ DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_LINE, def_geo_mesh_line, "MESH_PRI
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_UV_SPHERE, 0, "MESH_PRIMITIVE_UV_SPHERE", MeshUVSphere, "UV Sphere", "")
DefNode(GeometryNode, GEO_NODE_MESH_SUBDIVIDE, 0, "MESH_SUBDIVIDE", MeshSubdivide, "Mesh Subdivide", "")
DefNode(GeometryNode, GEO_NODE_MESH_TO_CURVE, 0, "MESH_TO_CURVE", MeshToCurve, "Mesh to Curve", "")
-DefNode(GeometryNode, GEO_NODE_NORMAL, 0, "NORMAL", Normal, "Normal", "")
+DefNode(GeometryNode, GEO_NODE_NORMAL, 0, "NORMAL", Normal, "Face Normal", "")
DefNode(GeometryNode, GEO_NODE_OBJECT_INFO, def_geo_object_info, "OBJECT_INFO", ObjectInfo, "Object Info", "")
DefNode(GeometryNode, GEO_NODE_POINT_DISTRIBUTE, def_geo_point_distribute, "POINT_DISTRIBUTE", PointDistribute, "Point Distribute", "")
DefNode(GeometryNode, GEO_NODE_POINT_INSTANCE, def_geo_point_instance, "POINT_INSTANCE", PointInstance, "Point Instance", "")
diff --git a/source/blender/nodes/geometry/node_geometry_util.cc b/source/blender/nodes/geometry/node_geometry_util.cc
index 1fd24061300..a9868e772dd 100644
--- a/source/blender/nodes/geometry/node_geometry_util.cc
+++ b/source/blender/nodes/geometry/node_geometry_util.cc
@@ -23,6 +23,7 @@
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_pointcloud.h"
+#include "BKE_spline.hh"
#include "NOD_type_conversions.hh"
@@ -154,6 +155,60 @@ void prepare_field_inputs(bke::FieldInputs &field_inputs,
}
input_value = std::make_unique<bke::GVArrayFieldInputValue>(std::move(varray));
}
+ else if (dynamic_cast<const bke::CurveParameterFieldInputKey *>(&key)) {
+ if (component.type() != GEO_COMPONENT_TYPE_CURVE) {
+ continue;
+ }
+ const CurveComponent &curve_component = static_cast<const CurveComponent &>(component);
+ const CurveEval *curve = curve_component.get_for_read();
+ if (curve == nullptr) {
+ continue;
+ }
+
+ Span<SplinePtr> splines = curve->splines();
+ Array<int> offsets = curve->control_point_offsets();
+
+ Array<float> parameters(offsets.last());
+
+ for (const int i_spline : splines.index_range()) {
+ const int offset = offsets[i_spline];
+ MutableSpan<float> spline_parameters = parameters.as_mutable_span().slice(
+ offset, offsets[i_spline + 1]);
+ spline_parameters.first() = 0.0f;
+
+ const Spline &spline = *splines[i_spline];
+ const Span<float> lengths_eval = spline.evaluated_lengths();
+ const float total_length_inv = spline.length() == 0.0f ? 0.0f : 1.0f / spline.length();
+ switch (spline.type()) {
+ case Spline::Type::Bezier: {
+ const BezierSpline &bezier_spline = static_cast<const BezierSpline &>(spline);
+ const Span<int> control_point_offsets = bezier_spline.control_point_offsets();
+ for (const int i : IndexRange(1, spline.size() - 1)) {
+ spline_parameters[i] = lengths_eval[control_point_offsets[i] - 1];
+ }
+ break;
+ }
+ case Spline::Type::Poly: {
+ spline_parameters.drop_front(1).copy_from(lengths_eval);
+ break;
+ }
+ case Spline::Type::NURBS: {
+ /* Instead of doing something totally arbirary and wrong for the prototype, just do
+ * nothing currently. Consult NURBS experts or something or document this heavily if
+ * it ever makes it to master. */
+ parameters.as_mutable_span().slice(offset, offsets[i_spline + 1]).fill(0.0f);
+ break;
+ }
+ }
+
+ for (float ¶meter : spline_parameters) {
+ parameter *= total_length_inv;
+ }
+ }
+ GVArrayPtr varray = std::make_unique<fn::GVArray_For_ArrayContainer<Array<float>>>(
+ std::move(parameters));
+ input_value = std::make_unique<bke::GVArrayFieldInputValue>(std::move(varray));
+ }
field_inputs.set_input(key, *input_value);
r_values.append(std::move(input_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list