Update visualisation includes to use the new directory paths

FLAMEGPU · Jul 7, 2021 · 2403064 · 2403064
1 parent 5f7ab95
commit 2403064
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 13 deletions.
diff --git a/include/flamegpu/visualiser/AgentStateVis.h b/include/flamegpu/visualiser/AgentStateVis.h
@@ -4,8 +4,9 @@
 
 #include <string>
 
-#include "config/AgentStateConfig.h"
-#include "config/Stock.h"
+// @todo - All vis headers should live in the vis repo.
+#include "flamegpu/visualiser/config/AgentStateConfig.h"
+#include "flamegpu/visualiser/config/Stock.h"
 
 namespace flamegpu {
 namespace visualiser {

diff --git a/include/flamegpu/visualiser/AgentVis.h b/include/flamegpu/visualiser/AgentVis.h
@@ -8,10 +8,11 @@
 #include <string>
 #include <map>
 
+// @todo - All vis headers should live in the vis repo.
 #include "flamegpu/visualiser/AgentStateVis.h"
-#include "config/AgentStateConfig.h"
-#include "config/Stock.h"
-#include "config/TexBufferConfig.h"
+#include "flamegpu/visualiser/config/AgentStateConfig.h"
+#include "flamegpu/visualiser/config/Stock.h"
+#include "flamegpu/visualiser/config/TexBufferConfig.h"
 
 namespace flamegpu {
 struct AgentData;

diff --git a/include/flamegpu/visualiser/LineVis.h b/include/flamegpu/visualiser/LineVis.h
@@ -4,7 +4,8 @@
 
 #include <memory>
 
-#include "config/LineConfig.h"
+// @todo - All vis headers should live in the vis repo.
+#include "flamegpu/visualiser/config/LineConfig.h"
 
 namespace flamegpu {
 namespace visualiser {

diff --git a/include/flamegpu/visualiser/ModelVis.h b/include/flamegpu/visualiser/ModelVis.h
@@ -8,11 +8,12 @@
 #include <memory>
 #include <climits>
 
+// @todo - All vis headers should live in the vis repo.
 #include "flamegpu/visualiser/AgentVis.h"
 #include "flamegpu/visualiser/StaticModelVis.h"
 #include "flamegpu/visualiser/LineVis.h"
 #include "flamegpu/visualiser/color/AutoPalette.h"
-#include "config/ModelConfig.h"
+#include "flamegpu/visualiser/config/ModelConfig.h"
 
 namespace flamegpu {
 

diff --git a/include/flamegpu/visualiser/StaticModelVis.h b/include/flamegpu/visualiser/StaticModelVis.h
@@ -2,7 +2,7 @@
 #define INCLUDE_FLAMEGPU_VISUALISER_STATICMODELVIS_H_
 #include <memory>
 
-#include "config/ModelConfig.h"
+#include "flamegpu/visualiser/config/ModelConfig.h"
 
 namespace flamegpu {
 namespace visualiser {

diff --git a/src/flamegpu/gpu/CUDASimulation.cu b/src/flamegpu/gpu/CUDASimulation.cu
@@ -23,7 +23,7 @@
 #include "flamegpu/sim/LoggingConfig.h"
 #include "flamegpu/sim/LogFrame.h"
 #ifdef VISUALISATION
-#include "FLAMEGPU_Visualisation.h"
+#include "flamegpu/visualiser/FLAMEGPU_Visualisation.h"
 #endif
 
 namespace flamegpu {

diff --git a/src/flamegpu/visualiser/AgentVis.cpp b/src/flamegpu/visualiser/AgentVis.cpp
@@ -6,7 +6,7 @@
 #include "flamegpu/model/AgentData.h"
 #include "flamegpu/visualiser/color/ColorFunction.h"
 #include "flamegpu/visualiser/color/StaticColor.h"
-#include "FLAMEGPU_Visualisation.h"
+#include "flamegpu/visualiser/FLAMEGPU_Visualisation.h"
 
 namespace flamegpu {
 namespace visualiser {

diff --git a/src/flamegpu/visualiser/ModelVis.cpp b/src/flamegpu/visualiser/ModelVis.cpp
@@ -6,7 +6,7 @@
 
 #include "flamegpu/gpu/CUDASimulation.h"
 #include "flamegpu/model/AgentData.h"
-#include "FLAMEGPU_Visualisation.h"
+#include "flamegpu/visualiser/FLAMEGPU_Visualisation.h"
 
 namespace flamegpu {
 namespace visualiser {

diff --git a/swig/python/flamegpu.i b/swig/python/flamegpu.i
@@ -734,7 +734,7 @@ TEMPLATE_VARIABLE_INSTANTIATE_FLOATS(logNormal, flamegpu::HostRandom::logNormal)
     // @todo - Need to put the vis repo into a subfolder for more sensible include paths
     %{
         #include "flamegpu/visualiser/visualiser_api.h"
-        #include "config/Stock.h"
+        #include "flamegpu/visualiser/config/Stock.h"
         using namespace flamegpu;
         using namespace flamegpu::visualiser;
     %}
@@ -760,7 +760,7 @@ TEMPLATE_VARIABLE_INSTANTIATE_FLOATS(logNormal, flamegpu::HostRandom::logNormal)
     // -----------------
     // %includes for classes to wrap. 
     // -----------------
-    %include "config/Stock.h"
+    %include "flamegpu/visualiser/config/Stock.h"
     %include "flamegpu/visualiser/StaticModelVis.h"
     %include "flamegpu/visualiser/AgentStateVis.h"
     %include "flamegpu/visualiser/AgentVis.h"