diff --git a/.vscode/settings.json b/.vscode/settings.json index c48cc05b..c745317b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,6 +33,7 @@ "sparsesimulator.h": "c", "environment.h": "c", "simulator.h": "c", - "dispatcher.h": "c" + "dispatcher.h": "c", + "cellular.h": "c" } } \ No newline at end of file diff --git a/buildNumber.properties b/buildNumber.properties index d069d5a1..e31ca16b 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Fri Dec 06 14:33:08 EST 2024 -buildNumber=523 +#Fri Dec 06 15:07:16 EST 2024 +buildNumber=525 diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 161dd92f..32c8d045 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1253,6 +1253,7 @@ Refactor native test code under src/test More test file refactoring Native fluid chunk dispatcher Dedicated native fluid simulator +Define cellular simulator diff --git a/src/main/c/build.sh b/src/main/c/build.sh index af4efd18..cff58057 100644 --- a/src/main/c/build.sh +++ b/src/main/c/build.sh @@ -22,6 +22,6 @@ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE= -D CMAKE_INSTALL_PREFIX=$ cmake --build ${PWD}/out/build #copy to expected folder -mkdir ${PWD}/shared-folder +mkdir -p ${PWD}/shared-folder rm ${PWD}/shared-folder/libStormEngine${LIB_ENDING} cp ${PWD}/out/build/libStormEngine${LIB_ENDING} ${PWD}/shared-folder/ diff --git a/src/main/c/includes/fluid/sim/cellular/cellular.h b/src/main/c/includes/fluid/sim/cellular/cellular.h new file mode 100644 index 00000000..82d6f4fa --- /dev/null +++ b/src/main/c/includes/fluid/sim/cellular/cellular.h @@ -0,0 +1,19 @@ +#ifndef FLUID_SIMULATOR_CELLULAR_H +#define FLUID_SIMULATOR_CELLULAR_H + +#include "public.h" +#include "fluid/queue/chunk.h" +#include "fluid/env/environment.h" + + + +/** + * Simulates the cellular chunk queue + * @param environment The environment storing the simulation queues + */ +LIBRARY_API void fluid_cellular_simulate(Environment * environment); + + + + +#endif \ No newline at end of file diff --git a/src/main/c/src/fluid/sim/cellular/cellular.c b/src/main/c/src/fluid/sim/cellular/cellular.c index e69de29b..fdd82630 100644 --- a/src/main/c/src/fluid/sim/cellular/cellular.c +++ b/src/main/c/src/fluid/sim/cellular/cellular.c @@ -0,0 +1,20 @@ + +#include "stb/stb_ds.h" +#include "fluid/sim/cellular/cellular.h" + + +/** + * Simulates the cellular chunk queue + * @param environment The environment storing the simulation queues + */ +LIBRARY_API void fluid_cellular_simulate(Environment * environment){ + + Chunk ** chunks = environment->queue.cellularQueue; + int chunkCount = stbds_arrlen(chunks); + + for(int i = 0; i < chunkCount; i++){ + Chunk * currentChunk = chunks[i]; + //simulate here + } + +} \ No newline at end of file diff --git a/src/main/c/src/fluid/sim/simulator.c b/src/main/c/src/fluid/sim/simulator.c index 2a61e601..4c106ae0 100644 --- a/src/main/c/src/fluid/sim/simulator.c +++ b/src/main/c/src/fluid/sim/simulator.c @@ -5,6 +5,7 @@ #include "fluid/dispatch/dispatcher.h" #include "fluid/sim/simulator.h" #include "fluid/sim/grid/simulation.h" +#include "fluid/sim/cellular/cellular.h" #include "fluid/queue/chunk.h" #include "fluid/env/environment.h" @@ -18,11 +19,7 @@ LIBRARY_API void fluid_simulate(Environment * environment){ int currentCount, i; //cellular sim - currentCount = stbds_arrlen(queue.cellularQueue); - for(i = 0; i < currentCount; i++){ - Chunk * currentChunk = queue.cellularQueue[i]; - //TODO: simulate here - } + fluid_cellular_simulate(environment); //grid sim {