[Bf-blender-cvs] [18e768c78e5] geometry-nodes: Cleanup: improve naming convention for geometry node exec functions
Jacques Lucke
noreply at git.blender.org
Mon Nov 23 12:03:37 CET 2020
Commit: 18e768c78e59a1dea8528bded7cf65a758ee8f4c
Author: Jacques Lucke
Date: Mon Nov 23 12:03:29 2020 +0100
Branches: geometry-nodes
https://developer.blender.org/rB18e768c78e59a1dea8528bded7cf65a758ee8f4c
Cleanup: improve naming convention for geometry node exec functions
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
M source/blender/nodes/geometry/nodes/node_geo_boolean.cc
M source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
M source/blender/nodes/geometry/nodes/node_geo_object_info.cc
M source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
M source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
M source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc
M source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
M source/blender/nodes/geometry/nodes/node_geo_transform.cc
M source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
index e6ccb0efdce..f3eb641f1f1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_math.cc
@@ -43,7 +43,7 @@ static void attribute_math_calc(GeometryComponent &component, const GeoNodeExecP
UNUSED_VARS(component, params);
}
-static void geo_attribute_math_exec(GeoNodeExecParams params)
+static void geo_node_attribute_math_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
@@ -65,6 +65,6 @@ void register_node_type_geo_attribute_math()
geo_node_type_base(&ntype, GEO_NODE_ATTRIBUTE_MATH, "Attribute Math", 0, 0);
node_type_socket_templates(&ntype, geo_node_attribute_math_in, geo_node_attribute_math_out);
- ntype.geometry_node_execute = blender::nodes::geo_attribute_math_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_attribute_math_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
index 78b2e4e1d7c..a0ba8e3bf81 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc
@@ -103,7 +103,7 @@ static Mesh *mesh_boolean_calc(const Mesh *mesh_a, const Mesh *mesh_b, int boole
}
namespace blender::nodes {
-static void geo_boolean_exec(GeoNodeExecParams params)
+static void geo_node_boolean_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set_in_a = params.extract_input<GeometrySet>("Geometry A");
GeometrySet geometry_set_in_b = params.extract_input<GeometrySet>("Geometry B");
@@ -147,6 +147,6 @@ void register_node_type_geo_boolean()
geo_node_type_base(&ntype, GEO_NODE_BOOLEAN, "Boolean", 0, 0);
node_type_socket_templates(&ntype, geo_node_boolean_in, geo_node_boolean_out);
- ntype.geometry_node_execute = blender::nodes::geo_boolean_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_boolean_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
index 1e068e5686c..22e75b3fe03 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_edge_split.cc
@@ -47,7 +47,7 @@ static bNodeSocketTemplate geo_node_edge_split_out[] = {
};
namespace blender::nodes {
-static void geo_edge_split_exec(GeoNodeExecParams params)
+static void geo_node_edge_split_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
@@ -91,6 +91,6 @@ void register_node_type_geo_edge_split()
geo_node_type_base(&ntype, GEO_NODE_EDGE_SPLIT, "Edge Split", 0, 0);
node_type_socket_templates(&ntype, geo_node_edge_split_in, geo_node_edge_split_out);
- ntype.geometry_node_execute = blender::nodes::geo_edge_split_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_edge_split_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
index 38857fffcc0..8d80e1ce40a 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc
@@ -36,7 +36,7 @@ static bNodeSocketTemplate geo_node_object_info_out[] = {
};
namespace blender::nodes {
-static void geo_object_info_exec(GeoNodeExecParams params)
+static void geo_node_object_info_exec(GeoNodeExecParams params)
{
bke::PersistentObjectHandle object_handle = params.extract_input<bke::PersistentObjectHandle>(
"Object");
@@ -89,6 +89,6 @@ void register_node_type_geo_object_info()
geo_node_type_base(&ntype, GEO_NODE_OBJECT_INFO, "Object Info", 0, 0);
node_type_socket_templates(&ntype, geo_node_object_info_in, geo_node_object_info_out);
- ntype.geometry_node_execute = blender::nodes::geo_object_info_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_object_info_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index d8db45479c6..7ab3bfba1b1 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@ -90,7 +90,7 @@ static Vector<float3> scatter_points_from_mesh(const Mesh *mesh,
return points;
}
-static void geo_point_distribute_exec(GeoNodeExecParams params)
+static void geo_node_point_distribute_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
@@ -137,6 +137,6 @@ void register_node_type_geo_point_distribute()
geo_node_type_base(&ntype, GEO_NODE_POINT_DISTRIBUTE, "Point Distribute", 0, 0);
node_type_socket_templates(&ntype, geo_node_point_distribute_in, geo_node_point_distribute_out);
- ntype.geometry_node_execute = blender::nodes::geo_point_distribute_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_point_distribute_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
index f2255980027..b8b7dc4cace 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_instance.cc
@@ -73,7 +73,7 @@ static void add_instances_from_geometry_component(InstancesComponent &instances,
}
}
-static void geo_point_instance_exec(GeoNodeExecParams params)
+static void geo_node_point_instance_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
@@ -106,6 +106,6 @@ void register_node_type_geo_point_instance()
geo_node_type_base(&ntype, GEO_NODE_POINT_INSTANCE, "Point Instance", 0, 0);
node_type_socket_templates(&ntype, geo_node_point_instance_in, geo_node_point_instance_out);
node_type_init(&ntype, blender::nodes::geo_node_point_instance_init);
- ntype.geometry_node_execute = blender::nodes::geo_point_instance_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_point_instance_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc
index 5ea864a0364..a65e254cf29 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_random_attribute.cc
@@ -119,7 +119,7 @@ static void randomize_attribute(GeometryComponent &component,
}
}
-static void geo_random_attribute_exec(GeoNodeExecParams params)
+static void geo_node_random_attribute_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
const int seed = params.get_input<int>("Seed");
@@ -148,6 +148,6 @@ void register_node_type_geo_random_attribute()
node_type_socket_templates(&ntype, geo_node_random_attribute_in, geo_node_random_attribute_out);
node_type_init(&ntype, geo_node_random_attribute_init);
node_type_update(&ntype, geo_node_random_attribute_update);
- ntype.geometry_node_execute = blender::nodes::geo_random_attribute_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_random_attribute_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
index 08777ca513a..dccdf94243e 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc
@@ -36,7 +36,7 @@ static bNodeSocketTemplate geo_node_subdivision_surface_out[] = {
};
namespace blender::nodes {
-static void geo_subdivision_surface_exec(GeoNodeExecParams params)
+static void geo_node_subdivision_surface_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
@@ -108,6 +108,6 @@ void register_node_type_geo_subdivision_surface()
geo_node_type_base(&ntype, GEO_NODE_SUBDIVISION_SURFACE, "Subdivision Surface", 0, 0);
node_type_socket_templates(
&ntype, geo_node_subdivision_surface_in, geo_node_subdivision_surface_out);
- ntype.geometry_node_execute = blender::nodes::geo_subdivision_surface_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_subdivision_surface_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_transform.cc b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
index 7ee6cf0e6e7..291d54914c5 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_transform.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_transform.cc
@@ -107,7 +107,7 @@ static void transform_instances(InstancesComponent &instances,
}
}
-static void geo_transform_exec(GeoNodeExecParams params)
+static void geo_node_transform_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
const float3 translation = params.extract_input<float3>("Translation");
@@ -139,6 +139,6 @@ void register_node_type_geo_transform()
geo_node_type_base(&ntype, GEO_NODE_TRANSFORM, "Transform", 0, 0);
node_type_socket_templates(&ntype, geo_node_transform_in, geo_node_transform_out);
- ntype.geometry_node_execute = blender::nodes::geo_transform_exec;
+ ntype.geometry_node_execute = blender::nodes::geo_node_transform_exec;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
index c81e327a5b0..cec717e4a61 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc
@@ -46,7 +46,7 @@ static void geo_triangulate_init(bNodeTree *UNUSED(ntree), b
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list