diff options
author | Hans Goudey <h.goudey@me.com> | 2022-02-23 01:37:58 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-02-23 01:37:58 +0300 |
commit | 5b4732f81ca8a159e937336fba7c8eb3220216de (patch) | |
tree | 4c0ab34fda202c209cbc99934a5355feec26af49 /source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc | |
parent | 0b9cc6725cca193ec20868caf266ea35c173b956 (diff) |
Cleanup: Use new enum for CurveEval handle types
This will make the transition to the new curves data structure
a bit simple, since the handle types can be copied directly between
the two. The change to CurveEval is simple because it is runtime-only.
Diffstat (limited to 'source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc')
-rw-r--r-- | source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc index 26a8ad2d988..a7ef06a48b0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc @@ -31,24 +31,24 @@ static void node_init(bNodeTree *UNUSED(tree), bNode *node) node->storage = data; } -static BezierSpline::HandleType handle_type_from_input_type(const GeometryNodeCurveHandleType type) +static HandleType handle_type_from_input_type(const GeometryNodeCurveHandleType type) { switch (type) { case GEO_NODE_CURVE_HANDLE_AUTO: - return BezierSpline::HandleType::Auto; + return BEZIER_HANDLE_AUTO; case GEO_NODE_CURVE_HANDLE_ALIGN: - return BezierSpline::HandleType::Align; + return BEZIER_HANDLE_ALIGN; case GEO_NODE_CURVE_HANDLE_FREE: - return BezierSpline::HandleType::Free; + return BEZIER_HANDLE_FREE; case GEO_NODE_CURVE_HANDLE_VECTOR: - return BezierSpline::HandleType::Vector; + return BEZIER_HANDLE_VECTOR; } BLI_assert_unreachable(); - return BezierSpline::HandleType::Auto; + return BEZIER_HANDLE_AUTO; } static void select_by_handle_type(const CurveEval &curve, - const BezierSpline::HandleType type, + const HandleType type, const GeometryNodeCurveHandleMode mode, const MutableSpan<bool> r_selection) { @@ -71,11 +71,11 @@ static void select_by_handle_type(const CurveEval &curve, } class HandleTypeFieldInput final : public GeometryFieldInput { - BezierSpline::HandleType type_; + HandleType type_; GeometryNodeCurveHandleMode mode_; public: - HandleTypeFieldInput(BezierSpline::HandleType type, GeometryNodeCurveHandleMode mode) + HandleTypeFieldInput(HandleType type, GeometryNodeCurveHandleMode mode) : GeometryFieldInput(CPPType::get<bool>(), "Handle Type Selection node"), type_(type), mode_(mode) @@ -124,7 +124,7 @@ class HandleTypeFieldInput final : public GeometryFieldInput { static void node_geo_exec(GeoNodeExecParams params) { const NodeGeometryCurveSelectHandles &storage = node_storage(params.node()); - const BezierSpline::HandleType handle_type = handle_type_from_input_type( + const HandleType handle_type = handle_type_from_input_type( (GeometryNodeCurveHandleType)storage.handle_type); const GeometryNodeCurveHandleMode mode = (GeometryNodeCurveHandleMode)storage.mode; |