[Bf-blender-cvs] [3b3a08f4391] soc-2021-curve-fillet: Basic Curve Fillet node implementation
dilithjay
noreply at git.blender.org
Tue Jul 13 05:53:36 CEST 2021
Commit: 3b3a08f439106d696dfdbaa3674076df300805b0
Author: dilithjay
Date: Tue Jul 13 09:13:02 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rB3b3a08f439106d696dfdbaa3674076df300805b0
Basic Curve Fillet node implementation
===================================================================
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_fillet.cc
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index b1ed1441245..bd0cd0623f3 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -509,6 +509,7 @@ geometry_node_categories = [
NodeItem("GeometryNodeCurveEndpoints"),
NodeItem("GeometryNodeCurveLength"),
NodeItem("GeometryNodeCurveReverse"),
+ NodeItem("GeometryNodeCurveFillet"),
]),
GeometryNodeCategory("GEO_PRIMITIVES_CURVE", "Curve Primitives", items=[
NodeItem("GeometryNodeCurvePrimitiveLine"),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index c9f724036e0..b9f111d5a05 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1458,6 +1458,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_VIEWER 1067
#define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
#define GEO_NODE_CURVE_ENDPOINTS 1069
+#define GEO_NODE_CURVE_FILLET 1070
/** \} */
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 5bed5b1aaad..79bf195715a 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5117,6 +5117,7 @@ static void registerGeometryNodes()
register_node_type_geo_curve_resample();
register_node_type_geo_curve_reverse();
register_node_type_geo_curve_subdivide();
+ register_node_type_geo_curve_fillet();
register_node_type_geo_curve_to_mesh();
register_node_type_geo_curve_to_points();
register_node_type_geo_delete_geometry();
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 1a3415bf74e..2ff72500435 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -1380,6 +1380,13 @@ typedef struct NodeGeometryCurveSubdivide {
uint8_t cuts_type;
} NodeGeometryCurveSubdivide;
+typedef struct NodeGeometryCurveFillet {
+ /* GeometryNodeCurveFilletMode. */
+ uint8_t mode;
+ /* GeometryNodeCurveFilletRadiusMode. */
+ uint8_t radius_mode;
+} NodeGeometryCurveFillet;
+
typedef struct NodeGeometryCurveToPoints {
/* GeometryNodeCurveSampleMode. */
uint8_t mode;
@@ -1931,6 +1938,16 @@ typedef enum GeometryNodeCurveSampleMode {
GEO_NODE_CURVE_SAMPLE_EVALUATED = 2,
} GeometryNodeCurveSampleMode;
+typedef enum GeometryNodeCurveFilletMode {
+ GEO_NODE_CURVE_FILLET_ADAPTIVE = 0,
+ GEO_NODE_CURVE_FILLET_USER_DEFINED = 1,
+} GeometryNodeCurveFilletMode;
+
+typedef enum GeometryNodeCurveFilletRadiusMode {
+ GEO_NODE_CURVE_FILLET_RADIUS_FLOAT = 0,
+ GEO_NODE_CURVE_FILLET_RADIUS_ATTRIBUTE = 1,
+} GeometryNodeCurveFilletRadiusMode;
+
typedef enum GeometryNodeAttributeTransferMapMode {
GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST_FACE_INTERPOLATED = 0,
GEO_NODE_ATTRIBUTE_TRANSFER_NEAREST = 1,
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 5c363a3e6b6..dbde584efd1 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -9986,6 +9986,51 @@ static void def_geo_curve_subdivide(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
}
+static void def_geo_curve_fillet(StructRNA *srna)
+{
+ PropertyRNA *prop;
+
+ static EnumPropertyItem mode_items[] = {
+ {GEO_NODE_CURVE_FILLET_ADAPTIVE,
+ "ADAPTIVE",
+ 0,
+ "Adaptive",
+ "Decide the best number of control points based on angle"},
+ {GEO_NODE_CURVE_FILLET_USER_DEFINED,
+ "USER_DEFINED",
+ 0,
+ "User Defined",
+ "Specify the number of control points"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
+ static EnumPropertyItem radius_mode_items[] = {
+ {GEO_NODE_CURVE_FILLET_RADIUS_FLOAT,
+ "FLOAT",
+ 0,
+ "Float",
+ "Define a common radius for all points."},
+ {GEO_NODE_CURVE_FILLET_RADIUS_ATTRIBUTE,
+ "ATTRIBUTE",
+ 0,
+ "Attribute",
+ "Specify radius based on an attribute"},
+ {0, NULL, 0, NULL, NULL},
+ };
+
+ RNA_def_struct_sdna_from(srna, "NodeGeometryCurveFillet", "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 choose number of vertices on fillet");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
+
+ prop = RNA_def_property(srna, "radius_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, radius_mode_items);
+ RNA_def_property_ui_text(prop, "Radius Mode", "How the radius of the curvature is defined");
+ RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update");
+}
+
static void def_geo_curve_to_points(StructRNA *srna)
{
PropertyRNA *prop;
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index ec060de916b..bb94640f75f 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -175,6 +175,7 @@ set(SRC
geometry/nodes/node_geo_curve_resample.cc
geometry/nodes/node_geo_curve_reverse.cc
geometry/nodes/node_geo_curve_subdivide.cc
+ geometry/nodes/node_geo_curve_fillet.cc
geometry/nodes/node_geo_curve_to_mesh.cc
geometry/nodes/node_geo_curve_to_points.cc
geometry/nodes/node_geo_delete_geometry.cc
diff --git a/source/blender/nodes/NOD_geometry.h b/source/blender/nodes/NOD_geometry.h
index d93ecf36442..8bdd08cd98a 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -62,6 +62,7 @@ void register_node_type_geo_curve_primitive_star(void);
void register_node_type_geo_curve_resample(void);
void register_node_type_geo_curve_reverse(void);
void register_node_type_geo_curve_subdivide(void);
+void register_node_type_geo_curve_fillet(void);
void register_node_type_geo_curve_to_mesh(void);
void register_node_type_geo_curve_to_points(void);
void register_node_type_geo_delete_geometry(void);
diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h
index 6266126a7b0..92e9aacddda 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -300,6 +300,7 @@ DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0, "CURVE_PRIMITIVE_STAR",
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL, 0, "CURVE_PRIMITIVE_SPIRAL", CurveSpiral, "Curve Spiral", "")
DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample, "CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide, "CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
+DefNode(GeometryNode, GEO_NODE_CURVE_FILLET, def_geo_curve_fillet, "CURVE_FILLET", CurveFillet, "Curve Fillet", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh, "Curve to Mesh", "")
DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE", CurveReverse, "Curve Reverse", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points, "CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
new file mode 100644
index 00000000000..6014cc42274
--- /dev/null
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc
@@ -0,0 +1,373 @@
+/*
+ * 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 "BLI_task.hh"
+
+#include "UI_interface.h"
+#include "UI_resources.h"
+
+#include "node_geometry_util.hh"
+
+#include "BKE_spline.hh"
+
+#include "float.h"
+
+static bNodeSocketTemplate geo_node_curve_fillet_in[] = {
+ {SOCK_GEOMETRY, N_("Curve")},
+ {SOCK_FLOAT, N_("Angle"), M_PI_2, 0.0f, 0.0f, 0.0f, 0.001f, FLT_MAX},
+ {SOCK_INT, N_("Count"), 1, 0, 0, 0, 1, 1000},
+ {SOCK_FLOAT, N_("Radius"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, FLT_MAX},
+ {SOCK_STRING, N_("Radii")},
+ {-1, ""},
+};
+
+static bNodeSocketTemplate geo_node_curve_fillet_out[] = {
+ {SOCK_GEOMETRY, N_("Curve")},
+ {-1, ""},
+};
+
+static void geo_node_curve_fillet_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
+{
+ uiLayoutSetPropSep(layout, true);
+ uiLayoutSetPropDecorate(layout, false);
+ uiItemR(layout, ptr, "mode", 0, IFACE_("Mode"), ICON_NONE);
+ uiItemR(layout, ptr, "radius_mode", 0, IFACE_("Radius Mode"), ICON_NONE);
+}
+
+static void geo_node_curve_fillet_init(bNodeTree *UNUSED(tree), bNode *node)
+{
+ NodeGeometryCurveFillet *data = (NodeGeometryCurveFillet *)MEM_callocN(
+ sizeof(NodeGeometryCurveFillet), __func__);
+
+ data->mode = GEO_NODE_CURVE_FILLET_ADAPTIVE;
+ data->radius_mode = GEO_NODE_CURVE_FILLET_RADIUS_FLOAT;
+
+ node->storage = data;
+}
+
+namespace blender::nodes {
+
+struct FilletModeParam {
+ GeometryNodeCurveFilletMode mode;
+
+ /* Minimum angle between two adjust control points. */
+ std::optional<float> angle;
+
+ /* Number of points to be added. */
+ std::optional<int> count;
+
+ GeometryNodeCurveFilletRadiusMode radius_mode;
+
+ /* The radius of the formed circle */
+ std::optional<float> radius;
+
+ /* Distribution of radii on the curve. */
+ std::optional<std::string> radii_dist;
+};
+
+struct FilletData {
+ float3 prev_dir, pos, next_dir, center, axis;
+ float radius;
+ float angle;
+ float count;
+}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list