[Bf-blender-cvs] [257c7753e9b] master: Cleanup: Rename curve node enums

[Hans Goudey]

Commit: 257c7753e9beb2cbd34936766d5fc6c4dc441778
Author: Hans Goudey
Date:   Sun Sep 19 01:20:06 2021 -0500
Branches: master
https://developer.blender.org/rB257c7753e9beb2cbd34936766d5fc6c4dc441778

Cleanup: Rename curve node enums

The enum called "interpolate" was really a choice of methods for mapping
inputs to positions on the curve, whereas the "sample" enum was used to
define a way to create a whole set of new points from the curve, without
any input parameters. The "re-sample" vs. "sample" naming makes that
distinction better.

===================================================================

M	source/blender/makesdna/DNA_node_types.h
M	source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
M	source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
M	source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc

===================================================================

diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index c4cbc71762c..ee1da6be3f2 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1432,7 +1432,7 @@ typedef struct NodeGeometryCurvePrimitiveQuad {
 } NodeGeometryCurvePrimitiveQuad;
 
 typedef struct NodeGeometryCurveResample {
-  /* GeometryNodeCurveSampleMode. */
+  /* GeometryNodeCurveResampleMode. */
   uint8_t mode;
 } NodeGeometryCurveResample;
 
@@ -1442,12 +1442,12 @@ typedef struct NodeGeometryCurveSubdivide {
 } NodeGeometryCurveSubdivide;
 
 typedef struct NodeGeometryCurveTrim {
-  /* GeometryNodeCurveInterpolateMode. */
+  /* GeometryNodeCurveSampleMode. */
   uint8_t mode;
 } NodeGeometryCurveTrim;
 
 typedef struct NodeGeometryCurveToPoints {
-  /* GeometryNodeCurveSampleMode. */
+  /* GeometryNodeCurveResampleMode. */
   uint8_t mode;
 } NodeGeometryCurveToPoints;
 
@@ -2029,16 +2029,16 @@ typedef enum GeometryNodeCurvePrimitiveBezierSegmentMode {
   GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT_OFFSET = 1,
 } GeometryNodeCurvePrimitiveBezierSegmentMode;
 
-typedef enum GeometryNodeCurveSampleMode {
+typedef enum GeometryNodeCurveResampleMode {
   GEO_NODE_CURVE_SAMPLE_COUNT = 0,
   GEO_NODE_CURVE_SAMPLE_LENGTH = 1,
   GEO_NODE_CURVE_SAMPLE_EVALUATED = 2,
-} GeometryNodeCurveSampleMode;
+} GeometryNodeCurveResampleMode;
 
