Commit: ce1519d804c24753b729c0cbbf69d204e18bc90e
Author: Hans Goudey
Date: Thu Sep 2 16:24:08 2021 -0500
Branches: temp-geometry-nodes-fields
https://developer.blender.org/rBce1519d804c24753b729c0cbbf69d204e18bc90e
Cleanup: Internally rename "position" to "input_position"
Maybe we'll decide not to do this, for now maybe it's better to be consistent
though
===================================================================
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/nodes/NOD_geometry.h
M source/blender/nodes/NOD_static_types.h
M source/blender/nodes/geometry/nodes/node_geo_index.cc
M source/blender/nodes/geometry/nodes/node_geo_position.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_node.h
b/source/blender/blenkernel/BKE_node.h
index 84b383491cc..9beb80ec0f0 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1483,7 +1483,7 @@ int ntreeTexExecTree(struct bNodeTree *ntree,
#define GEO_NODE_CURVE_SPLINE_TYPE 1073
#define GEO_NODE_CURVE_SELECT_HANDLES 1074
#define GEO_NODE_CURVE_FILL 1075
-#define GEO_NODE_POSITION 1076
+#define GEO_NODE_INPUT_POSITION 1076
#define GEO_NODE_SET_POSITION 1077
#define GEO_NODE_INPUT_INDEX 1078
diff --git a/source/blender/blenkernel/intern/node.cc
b/source/blender/blenkernel/intern/node.cc
index 72c5bb93772..5cda79d8ee9 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -5173,8 +5173,9 @@ static void registerGeometryNodes()
register_node_type_geo_curve_trim();
register_node_type_geo_delete_geometry();
register_node_type_geo_edge_split();
+ register_node_type_geo_input_index();
register_node_type_geo_input_material();
- register_node_type_geo_index();
+ register_node_type_geo_input_position();
register_node_type_geo_is_viewport();
register_node_type_geo_join_geometry();
register_node_type_geo_material_assign();
@@ -5197,7 +5198,6 @@ static void registerGeometryNodes()
register_node_type_geo_point_separate();
register_node_type_geo_point_translate();
register_node_type_geo_points_to_volume();
- register_node_type_geo_position();
register_node_type_geo_raycast();
register_node_type_geo_sample_texture();
register_node_type_geo_select_by_handle_type();
diff --git a/source/blender/nodes/NOD_geometry.h
b/source/blender/nodes/NOD_geometry.h
index 375ba635e48..5cd19cd2b81 100644
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@ -71,8 +71,9 @@ 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_index(void);
void register_node_type_geo_input_material(void);
-void register_node_type_geo_index(void);
+void register_node_type_geo_input_position(void);
void register_node_type_geo_is_viewport(void);
void register_node_type_geo_join_geometry(void);
void register_node_type_geo_material_assign(void);
@@ -95,7 +96,6 @@ void register_node_type_geo_point_scale(void);
void register_node_type_geo_point_separate(void);
void register_node_type_geo_point_translate(void);
void register_node_type_geo_points_to_volume(void);
-void register_node_type_geo_position(void);
void register_node_type_geo_raycast(void);
void register_node_type_geo_sample_texture(void);
void register_node_type_geo_select_by_handle_type(void);
diff --git a/source/blender/nodes/NOD_static_types.h
b/source/blender/nodes/NOD_static_types.h
index 1390cb97ccd..f35886f2c01 100644
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@ -303,8 +303,8 @@ DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL, 0,
"CURVE_PRIMITIVE_SPIRA
DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0,
"CURVE_PRIMITIVE_STAR", CurveStar, "Star", "")
DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample,
"CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE",
CurveReverse, "Curve Reverse", "")
-DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles,
"CURVE_SET_HANDLES", CurveSetHandles, "Set Handle Type", "")
DefNode(GeometryNode, GEO_NODE_CURVE_SELECT_HANDLES,
def_geo_curve_select_handles, "CURVE_SELECT_HANDLES", CurveSelectHandles,
"Select by Handle Type", "")
+DefNode(GeometryNode, GEO_NODE_CURVE_SET_HANDLES, def_geo_curve_set_handles,
"CURVE_SET_HANDLES", CurveSetHandles, "Set Handle Type", "")
DefNode(GeometryNode, GEO_NODE_CURVE_SPLINE_TYPE, def_geo_curve_spline_type,
"CURVE_SPLINE_TYPE", CurveSplineType, "Set Spline Type", "")
DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide,
"CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH", CurveToMesh,
"Curve to Mesh", "")
@@ -312,8 +312,9 @@ DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS,
def_geo_curve_to_points, "CURVE_
DefNode(GeometryNode, GEO_NODE_CURVE_TRIM, def_geo_curve_trim, "CURVE_TRIM",
CurveTrim, "Curve Trim", "")
DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY",
DeleteGeometry, "Delete Geometry", "")
DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge
Split", "")
-DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material,
"INPUT_MATERIAL", InputMaterial, "Material", "")
DefNode(GeometryNode, GEO_NODE_INPUT_INDEX, 0, "INDEX", Index, "Index", "")
+DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material,
"INPUT_MATERIAL", InputMaterial, "Material", "")
+DefNode(GeometryNode, GEO_NODE_INPUT_POSITION, 0, "POSITION", Position,
"Position", "")
DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is
Viewport", "")
DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY",
JoinGeometry, "Join Geometry", "")
DefNode(GeometryNode, GEO_NODE_MATERIAL_ASSIGN, 0, "MATERIAL_ASSIGN",
MaterialAssign, "Material Assign", "")
@@ -336,7 +337,6 @@ DefNode(GeometryNode, GEO_NODE_POINT_SCALE,
def_geo_point_scale, "POINT_SCALE",
DefNode(GeometryNode, GEO_NODE_POINT_SEPARATE, 0, "POINT_SEPARATE",
PointSeparate, "Point Separate", "")
DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate,
"POINT_TRANSLATE", PointTranslate, "Point Translate", "")
DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume,
"POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "")
-DefNode(GeometryNode, GEO_NODE_POSITION, 0, "POSITION", Position, "Position",
"")
DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast,
"Raycast", "")
DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL",
SelectByMaterial, "Select by Material", "")
DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS",
SeparateComponents, "Separate Components", "")
diff --git a/source/blender/nodes/geometry/nodes/node_geo_index.cc
b/source/blender/nodes/geometry/nodes/node_geo_index.cc
index d20d7a4b1e9..d010b20842b 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_index.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_index.cc
@@ -49,7 +49,7 @@ static void GEO_NODE_INPUT_INDEX_exec(GeoNodeExecParams
params)
} // namespace blender::nodes
-void register_node_type_geo_index()
+void register_node_type_geo_input_index()
{
static bNodeType ntype;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_position.cc
b/source/blender/nodes/geometry/nodes/node_geo_position.cc
index b4378240bf6..38d49eb50c5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_position.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_position.cc
@@ -18,12 +18,12 @@
namespace blender::nodes {
-static void geo_node_position_declare(NodeDeclarationBuilder &b)
+static void geo_node_input_position_declare(NodeDeclarationBuilder &b)
{
b.add_output<decl::Vector>("Position");
}
-static void geo_node_position_exec(GeoNodeExecParams params)
+static void geo_node_input_position_exec(GeoNodeExecParams params)
{
Field<float3> position_field{
std::make_shared<bke::AttributeContextFieldSource>("position",
CPPType::get<float3>())};
@@ -32,12 +32,12 @@ static void geo_node_position_exec(GeoNodeExecParams params)
} // namespace blender::nodes
-void register_node_type_geo_position()
+void register_node_type_geo_input_input_position()
{
static bNodeType ntype;
- geo_node_type_base(&ntype, GEO_NODE_POSITION, "Position", NODE_CLASS_INPUT,
0);
- ntype.geometry_node_execute = blender::nodes::geo_node_position_exec;
- ntype.declare = blender::nodes::geo_node_position_declare;
+ geo_node_type_base(&ntype, GEO_NODE_INPUT_POSITION, "Position",
NODE_CLASS_INPUT, 0);
+ ntype.geometry_node_execute = blender::nodes::geo_node_input_position_exec;
+ ntype.declare = blender::nodes::geo_node_input_position_declare;
nodeRegisterType(&ntype);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
