Commit: dbc584ea9c6bfa21cb4dd04c5a93d1e71b3a3e36
Author: Jacques Lucke
Date: Thu Feb 28 14:01:47 2019 +0100
Branches: functions
https://developer.blender.org/rBdbc584ea9c6bfa21cb4dd04c5a93d1e71b3a3e36
move some files
===================================================================
M source/blender/functions/CMakeLists.txt
M source/blender/functions/FN_all.hpp
A source/blender/functions/FN_data_flow_nodes.hpp
M source/blender/functions/c_wrapper.cpp
R098 source/blender/functions/nodes/graph_generation.cpp
source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
R058 source/blender/functions/nodes/graph_generation.hpp
source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
R097 source/blender/functions/nodes/nodes.cpp
source/blender/functions/frontends/data_flow_nodes/nodes.cpp
R096 source/blender/functions/nodes/nodes.hpp
source/blender/functions/frontends/data_flow_nodes/nodes.hpp
R097 source/blender/functions/nodes/socket_inputs.cpp
source/blender/functions/frontends/data_flow_nodes/socket_inputs.cpp
R098 source/blender/functions/nodes/test_nodes.cpp
source/blender/functions/frontends/data_flow_nodes/test_nodes.cpp
===================================================================
diff --git a/source/blender/functions/CMakeLists.txt
b/source/blender/functions/CMakeLists.txt
index f4e6ffc6f84..cf467a9eada 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SRC
FN_core.hpp
FN_types.hpp
FN_functions.hpp
+ FN_data_flow_nodes.hpp
FN-C.h
c_wrapper.cpp
@@ -47,12 +48,12 @@ set(SRC
functions/vectors.hpp
functions/vectors.cpp
- nodes/nodes.hpp
- nodes/nodes.cpp
- nodes/graph_generation.hpp
- nodes/graph_generation.cpp
- nodes/socket_inputs.cpp
- nodes/test_nodes.cpp
+ frontends/data_flow_nodes/nodes.hpp
+ frontends/data_flow_nodes/nodes.cpp
+ frontends/data_flow_nodes/graph_generation.hpp
+ frontends/data_flow_nodes/graph_generation.cpp
+ frontends/data_flow_nodes/socket_inputs.cpp
+ frontends/data_flow_nodes/test_nodes.cpp
)
blender_add_lib(bf_functions "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blender/functions/FN_all.hpp
b/source/blender/functions/FN_all.hpp
index cbbb4578bb2..76c4c76fcb7 100644
--- a/source/blender/functions/FN_all.hpp
+++ b/source/blender/functions/FN_all.hpp
@@ -2,4 +2,5 @@
#include "FN_core.hpp"
#include "FN_types.hpp"
-#include "FN_functions.hpp"
\ No newline at end of file
+#include "FN_functions.hpp"
+#include "FN_data_flow_nodes.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/FN_data_flow_nodes.hpp
b/source/blender/functions/FN_data_flow_nodes.hpp
new file mode 100644
index 00000000000..43629104aff
--- /dev/null
+++ b/source/blender/functions/FN_data_flow_nodes.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "frontends/data_flow_nodes/graph_generation.hpp"
+#include "frontends/data_flow_nodes/nodes.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/c_wrapper.cpp
b/source/blender/functions/c_wrapper.cpp
index 9ad1e46441d..8c82a28d671 100644
--- a/source/blender/functions/c_wrapper.cpp
+++ b/source/blender/functions/c_wrapper.cpp
@@ -1,9 +1,6 @@
#include "FN-C.h"
#include "FN_all.hpp"
-#include "nodes/nodes.hpp"
-#include "nodes/graph_generation.hpp"
-
#include "BLI_timeit.hpp"
#include <iostream>
@@ -21,7 +18,7 @@ WRAPPERS(const FN::TupleCallBody *, FnTupleCallBody);
void FN_initialize()
{
- FN::Nodes::initialize();
+ FN::DataFlowNodes::initialize();
}
void FN_function_call(FnTupleCallBody fn_call, FnTuple fn_in, FnTuple fn_out)
@@ -170,7 +167,7 @@ FnFunction FN_tree_to_function(bNodeTree *btree)
{
TIMEIT("Tree to function");
BLI_assert(btree);
- auto fgraph = FN::Nodes::btree_to_graph(btree);
+ auto fgraph = FN::DataFlowNodes::btree_to_graph(btree);
//std::cout << fgraph.graph()->to_dot() << std::endl;
auto fn = FN::SharedFunction::New("Function from Node Tree",
fgraph.signature());
diff --git a/source/blender/functions/nodes/graph_generation.cpp
b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
similarity index 98%
rename from source/blender/functions/nodes/graph_generation.cpp
rename to
source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
index 126f0774420..214cbd683da 100644
--- a/source/blender/functions/nodes/graph_generation.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.cpp
@@ -1,6 +1,6 @@
#include "graph_generation.hpp"
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
using namespace Types;
diff --git a/source/blender/functions/nodes/graph_generation.hpp
b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
similarity index 58%
rename from source/blender/functions/nodes/graph_generation.hpp
rename to
source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
index 718ce71f94c..a858e4a5c7b 100644
--- a/source/blender/functions/nodes/graph_generation.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
@@ -2,8 +2,8 @@
#include "nodes.hpp"
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
FunctionGraph btree_to_graph(bNodeTree *btree);
-} } /* namespace FN::Nodes */
\ No newline at end of file
+} }
\ No newline at end of file
diff --git a/source/blender/functions/nodes/nodes.cpp
b/source/blender/functions/frontends/data_flow_nodes/nodes.cpp
similarity index 97%
rename from source/blender/functions/nodes/nodes.cpp
rename to source/blender/functions/frontends/data_flow_nodes/nodes.cpp
index df4012eedf4..6da548f91f8 100644
--- a/source/blender/functions/nodes/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/nodes.cpp
@@ -1,6 +1,6 @@
#include "nodes.hpp"
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
SmallMap<std::string, InsertNode> node_inserters;
SmallMap<std::string, InsertSocket> socket_inserters;
diff --git a/source/blender/functions/nodes/nodes.hpp
b/source/blender/functions/frontends/data_flow_nodes/nodes.hpp
similarity index 96%
rename from source/blender/functions/nodes/nodes.hpp
rename to source/blender/functions/frontends/data_flow_nodes/nodes.hpp
index 2bdc31dca83..1d1e951b1fc 100644
--- a/source/blender/functions/nodes/nodes.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/nodes.hpp
@@ -5,7 +5,7 @@
#include "BLI_listbase_wrapper.hpp"
#include <functional>
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
using bNodeList = ListBaseWrapper<bNode, true>;
using bLinkList = ListBaseWrapper<bNodeLink, true>;
diff --git a/source/blender/functions/nodes/socket_inputs.cpp
b/source/blender/functions/frontends/data_flow_nodes/socket_inputs.cpp
similarity index 97%
rename from source/blender/functions/nodes/socket_inputs.cpp
rename to source/blender/functions/frontends/data_flow_nodes/socket_inputs.cpp
index b7c7ef98401..0013bb2c2ce 100644
--- a/source/blender/functions/nodes/socket_inputs.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/socket_inputs.cpp
@@ -2,7 +2,7 @@
#include "RNA_access.h"
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
using namespace Types;
diff --git a/source/blender/functions/nodes/test_nodes.cpp
b/source/blender/functions/frontends/data_flow_nodes/test_nodes.cpp
similarity index 98%
rename from source/blender/functions/nodes/test_nodes.cpp
rename to source/blender/functions/frontends/data_flow_nodes/test_nodes.cpp
index cc03ffe012f..c2af3fe2653 100644
--- a/source/blender/functions/nodes/test_nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/test_nodes.cpp
@@ -4,7 +4,7 @@
#include "FN_functions.hpp"
#include "FN_types.hpp"
-namespace FN { namespace Nodes {
+namespace FN { namespace DataFlowNodes {
using namespace Types;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
