[Bf-blender-cvs] [ed47df29e3b] functions-experimental-refactor: move VTreeMFNetwork to functions2

[Jacques Lucke]

Commit: ed47df29e3b339fe4d33f3f41c8a3296d8fce196
Author: Jacques Lucke
Date:   Fri Nov 1 19:56:11 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rBed47df29e3b339fe4d33f3f41c8a3296d8fce196

move VTreeMFNetwork to functions2

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

M	source/blender/functions2/CMakeLists.txt
A	source/blender/functions2/FN_vtree_multi_function_network.h
M	source/blender/modifiers/intern/MOD_functiondeform_cxx.cc

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

diff --git a/source/blender/functions2/CMakeLists.txt b/source/blender/functions2/CMakeLists.txt
index 9df1c65932a..c1ccda411b2 100644
--- a/source/blender/functions2/CMakeLists.txt
+++ b/source/blender/functions2/CMakeLists.txt
@@ -40,6 +40,7 @@ set(SRC
   FN_multi_function_network.h
   FN_multi_function.h
   FN_multi_functions.h
+  FN_vtree_multi_function_network.h
 
   intern/multi_functions/lists.h
   intern/multi_functions/mixed.h
diff --git a/source/blender/functions2/FN_vtree_multi_function_network.h b/source/blender/functions2/FN_vtree_multi_function_network.h
new file mode 100644
index 00000000000..0afe793990a
--- /dev/null
+++ b/source/blender/functions2/FN_vtree_multi_function_network.h
@@ -0,0 +1,47 @@
+#ifndef __FN_VTREE_MULTI_FUNCTION_NETWORK_H__
+#define __FN_VTREE_MULTI_FUNCTION_NETWORK_H__
+
+#include "BKE_virtual_node_tree_cxx.h"
+
+#include "FN_multi_function_network.h"
+
+namespace FN {
+
+using BKE::VirtualLink;
+using BKE::VirtualNode;
+using BKE::VirtualNodeTree;
+using BKE::VirtualSocket;
+
+class VTreeMFNetwork {
+ private:
+  const VirtualNodeTree &m_vtree;
+  std::unique_ptr<MFNetwork> m_network;
+  Array<const MFSocket *> m_socket_map;
+
+ public:
+  VTreeMFNetwork(const VirtualNodeTree &vtree,
+                 std::unique_ptr<MFNetwork> network,
+                 Array<const MFSocket *> socket_map)
+      : m_vtree(vtree), m_network(std::move(network)), m_socket_map(std::move(socket_map))
+  {
+  }
+
+  const VirtualNodeTree &vtree()
+  {
+    return m_vtree;
+  }
+
+  const MFNetwork &network()
+  {
+    return *m_network;
+  }
+
+  const MFSocket &lookup_socket(const VirtualSocket &vsocket)
+  {
+    return *m_socket_map[vsocket.id()];
+  }
+};
+
+}  // namespace FN
+
+#endif /* __FN_VTREE_MULTI_FUNCTION_NETWORK_H__ */
diff --git a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
index a16e1de36bf..b6bbd0c4247 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
+++ b/source/blender/modifiers/intern/MOD_functiondeform_cxx.cc
@@ -1,8 +1,10 @@
 #include "DNA_modifier_types.h"
 
 #include "BKE_virtual_node_tree_cxx.h"
+
 #include "FN_multi_functions.h"
 #include "FN_multi_function_network.h"
+#include "FN_vtree_multi_function_network.h"
 
 #include "BLI_math_cxx.h"
 #include "BLI_string_map.h"
@@ -56,6 +58,7 @@ using FN::MFSignature;
 using FN::MFSignatureBuilder;
 using FN::MFSocket;
 using FN::MultiFunction;
+using FN::VTreeMFNetwork;
 
 extern "C" {
 void MOD_functiondeform_do(FunctionDeformModifierData *fdmd, float (*vertexCos)[3], int numVerts);
@@ -130,36 +133,6 @@ static const CPPType &get_cpp_type_by_name(StringRef name)
   return FN::GET_TYPE<float>();
 }
 
-class VTreeMFNetwork {
- private:
-  const VirtualNodeTree &m_vtree;
-  std::unique_ptr<MFNetwork> m_network;
-  Array<const MFSocket *> m_socket_map;
-
- public:
-  VTreeMFNetwork(const VirtualNodeTree &vtree,
-                 std::unique_ptr<MFNetwork> network,
-                 Array<const MFSocket *> socket_map)
-      : m_vtree(vtree), m_network(std::move(network)), m_socket_map(std::move(socket_map))
-  {
-  }
-
-  const VirtualNodeTree &vtree()
-  {
-    return m_vtree;
-  }
-
-  const MFNetwork &network()
-  {
-    return *m_network;
-  }
-
-  const MFSocket &lookup_socket(const VirtualSocket &vsocket)
-  {
-    return *m_socket_map[vsocket.id()];
-  }
-};
-
 class VTreeMFNetworkBuilder {
  private:
   const VirtualNodeTree &m_vtree;