refactor fluid sim headers

.vscode/settings.json

@@ -30,6 +30,7 @@
         "test.h": "c",
         "stdlib.h": "c",
         "chunk_test_utils.h": "c",
-        "sparsesimulator.h": "c"
+        "sparsesimulator.h": "c",
+        "environment.h": "c"
     }
 }

docs/src/progress/renderertodo.md

@@ -1248,6 +1248,7 @@ Fix doxygen also pointing at native code lib folder
 (14/06/2024)
 Fix arena loading
 Refactoring fluid sim code
+Refactoring fluid sim headers
 
 
 

src/main/c/includes/fluid/env/utilities.h

@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 #ifndef UTILITIES_H
 #define UTILITIES_H

src/main/c/includes/fluid/queue/islandsolver.h

@@ -6,7 +6,7 @@
 #ifndef ISLANDSOLVER_H
 #define ISLANDSOLVER_H
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 /**
  * A set of sparse matricies for simulating fluids

src/main/c/includes/fluid/queue/metadatacalc.h

@@ -1,8 +1,8 @@
 #ifndef METADATACALC
 #define METADATACALC
 
-#include "./chunk.h"
+#include "fluid/queue/chunk.h"
-#include "./environment.h"
+#include "fluid/env/environment.h"
 
 
 /**

src/main/c/includes/fluid/sim/grid/mainFunctions.h

@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "environment.h"
+#include "fluid/env/environment.h"
 
 #ifndef MAINFUNC
 #define MAINFUNC

src/main/c/includes/fluid/sim/grid/simulation.h

@@ -1,8 +1,8 @@
 #ifndef SIMULATION_H
 #define SIMULATION_H
 
-#include "./chunk.h"
+#include "fluid/queue/chunk.h"
-#include "./environment.h"
+#include "fluid/env/environment.h"
 
 /**
  * Performs the main simulation

src/main/c/includes/fluid/sim/sparse/sparsesimulator.h

@@ -4,7 +4,7 @@
 //Must be included for public functions to be imported/exported on windows
 #include "public.h"
 
-#include "chunk.h"
+#include "fluid/queue/chunk.h"
 
 /**
  * Simulates a sparse array

src/main/c/src/fluid/queue/chunk.c

@@ -1,9 +1,9 @@
 #include <stdlib.h>
 
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
 
 
 

src/main/c/src/fluid/queue/chunkmask.c

@@ -1,7 +1,7 @@
 #include <stdint.h>
 
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
 
 const uint32_t CHUNK_INDEX_ARR[] = {
     CHUNK_000, CHUNK_100, CHUNK_200,

src/main/c/src/fluid/queue/islandsolver.c

@@ -3,8 +3,8 @@
 
 #include "stb/stb_ds.h"
 
-#include "fluid/islandsolver.h"
+#include "fluid/queue/islandsolver.h"
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
 
 
 

src/main/c/src/fluid/queue/javainterface.c

@@ -6,11 +6,11 @@
 #include "stb/stb_ds.h"
 
 //local includes
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/simulation.h"
+#include "fluid/sim/grid/simulation.h"
-#include "fluid/metadatacalc.h"
+#include "fluid/queue/metadatacalc.h"
 
 
 //defines

src/main/c/src/fluid/queue/metadatacalc.c

@@ -2,9 +2,9 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/metadatacalc.h"
+#include "fluid/queue/metadatacalc.h"
 
 #define UPDATE_THRESHOLD 0.1
 

src/main/c/src/fluid/sim/grid/densitystep.c

@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <jni.h>
 
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/environment.h"
+#include "fluid/env/environment.h"
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
 
 
 /**

src/main/c/src/fluid/sim/grid/fluidsim.c

@@ -4,12 +4,12 @@
 #include "native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h"
 
 //fluid lib
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/mainFunctions.h"
+#include "fluid/sim/grid/mainFunctions.h"
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/simulation.h"
+#include "fluid/sim/grid/simulation.h"
-#include "fluid/solver_consts.h"
+#include "fluid/sim/grid/solver_consts.h"
 
 #ifndef SAVE_STEPS
 #define SAVE_STEPS 0

src/main/c/src/fluid/sim/grid/velocitystep.c

@@ -2,10 +2,10 @@
 #include <immintrin.h>
 #include <stdint.h>
 
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/solver_consts.h"
+#include "fluid/sim/grid/solver_consts.h"
 
 
 #define BOUND_NO_DIR 0

src/main/c/src/fluid/sim/sparse/sparsesimulator.c

@@ -4,10 +4,10 @@
 
 #include "stb/stb_ds.h"
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/islandsolver.h"
+#include "fluid/queue/islandsolver.h"
-#include "fluid/sparsesimulator.h"
+#include "fluid/sim/sparse/sparsesimulator.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
 
 #define LINEARSOLVERTIMES 10
 

test/c/fluid/chunk_test_utils.h

@@ -2,7 +2,7 @@
 #ifndef CHUNK_TEST_UTILS_H
 #define CHUNK_TEST_UTILS_H
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
 
 
 /**

test/c/fluid/chunk_tests.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
 #include "../test.h"
 
 

test/c/fluid/islandsolver_tests.c

@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/islandsolver.h"
+#include "fluid/queue/islandsolver.h"
 #include "../test.h"
 #include "chunk_test_utils.h"
 

test/c/fluid/sparsesimulator_tests.c

@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fluid/chunk.h"
+#include "fluid/queue/chunk.h"
-#include "fluid/chunkmask.h"
+#include "fluid/queue/chunkmask.h"
-#include "fluid/utilities.h"
+#include "fluid/env/utilities.h"
-#include "fluid/islandsolver.h"
+#include "fluid/queue/islandsolver.h"
-#include "fluid/sparsesimulator.h"
+#include "fluid/sim/sparse/sparsesimulator.h"
 #include "../test.h"
 #include "chunk_test_utils.h"