[Bf-blender-cvs] [745c6dec4d7] functions-experimental-refactor: move functions to other file

Jacques Lucke noreply at git.blender.org
Tue Oct 15 15:57:11 CEST 2019


Commit: 745c6dec4d71f720c50997ce63d2294260f944d5
Author: Jacques Lucke
Date:   Fri Oct 11 12:36:06 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB745c6dec4d71f720c50997ce63d2294260f944d5

move functions to other file

===================================================================

D	source/blender/blenkernel/BKE_node_functions.h
M	source/blender/blenkernel/CMakeLists.txt
A	source/blender/blenkernel/intern/BKE_multi_functions.h
R088	source/blender/blenkernel/intern/node_functions.cc	source/blender/blenkernel/intern/multi_functions.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_node_functions.h b/source/blender/blenkernel/BKE_node_functions.h
deleted file mode 100644
index 4b57f3a94ae..00000000000
--- a/source/blender/blenkernel/BKE_node_functions.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __BKE_NODE_FUNCTIONS_H__
-#define __BKE_NODE_FUNCTIONS_H__
-
-#include "BKE_virtual_node_tree_cxx.h"
-#include "BKE_cpp_function.h"
-
-#include "BLI_optional.h"
-
-namespace BKE {
-
-};  // namespace BKE
-
-#endif /* __BKE_NODE_FUNCTIONS_H__ */
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 015954dd550..aef6a3c1225 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -173,7 +173,7 @@ set(SRC
   intern/nla.c
   intern/node.c
   intern/node_tree.cpp
-  intern/node_functions.cc
+  intern/multi_functions.cc
   intern/object.c
   intern/object_deform.c
   intern/object_dupli.c
diff --git a/source/blender/blenkernel/intern/BKE_multi_functions.h b/source/blender/blenkernel/intern/BKE_multi_functions.h
new file mode 100644
index 00000000000..e5b8388a817
--- /dev/null
+++ b/source/blender/blenkernel/intern/BKE_multi_functions.h
@@ -0,0 +1,15 @@
+#ifndef __BKE_MULTI_FUNCTIONS_H__
+#define __BKE_MULTI_FUNCTIONS_H__
+
+#include "BKE_multi_function.h"
+
+namespace BKE {
+
+class MultiFunction_AddFloats final : public MultiFunction {
+  void signature(Signature &signature) const override;
+  void call(ArrayRef<uint> mask_indices, Params &params) const override;
+};
+
+};  // namespace BKE
+
+#endif /* __BKE_MULTI_FUNCTIONS_H__ */
diff --git a/source/blender/blenkernel/intern/node_functions.cc b/source/blender/blenkernel/intern/multi_functions.cc
similarity index 88%
rename from source/blender/blenkernel/intern/node_functions.cc
rename to source/blender/blenkernel/intern/multi_functions.cc
index 7ed8c3fba48..75ad8468eb3 100644
--- a/source/blender/blenkernel/intern/node_functions.cc
+++ b/source/blender/blenkernel/intern/multi_functions.cc
@@ -1,7 +1,6 @@
-#include "BKE_node_functions.h"
 #include "BKE_generic_array_ref.h"
 #include "BKE_generic_vector_array.h"
-#include "BKE_multi_function.h"
+#include "BKE_multi_functions.h"
 
 #include "BLI_math_cxx.h"
 #include "BLI_lazy_init_cxx.h"
@@ -13,25 +12,23 @@ namespace BKE {
 using BLI::ArrayOrSingleRef;
 using BLI::float3;
 
-class MultiFunction_AddFloats final : public MultiFunction {
-  void signature(Signature &signature) const override
-  {
-    signature.readonly_single_input<float>("A");
-    signature.readonly_single_input<float>("B");
-    signature.single_output<float>("Result");
-  }
+void MultiFunction_AddFloats::signature(Signature &signature) const
+{
+  signature.readonly_single_input<float>("A");
+  signature.readonly_single_input<float>("B");
+  signature.single_output<float>("Result");
+}
 
-  void call(ArrayRef<uint> mask_indices, Params &params) const override
-  {
-    auto a = params.readonly_single_input<float>(0, "A");
-    auto b = params.readonly_single_input<float>(1, "B");
-    auto result = params.single_output<float>(2, "Result");
+void MultiFunction_AddFloats::call(ArrayRef<uint> mask_indices, Params &params) const
+{
+  auto a = params.readonly_single_input<float>(0, "A");
+  auto b = params.readonly_single_input<float>(1, "B");
+  auto result = params.single_output<float>(2, "Result");
 
-    for (uint i : mask_indices) {
-      result[i] = a[i] + b[i];
-    }
+  for (uint i : mask_indices) {
+    result[i] = a[i] + b[i];
   }
-};
+}
 
 class MultiFunction_VectorDistance final : public MultiFunction {
   void signature(Signature &signature) const override



More information about the Bf-blender-cvs mailing list