[Bf-blender-cvs] [715e0faabcb] master: Nodes: Declare function nodes in individual file namespace
Aaron Carlisle
noreply at git.blender.org
Tue Dec 28 20:18:36 CET 2021
Commit: 715e0faabcbfc4a170394dd978986d9881c4e611
Author: Aaron Carlisle
Date: Tue Dec 28 13:37:59 2021 -0500
Branches: master
https://developer.blender.org/rB715e0faabcbfc4a170394dd978986d9881c4e611
Nodes: Declare function nodes in individual file namespace
To be used in the future to support unity builds
===================================================================
M source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc
M source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
M source/blender/nodes/function/nodes/node_fn_boolean_math.cc
M source/blender/nodes/function/nodes/node_fn_float_to_int.cc
M source/blender/nodes/function/nodes/node_fn_input_bool.cc
M source/blender/nodes/function/nodes/node_fn_input_color.cc
M source/blender/nodes/function/nodes/node_fn_input_int.cc
M source/blender/nodes/function/nodes/node_fn_input_special_characters.cc
M source/blender/nodes/function/nodes/node_fn_input_string.cc
M source/blender/nodes/function/nodes/node_fn_input_vector.cc
M source/blender/nodes/function/nodes/node_fn_random_value.cc
M source/blender/nodes/function/nodes/node_fn_replace_string.cc
M source/blender/nodes/function/nodes/node_fn_rotate_euler.cc
M source/blender/nodes/function/nodes/node_fn_slice_string.cc
M source/blender/nodes/function/nodes/node_fn_string_length.cc
M source/blender/nodes/function/nodes/node_fn_value_to_string.cc
===================================================================
diff --git a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc
index d98d49c7273..1ad34309bf2 100644
--- a/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc
+++ b/source/blender/nodes/function/nodes/legacy/node_fn_random_float.cc
@@ -18,7 +18,7 @@
#include "BLI_hash.h"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_random_float_cc {
static void fn_node_legacy_random_float_declare(NodeDeclarationBuilder &b)
{
@@ -29,8 +29,6 @@ static void fn_node_legacy_random_float_declare(NodeDeclarationBuilder &b)
b.add_output<decl::Float>(N_("Value"));
};
-} // namespace blender::nodes
-
class RandomFloatFunction : public blender::fn::MultiFunction {
public:
RandomFloatFunction()
@@ -75,12 +73,16 @@ static void fn_node_legacy_random_float_build_multi_function(
builder.set_matching_fn(fn);
}
+} // namespace blender::nodes::node_fn_random_float_cc
+
void register_node_type_fn_legacy_random_float()
{
+ namespace file_ns = blender::nodes::node_fn_random_float_cc;
+
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_LEGACY_RANDOM_FLOAT, "Random Float", 0, 0);
- ntype.declare = blender::nodes::fn_node_legacy_random_float_declare;
- ntype.build_multi_function = fn_node_legacy_random_float_build_multi_function;
+ ntype.declare = file_ns::fn_node_legacy_random_float_declare;
+ ntype.build_multi_function = file_ns::fn_node_legacy_random_float_build_multi_function;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
index 4088fa24ca7..a8436b96009 100644
--- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
+++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc
@@ -23,7 +23,7 @@
#include "node_function_util.hh"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_align_euler_to_vector_cc {
static void fn_node_align_euler_to_vector_declare(NodeDeclarationBuilder &b)
{
@@ -207,16 +207,18 @@ static void fn_node_align_euler_to_vector_build_multi_function(NodeMultiFunction
builder.construct_and_set_matching_fn<MF_AlignEulerToVector>(node.custom1, node.custom2);
}
-} // namespace blender::nodes
+} // namespace blender::nodes::node_fn_align_euler_to_vector_cc
void register_node_type_fn_align_euler_to_vector()
{
+ namespace file_ns = blender::nodes::node_fn_align_euler_to_vector_cc;
+
static bNodeType ntype;
fn_node_type_base(
&ntype, FN_NODE_ALIGN_EULER_TO_VECTOR, "Align Euler to Vector", NODE_CLASS_CONVERTER, 0);
- ntype.declare = blender::nodes::fn_node_align_euler_to_vector_declare;
- ntype.draw_buttons = blender::nodes::fn_node_align_euler_to_vector_layout;
- ntype.build_multi_function = blender::nodes::fn_node_align_euler_to_vector_build_multi_function;
+ ntype.declare = file_ns::fn_node_align_euler_to_vector_declare;
+ ntype.draw_buttons = file_ns::fn_node_align_euler_to_vector_layout;
+ ntype.build_multi_function = file_ns::fn_node_align_euler_to_vector_build_multi_function;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc
index 4b59b49c632..45145958002 100644
--- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc
+++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc
@@ -24,7 +24,7 @@
#include "node_function_util.hh"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_boolean_math_cc {
static void fn_node_boolean_math_declare(NodeDeclarationBuilder &b)
{
@@ -87,17 +87,19 @@ static void fn_node_boolean_math_build_multi_function(NodeMultiFunctionBuilder &
builder.set_matching_fn(fn);
}
-} // namespace blender::nodes
+} // namespace blender::nodes::node_fn_boolean_math_cc
void register_node_type_fn_boolean_math()
{
+ namespace file_ns = blender::nodes::node_fn_boolean_math_cc;
+
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_BOOLEAN_MATH, "Boolean Math", NODE_CLASS_CONVERTER, 0);
- ntype.declare = blender::nodes::fn_node_boolean_math_declare;
- ntype.labelfunc = blender::nodes::node_boolean_math_label;
- node_type_update(&ntype, blender::nodes::node_boolean_math_update);
- ntype.build_multi_function = blender::nodes::fn_node_boolean_math_build_multi_function;
- ntype.draw_buttons = blender::nodes::fn_node_boolean_math_layout;
+ ntype.declare = file_ns::fn_node_boolean_math_declare;
+ ntype.labelfunc = file_ns::node_boolean_math_label;
+ node_type_update(&ntype, file_ns::node_boolean_math_update);
+ ntype.build_multi_function = file_ns::fn_node_boolean_math_build_multi_function;
+ ntype.draw_buttons = file_ns::fn_node_boolean_math_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc
index 21f6734e4aa..33b9f94ddcd 100644
--- a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc
+++ b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc
@@ -25,7 +25,7 @@
#include "node_function_util.hh"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_float_to_int_cc {
static void fn_node_float_to_int_declare(NodeDeclarationBuilder &b)
{
@@ -81,16 +81,18 @@ static void fn_node_float_to_int_build_multi_function(NodeMultiFunctionBuilder &
builder.set_matching_fn(fn);
}
-} // namespace blender::nodes
+} // namespace blender::nodes::node_fn_float_to_int_cc
void register_node_type_fn_float_to_int()
{
+ namespace file_ns = blender::nodes::node_fn_float_to_int_cc;
+
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_FLOAT_TO_INT, "Float to Integer", NODE_CLASS_CONVERTER, 0);
- ntype.declare = blender::nodes::fn_node_float_to_int_declare;
- ntype.labelfunc = blender::nodes::node_float_to_int_label;
- ntype.build_multi_function = blender::nodes::fn_node_float_to_int_build_multi_function;
- ntype.draw_buttons = blender::nodes::fn_node_float_to_int_layout;
+ ntype.declare = file_ns::fn_node_float_to_int_declare;
+ ntype.labelfunc = file_ns::node_float_to_int_label;
+ ntype.build_multi_function = file_ns::fn_node_float_to_int_build_multi_function;
+ ntype.draw_buttons = file_ns::fn_node_float_to_int_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc
index 5623a6df357..edb18903b65 100644
--- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc
+++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc
@@ -21,7 +21,7 @@
#include "UI_interface.h"
#include "UI_resources.h"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_input_bool_cc {
static void fn_node_input_bool_declare(NodeDeclarationBuilder &b)
{
@@ -47,18 +47,20 @@ static void fn_node_input_bool_init(bNodeTree *UNUSED(ntree), bNode *node)
node->storage = data;
}
-} // namespace blender::nodes
+} // namespace blender::nodes::node_fn_input_bool_cc
void register_node_type_fn_input_bool()
{
+ namespace file_ns = blender::nodes::node_fn_input_bool_cc;
+
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_INPUT_BOOL, "Boolean", 0, 0);
- ntype.declare = blender::nodes::fn_node_input_bool_declare;
- node_type_init(&ntype, blender::nodes::fn_node_input_bool_init);
+ ntype.declare = file_ns::fn_node_input_bool_declare;
+ node_type_init(&ntype, file_ns::fn_node_input_bool_init);
node_type_storage(
&ntype, "NodeInputBool", node_free_standard_storage, node_copy_standard_storage);
- ntype.build_multi_function = blender::nodes::fn_node_input_bool_build_multi_function;
- ntype.draw_buttons = blender::nodes::fn_node_input_bool_layout;
+ ntype.build_multi_function = file_ns::fn_node_input_bool_build_multi_function;
+ ntype.draw_buttons = file_ns::fn_node_input_bool_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc
index cb8d95fc63a..125df09b544 100644
--- a/source/blender/nodes/function/nodes/node_fn_input_color.cc
+++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc
@@ -19,7 +19,7 @@
#include "UI_interface.h"
#include "UI_resources.h"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_input_color_cc {
static void fn_node_input_color_declare(NodeDeclarationBuilder &b)
{
@@ -48,18 +48,20 @@ static void fn_node_input_color_init(bNodeTree *UNUSED(ntree), bNode *node)
node->storage = data;
}
-} // namespace blender::nodes
+} // namespace blender::nodes::node_fn_input_color_cc
void register_node_type_fn_input_color()
{
+ namespace file_ns = blender::nodes::node_fn_input_color_cc;
+
static bNodeType ntype;
fn_node_type_base(&ntype, FN_NODE_INPUT_COLOR, "Color", NODE_CLASS_INPUT, 0);
- ntype.declare = blender::nodes::fn_node_input_color_declare;
- node_type_init(&ntype, blender::nodes::fn_node_input_color_init);
+ ntype.declare = file_ns::fn_node_input_color_declare;
+ node_type_init(&ntype, file_ns::fn_node_input_color_init);
node_type_storage(
&ntype, "NodeInputColor", node_free_standard_storage, node_copy_standard_storage);
- ntype.build_multi_function = blender::nodes::fn_node_input_color_build_multi_function;
- ntype.draw_buttons = blender::nodes::fn_node_input_color_layout;
+ ntype.build_multi_function = file_ns::fn_node_input_color_build_multi_function;
+ ntype.draw_buttons = file_ns::fn_node_input_color_layout;
nodeRegisterType(&ntype);
}
diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc
index b82dc06395d..4fecbf24248 100644
--- a/source/blender/nodes/function/nodes/node_fn_input_int.cc
+++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc
@@ -21,7 +21,7 @@
#include "UI_interface.h"
#include "UI_resources.h"
-namespace blender::nodes {
+namespace blender::nodes::node_fn_input_int_cc {
static void fn_node
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list