[Bf-blender-cvs] [2323267ed33] soc-2021-curve-fillet: Merge branch 'master' into soc-2021-curve-fillet
dilithjay
noreply at git.blender.org
Mon Jul 19 07:02:01 CEST 2021
Commit: 2323267ed3305b5feab4ae732b5ed92a02b9dd5f
Author: dilithjay
Date: Mon Jul 19 09:58:31 2021 +0530
Branches: soc-2021-curve-fillet
https://developer.blender.org/rB2323267ed3305b5feab4ae732b5ed92a02b9dd5f
Merge branch 'master' into soc-2021-curve-fillet
===================================================================
===================================================================
diff --cc release/scripts/startup/nodeitems_builtins.py
index abd73950a30,18e39a4d727..1786f996584
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -507,9 -507,9 +507,10 @@@ geometry_node_categories =
NodeItem("GeometryNodeMeshToCurve"),
NodeItem("GeometryNodeCurveToPoints"),
NodeItem("GeometryNodeCurveEndpoints"),
+ NodeItem("GeometryNodeCurveTrim"),
NodeItem("GeometryNodeCurveLength"),
NodeItem("GeometryNodeCurveReverse"),
+ NodeItem("GeometryNodeCurveFillet"),
]),
GeometryNodeCategory("GEO_PRIMITIVES_CURVE", "Curve Primitives", items=[
NodeItem("GeometryNodeCurvePrimitiveLine"),
diff --cc source/blender/blenkernel/BKE_node.h
index 312eb20bfe8,9b8eca77e6b..105212525bc
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1464,7 -1464,7 +1464,8 @@@ int ntreeTexExecTree(struct bNodeTree *
#define GEO_NODE_CURVE_PRIMITIVE_LINE 1068
#define GEO_NODE_CURVE_ENDPOINTS 1069
#define GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL 1070
- #define GEO_NODE_CURVE_FILLET 1071
+ #define GEO_NODE_CURVE_TRIM 1071
++#define GEO_NODE_CURVE_FILLET 1072
/** \} */
diff --cc source/blender/blenkernel/intern/node.cc
index a8b283ffb1a,3d5973b1d5e..53c38c10650
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5118,9 -5118,9 +5118,10 @@@ 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_curve_trim();
register_node_type_geo_delete_geometry();
register_node_type_geo_edge_split();
register_node_type_geo_input_material();
diff --cc source/blender/makesdna/DNA_node_types.h
index a9f65452cee,2b8e48557b6..615155ec871
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1385,13 -1385,11 +1385,18 @@@ typedef struct NodeGeometryCurveSubdivi
uint8_t cuts_type;
} NodeGeometryCurveSubdivide;
+typedef struct NodeGeometryCurveFillet {
+ /* GeometryNodeCurveFilletMode. */
+ uint8_t mode;
+ /* GeometryNodeCurveFilletRadiusMode. */
+ uint8_t radius_mode;
+} NodeGeometryCurveFillet;
+
+ typedef struct NodeGeometryCurveTrim {
+ /* GeometryNodeCurveInterpolateMode. */
+ uint8_t mode;
+ } NodeGeometryCurveTrim;
+
typedef struct NodeGeometryCurveToPoints {
/* GeometryNodeCurveSampleMode. */
uint8_t mode;
@@@ -1951,16 -1949,11 +1956,21 @@@ typedef enum GeometryNodeCurveSampleMod
GEO_NODE_CURVE_SAMPLE_EVALUATED = 2,
} GeometryNodeCurveSampleMode;
+ typedef enum GeometryNodeCurveInterpolateMode {
+ GEO_NODE_CURVE_INTERPOLATE_FACTOR = 0,
+ GEO_NODE_CURVE_INTERPOLATE_LENGTH = 1,
+ } GeometryNodeCurveInterpolateMode;
+
+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 --cc source/blender/nodes/CMakeLists.txt
index 18a863d7f25,130032ccf71..0d00e5786a0
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -176,9 -176,9 +176,10 @@@ set(SR
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_curve_trim.cc
geometry/nodes/node_geo_delete_geometry.cc
geometry/nodes/node_geo_edge_split.cc
geometry/nodes/node_geo_input_material.cc
diff --cc source/blender/nodes/NOD_geometry.h
index 1edd100b7d4,29a1d2cc853..bf35a078813
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -63,9 -63,9 +63,10 @@@ void register_node_type_geo_curve_primi
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_curve_trim(void);
void register_node_type_geo_delete_geometry(void);
void register_node_type_geo_edge_split(void);
void register_node_type_geo_input_material(void);
diff --cc source/blender/nodes/NOD_static_types.h
index c91232eb34b,42a0454d3e6..7cfa23511bf
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -301,8 -301,8 +301,9 @@@ DefNode(GeometryNode, GEO_NODE_CURVE_PR
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_TRIM, def_geo_curve_trim, "CURVE_TRIM", CurveTrim, "Curve Trim", "")
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", "")
DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINTS, 0, "CURVE_ENDPOINTS", CurveEndpoints, "Curve Endpoints", "")
More information about the Bf-blender-cvs
mailing list