-typedef enum GeometryNodeCurveInterpolateMode {
+typedef enum GeometryNodeCurveSampleMode {
   GEO_NODE_CURVE_INTERPOLATE_FACTOR = 0,
   GEO_NODE_CURVE_INTERPOLATE_LENGTH = 1,
-} GeometryNodeCurveInterpolateMode;
+} GeometryNodeCurveSampleMode;
 
 typedef enum GeometryNodeAttributeTransferMapMode {
   GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED = 0,
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
index e89d500fe57..f8b67cf83f2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc
@@ -57,7 +57,7 @@ static void geo_node_curve_resample_init(bNodeTree *UNUSED(tree), bNode *node)
 static void geo_node_curve_resample_update(bNodeTree *UNUSED(ntree), bNode *node)
 {
   NodeGeometryCurveResample &node_storage = *(NodeGeometryCurveResample *)node->storage;
-  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
+  const GeometryNodeCurveResampleMode mode = (GeometryNodeCurveResampleMode)node_storage.mode;
 
   bNodeSocket *count_socket = ((bNodeSocket *)node->inputs.first)->next;
   bNodeSocket *length_socket = count_socket->next;
@@ -67,7 +67,7 @@ static void geo_node_curve_resample_update(bNodeTree *UNUSED(ntree), bNode *node
 }
 
 struct SampleModeParam {
-  GeometryNodeCurveSampleMode mode;
+  GeometryNodeCurveResampleMode mode;
   std::optional<float> length;
   std::optional<int> count;
 };
@@ -215,7 +215,7 @@ static void geo_node_resample_exec(GeoNodeExecParams params)
 
   const CurveEval &input_curve = *geometry_set.get_curve_for_read();
   NodeGeometryCurveResample &node_storage = *(NodeGeometryCurveResample *)params.node().storage;
-  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
+  const GeometryNodeCurveResampleMode mode = (GeometryNodeCurveResampleMode)node_storage.mode;
   SampleModeParam mode_param;
   mode_param.mode = mode;
   if (mode == GEO_NODE_CURVE_SAMPLE_COUNT) {
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
index 74740ba244f..623f2da8f11 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc
@@ -53,7 +53,7 @@ static void geo_node_curve_to_points_init(bNodeTree *UNUSED(tree), bNode *node)
 static void geo_node_curve_to_points_update(bNodeTree *UNUSED(ntree), bNode *node)
 {
   NodeGeometryCurveToPoints &node_storage = *(NodeGeometryCurveToPoints *)node->storage;
-  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
+  const GeometryNodeCurveResampleMode mode = (GeometryNodeCurveResampleMode)node_storage.mode;
 
   bNodeSocket *count_socket = ((bNodeSocket *)node->inputs.first)->next;
   bNodeSocket *length_socket = count_socket->next;
@@ -77,7 +77,7 @@ static void evaluate_splines(Span<SplinePtr> splines)
 }
 
 static Array<int> calculate_spline_point_offsets(GeoNodeExecParams &params,
-                                                 const GeometryNodeCurveSampleMode mode,
+                                                 const GeometryNodeCurveResampleMode mode,
                                                  const CurveEval &curve,
                                                  const Span<SplinePtr> splines)
 {
@@ -301,7 +301,7 @@ void curve_create_default_rotation_attribute(Span<float3> tangents,
 static void geo_node_curve_to_points_exec(GeoNodeExecParams params)
 {
   NodeGeometryCurveToPoints &node_storage = *(NodeGeometryCurveToPoints *)params.node().storage;
-  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
+  const GeometryNodeCurveResampleMode mode = (GeometryNodeCurveResampleMode)node_storage.mode;
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
 
   geometry_set = bke::geometry_set_realize_instances(geometry_set);
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
index 4ad311d63c5..f4dc03f1779 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc
@@ -53,8 +53,7 @@ static void geo_node_curve_trim_init(bNodeTree *UNUSED(tree), bNode *node)
 static void geo_node_curve_trim_update(bNodeTree *UNUSED(ntree), bNode *node)
 {
   const NodeGeometryCurveTrim &node_storage = *(NodeGeometryCurveTrim *)node->storage;
-  const GeometryNodeCurveInterpolateMode mode = (GeometryNodeCurveInterpolateMode)
-                                                    node_storage.mode;
+  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
 
   bNodeSocket *start_fac = ((bNodeSocket *)node->inputs.first)->next;
   bNodeSocket *end_fac = start_fac->next;
@@ -324,8 +323,7 @@ static void trim_bezier_spline(Spline &spline,
 static void geo_node_curve_trim_exec(GeoNodeExecParams params)
 {
   const NodeGeometryCurveTrim &node_storage = *(NodeGeometryCurveTrim *)params.node().storage;
-  const GeometryNodeCurveInterpolateMode mode = (GeometryNodeCurveInterpolateMode)
-                                                    node_storage.mode;
+  const GeometryNodeCurveSampleMode mode = (GeometryNodeCurveSampleMode)node_storage.mode;
 
   GeometrySet geometry_set = params.extract_input<GeometrySet>("Curve");
   geometry_set = bke::geometry_set_realize_instances(geometry_set);