[Bf-blender-cvs] [fcb7d2fcbab] geometry-nodes-curve-support: Geometry Nodes Curves: Add UI for curve sample points node
Hans Goudey
noreply at git.blender.org
Tue Apr 13 06:45:09 CEST 2021
Commit: fcb7d2fcbabcb68325b7623d5fe77c9b759d9a38
Author: Hans Goudey
Date: Mon Apr 12 23:45:02 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rBfcb7d2fcbabcb68325b7623d5fe77c9b759d9a38
Geometry Nodes Curves: Add UI for curve sample points node
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
A source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
M source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 4cb4929b98d..3e7a87fc4cc 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -508,6 +508,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeCurveToMesh"),
NodeItem("GeometryNodeTransformTest"),
NodeItem("GeometryNodeCurveTrim"),
+ NodeItem("GeometryNodeCurveSamplePoints"),
]),
GeometryNodeCategory("GEO_GEOMETRY", "Geometry", items=[
NodeItem("GeometryNodeBoundBox"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 807ab75aac2..1959f016811 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1416,6 +1416,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_CURVE_TO_MESH 1043
#define GEO_NODE_CURVE_TRANSFORM_TEST 1044
#define GEO_NODE_CURVE_TRIM 1045
+#define GEO_NODE_CURVE_SAMPLE_POINTS 1046
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 3204186baec..1fcf3333f62 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4946,6 +4946,7 @@ static void registerGeometryNodes()
register_node_type_geo_boolean();
register_node_type_geo_bounding_box();
register_node_type_geo_collection_info();
+ register_node_type_geo_curve_sample_points();
register_node_type_geo_curve_to_mesh();
register_node_type_geo_curve_transform_test();
register_node_type_geo_curve_trim();
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 97910744f6a..6568d1e26db 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1200,6 +1200,11 @@ typedef struct NodeGeometryCurveTrim {
uint8_t mode;
} NodeGeometryCurveTrim;
+typedef struct NodeGeometryCurveSamplePoints {
+ /* GeometryNodeCurveSamplePointsMode. */
+ uint8_t mode;
+} NodeGeometryCurveSamplePoints;
+
typedef struct NodeGeometryRotatePoints {
/* GeometryNodeRotatePointsType */
uint8_t type;
@@ -1712,6 +1717,11 @@ typedef enum GeometryNodeCurveTrimMode {
GEO_NODE_CURVE_TRIM_LENGTH = 1,
} GeometryNodeCurveTrimMode;
+typedef enum GeometryNodeCurveSamplePointsMode {
+ GEO_NODE_CURVE_SAMPLE_POINTS_COUNT = 0,
+ GEO_NODE_CURVE_SAMPLE_POINTS_LENGTH = 1,
+} GeometryNodeCurveSamplePointsMode;
+
/* Boolean Node */
typedef enum GeometryNodeBooleanOperation {
GEO_NODE_BOOLEAN_INTERSECT = 0,
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index dd7879a237a..5f1a3448d7b 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9575,6 +9575,32 @@ static void def_geo_curve_trim(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
}
+static void def_geo_curve_sample_points(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ static EnumPropertyItem mode_items[] = {
+ {GEO_NODE_CURVE_SAMPLE_POINTS_COUNT,
+ "COUNT",
+ 0,
+ "Count",
+ "Distribute the specified number of points along the curve"},
+ {GEO_NODE_CURVE_SAMPLE_POINTS_LENGTH,
+ "LENGTH",
+ 0,
+ "Length",
+ "Add points to the curve at the specified distance from each other"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
+ RNA_def_struct_sdna_from(srna, "NodeGeometryCurveTrim", "storage");
+
+ prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, mode_items);
+ RNA_def_property_ui_text(prop, "Mode", "How to specify the amount of points to sample");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
+}
+
static void def_geo_mesh_circle(StructRNA *srna)
{
PropertyRNA *prop;
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 6d058ba010d..a9f4a9ef6ee 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -159,6 +159,7 @@ set(SRC
geometry/nodes/node_geo_bounding_box.cc
geometry/nodes/node_geo_collection_info.cc
geometry/nodes/node_geo_common.cc
+ geometry/nodes/node_geo_curve_sample_points.cc
geometry/nodes/node_geo_curve_to_mesh.cc
geometry/nodes/node_geo_curve_transform_test.cc
geometry/nodes/node_geo_curve_trim.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index f3c37a8635f..f19a6b1348c 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -47,6 +47,7 @@ void register_node_type_geo_attribute_remove(void);
void register_node_type_geo_boolean(void);
void register_node_type_geo_bounding_box(void);
void register_node_type_geo_collection_info(void);
+void register_node_type_geo_curve_sample_points(void);
void register_node_type_geo_curve_to_mesh(void);
void register_node_type_geo_curve_transform_test(void);
void register_node_type_geo_curve_trim(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index c6c1e83e26b..3617ffd5293 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -313,6 +313,7 @@ DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox, "Bound
DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TRANSFORM_TEST, 0, "TRANSFORM_TEST", TransformTest, "Transform Test", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
+DefNode(GeometryNode, GEO_NODE_CURVE_SAMPLE_POINTS, def_geo_curve_sample_points, "CURVE_SAMPLE_POINTS", CurveSamplePoints, "Curve Sample Points", "")
/* undefine macros */
#undef DefNode
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
new file mode 100644
index 00000000000..69a87d891de
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample_points.cc
@@ -0,0 +1,159 @@
+/*
+ * 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.
+ */
+
+#include "BKE_derived_curve.hh"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "node_geometry_util.hh"
+
+static bNodeSocketTemplate geo_node_curve_sample_points_in[] = {
+ {SOCK_GEOMETRY, N_("Curve")},
+ {SOCK_INT, N_("Count"), 10.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX},
+ {SOCK_FLOAT, N_("Length"), 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX, PROP_DISTANCE},
+ {-1, ""},
+};
+
+static bNodeSocketTemplate geo_node_curve_sample_points_out[] = {
+ {SOCK_GEOMETRY, N_("Points")},
+ {-1, ""},
+};
+
+static void geo_node_curve_sample_points_layout(uiLayout *layout,
+ bContext *UNUSED(C),
+ PointerRNA *ptr)
+{
+ uiItemR(layout, ptr, "mode", UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
+}
+
+static void geo_node_curve_sample_points_init(bNodeTree *UNUSED(tree), bNode *node)
+{
+ NodeGeometryCurveSamplePoints *data = (NodeGeometryCurveSamplePoints *)MEM_callocN(
+ sizeof(NodeGeometryCurveSamplePoints), __func__);
+
+ data->mode = GEO_NODE_CURVE_SAMPLE_POINTS_LENGTH;
+ node->storage = data;
+}
+
+static void geo_node_curve_sample_points_update(bNodeTree *UNUSED(ntree), bNode *node)
+{
+ NodeGeometryCurveSamplePoints &node_storage = *(NodeGeometryCurveSamplePoints *)node->storage;
+ const GeometryNodeCurveSamplePointsMode mode = (GeometryNodeCurveSamplePointsMode)
+ node_storage.mode;
+
+ bNodeSocket *count_socket = ((bNodeSocket *)node->inputs.first)->next;
+ bNodeSocket *length_socket = count_socket->next;
+
+ nodeSetSocketAvailability(count_socket, mode == GEO_NODE_CURVE_SAMPLE_POINTS_COUNT);
+ nodeSetSocketAvailability(length_socket, mode == GEO_NODE_CURVE_SAMPLE_POINTS_LENGTH);
+}
+
+namespace blender::nodes {
+
+// /* Set the location for the first point. */
+// r_samples[0].x = profile->table[0].x;
+// r_samples[0].y = profile->table[0].y;
+
+// /* Travel along the path, recording the locations of segments as we pass them. */
+// float segment_left = segment_length;
+// for (int i = 1; i < n_segments; i++) {
+// /* Travel over all of the points that fit inside this segment. */
+// while (distance_to_next_table_point < segment_left) {
+// length_travelled += distance_to_next_table_point;
+// segment_left -= distance_to_next_table_point;
+// i_table++;
+// distance_to_next_table_point = curveprofile_distance_to_next_table_point(profile, i_table);
+// distance_to_previous_table_point = 0.0f;
+// }
+// /* We're at the last table point that fits inside the current segment, use interpolation. */
+// float factor = (distance_to_previous_table_point + segment_left) /
+// (distance_to_previous_table_point + distance_to_next_table_point);
+// r_samples[i].x = interpf(profile->table[i_table + 1].x, profile->table[i_table].x, factor);
+// r_samples[i].y = interpf(profile->table[i_table + 1].y, profile->table[i_table].y, factor);
+// BLI_assert(factor <= 1.0f && factor >= 0.0f);
+// #ifdef DEBUG_CURVEPROFILE_EVALUATE
+// printf("segment_left: %.3f\n", segment_left);
+// printf("i_table: %d\n", i_table);
+// printf("distance_to_p
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list