From acfd28a0fc56e0a0db78b2b77d463e15b500cea9 Mon Sep 17 00:00:00 2001 From: austin Date: Tue, 3 Dec 2024 12:55:26 -0500 Subject: [PATCH] more native refactoring --- .vscode/settings.json | 3 ++- src/main/c/build.sh | 1 + src/main/c/includes/{ => fluid}/chunk.h | 0 src/main/c/includes/{ => fluid}/chunkmask.h | 0 src/main/c/includes/{ => fluid}/environment.h | 0 .../c/includes/{ => fluid}/mainFunctions.h | 1 + src/main/c/includes/{ => fluid}/metadatacalc.h | 0 src/main/c/includes/{ => fluid}/simulation.h | 0 .../c/includes/{ => fluid}/solver_consts.h | 0 src/main/c/includes/{ => fluid}/utilities.h | 0 src/main/c/src/{ => fluid}/chunkmask.c | 5 +++-- src/main/c/src/{ => fluid}/densitystep.c | 8 ++++---- src/main/c/src/{ => fluid}/fluidsim.c | 18 +++++++++++------- src/main/c/src/{ => fluid}/javainterface.c | 12 ++++++------ .../c/src/{metadata => fluid}/metadatacalc.c | 6 +++--- src/main/c/src/{ => fluid}/velocitystep.c | 8 ++++---- src/main/c/src/mem/fluidmem.c | 4 ++-- 17 files changed, 37 insertions(+), 29 deletions(-) rename src/main/c/includes/{ => fluid}/chunk.h (100%) rename src/main/c/includes/{ => fluid}/chunkmask.h (100%) rename src/main/c/includes/{ => fluid}/environment.h (100%) rename src/main/c/includes/{ => fluid}/mainFunctions.h (99%) rename src/main/c/includes/{ => fluid}/metadatacalc.h (100%) rename src/main/c/includes/{ => fluid}/simulation.h (100%) rename src/main/c/includes/{ => fluid}/solver_consts.h (100%) rename src/main/c/includes/{ => fluid}/utilities.h (100%) rename src/main/c/src/{ => fluid}/chunkmask.c (91%) rename src/main/c/src/{ => fluid}/densitystep.c (97%) rename src/main/c/src/{ => fluid}/fluidsim.c (98%) rename src/main/c/src/{ => fluid}/javainterface.c (97%) rename src/main/c/src/{metadata => fluid}/metadatacalc.c (96%) rename src/main/c/src/{ => fluid}/velocitystep.c (99%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3edf9757..1b88c151 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,6 +22,7 @@ "stdio.h": "c", "cstdlib": "c", "pool.h": "c", - "mainfunctions.h": "c" + "mainfunctions.h": "c", + "solver_consts.h": "c" } } \ No newline at end of file diff --git a/src/main/c/build.sh b/src/main/c/build.sh index 2f7bb6dc..bcb608cd 100644 --- a/src/main/c/build.sh +++ b/src/main/c/build.sh @@ -17,6 +17,7 @@ fi # Builds the native code +cmake --build ${PWD}/out/build --target clean cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE= -D CMAKE_INSTALL_PREFIX=${PWD}/out/install -S ${PWD} -B ${PWD}/out/build -G Ninja cmake --build ${PWD}/out/build diff --git a/src/main/c/includes/chunk.h b/src/main/c/includes/fluid/chunk.h similarity index 100% rename from src/main/c/includes/chunk.h rename to src/main/c/includes/fluid/chunk.h diff --git a/src/main/c/includes/chunkmask.h b/src/main/c/includes/fluid/chunkmask.h similarity index 100% rename from src/main/c/includes/chunkmask.h rename to src/main/c/includes/fluid/chunkmask.h diff --git a/src/main/c/includes/environment.h b/src/main/c/includes/fluid/environment.h similarity index 100% rename from src/main/c/includes/environment.h rename to src/main/c/includes/fluid/environment.h diff --git a/src/main/c/includes/mainFunctions.h b/src/main/c/includes/fluid/mainFunctions.h similarity index 99% rename from src/main/c/includes/mainFunctions.h rename to src/main/c/includes/fluid/mainFunctions.h index b75ef9bd..aba4c033 100644 --- a/src/main/c/includes/mainFunctions.h +++ b/src/main/c/includes/fluid/mainFunctions.h @@ -1,3 +1,4 @@ +#include #include "environment.h" #ifndef MAINFUNC diff --git a/src/main/c/includes/metadatacalc.h b/src/main/c/includes/fluid/metadatacalc.h similarity index 100% rename from src/main/c/includes/metadatacalc.h rename to src/main/c/includes/fluid/metadatacalc.h diff --git a/src/main/c/includes/simulation.h b/src/main/c/includes/fluid/simulation.h similarity index 100% rename from src/main/c/includes/simulation.h rename to src/main/c/includes/fluid/simulation.h diff --git a/src/main/c/includes/solver_consts.h b/src/main/c/includes/fluid/solver_consts.h similarity index 100% rename from src/main/c/includes/solver_consts.h rename to src/main/c/includes/fluid/solver_consts.h diff --git a/src/main/c/includes/utilities.h b/src/main/c/includes/fluid/utilities.h similarity index 100% rename from src/main/c/includes/utilities.h rename to src/main/c/includes/fluid/utilities.h diff --git a/src/main/c/src/chunkmask.c b/src/main/c/src/fluid/chunkmask.c similarity index 91% rename from src/main/c/src/chunkmask.c rename to src/main/c/src/fluid/chunkmask.c index 0b2d0775..96547dc4 100644 --- a/src/main/c/src/chunkmask.c +++ b/src/main/c/src/fluid/chunkmask.c @@ -1,6 +1,7 @@ #include -#include "../includes/utilities.h" -#include "../includes/chunkmask.h" + +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/chunkmask.h" const uint32_t CHUNK_INDEX_ARR[] = { CHUNK_000, CHUNK_100, CHUNK_200, diff --git a/src/main/c/src/densitystep.c b/src/main/c/src/fluid/densitystep.c similarity index 97% rename from src/main/c/src/densitystep.c rename to src/main/c/src/fluid/densitystep.c index 4d394f04..97d04257 100644 --- a/src/main/c/src/densitystep.c +++ b/src/main/c/src/fluid/densitystep.c @@ -3,10 +3,10 @@ #include #include -#include "../includes/utilities.h" -#include "../includes/chunkmask.h" -#include "../includes/environment.h" -#include "../includes/chunk.h" +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/chunkmask.h" +#include "../../includes/fluid/environment.h" +#include "../../includes/fluid/chunk.h" /** diff --git a/src/main/c/src/fluidsim.c b/src/main/c/src/fluid/fluidsim.c similarity index 98% rename from src/main/c/src/fluidsim.c rename to src/main/c/src/fluid/fluidsim.c index fbda761a..ba8de418 100644 --- a/src/main/c/src/fluidsim.c +++ b/src/main/c/src/fluid/fluidsim.c @@ -1,11 +1,15 @@ #include -#include "../includes/utilities.h" -#include "../includes/chunkmask.h" -#include "..//includes/native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h" -#include "../includes/mainFunctions.h" -#include "../includes/chunk.h" -#include "../includes/simulation.h" -#include "../includes/solver_consts.h" + +//native interfaces +#include "../../includes/native/electrosphere_server_fluid_simulator_FluidAcceleratedSimulator.h" + +//fluid lib +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/chunkmask.h" +#include "../../includes/fluid/mainFunctions.h" +#include "../../includes/fluid/chunk.h" +#include "../../includes/fluid/simulation.h" +#include "../../includes/fluid/solver_consts.h" #ifndef SAVE_STEPS #define SAVE_STEPS 0 diff --git a/src/main/c/src/javainterface.c b/src/main/c/src/fluid/javainterface.c similarity index 97% rename from src/main/c/src/javainterface.c rename to src/main/c/src/fluid/javainterface.c index 7b104262..1ab74769 100644 --- a/src/main/c/src/javainterface.c +++ b/src/main/c/src/fluid/javainterface.c @@ -3,14 +3,14 @@ //library includes //include stb ds #define STB_DS_IMPLEMENTATION -#include "../lib/stb/stb_ds.h" +#include "../../lib/stb/stb_ds.h" //local includes -#include "../includes/chunk.h" -#include "../includes/chunkmask.h" -#include "../includes/utilities.h" -#include "../includes/simulation.h" -#include "../includes/metadatacalc.h" +#include "../../includes/fluid/chunk.h" +#include "../../includes/fluid/chunkmask.h" +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/simulation.h" +#include "../../includes/fluid/metadatacalc.h" //defines diff --git a/src/main/c/src/metadata/metadatacalc.c b/src/main/c/src/fluid/metadatacalc.c similarity index 96% rename from src/main/c/src/metadata/metadatacalc.c rename to src/main/c/src/fluid/metadatacalc.c index 4f25aacb..9855a7f9 100644 --- a/src/main/c/src/metadata/metadatacalc.c +++ b/src/main/c/src/fluid/metadatacalc.c @@ -2,9 +2,9 @@ #include #include -#include "../../includes/utilities.h" -#include "../../includes/chunkmask.h" -#include "../../includes/metadatacalc.h" +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/chunkmask.h" +#include "../../includes/fluid/metadatacalc.h" #define UPDATE_THRESHOLD 0.1 diff --git a/src/main/c/src/velocitystep.c b/src/main/c/src/fluid/velocitystep.c similarity index 99% rename from src/main/c/src/velocitystep.c rename to src/main/c/src/fluid/velocitystep.c index 291a514b..c53e32b6 100644 --- a/src/main/c/src/velocitystep.c +++ b/src/main/c/src/fluid/velocitystep.c @@ -2,10 +2,10 @@ #include #include -#include "../includes/utilities.h" -#include "../includes/chunkmask.h" -#include "../includes/chunk.h" -#include "../includes/solver_consts.h" +#include "../../includes/fluid/utilities.h" +#include "../../includes/fluid/chunkmask.h" +#include "../../includes/fluid/chunk.h" +#include "../../includes/fluid/solver_consts.h" #define BOUND_NO_DIR 0 diff --git a/src/main/c/src/mem/fluidmem.c b/src/main/c/src/mem/fluidmem.c index 09e5cd4f..1c048e06 100644 --- a/src/main/c/src/mem/fluidmem.c +++ b/src/main/c/src/mem/fluidmem.c @@ -1,8 +1,8 @@ #include #include -#include "../..//includes/native/electrosphere_server_fluid_manager_ServerFluidChunk.h" -#include "../..//includes/native/electrosphere_client_fluid_cache_FluidChunkData.h" +#include "../../includes/native/electrosphere_server_fluid_manager_ServerFluidChunk.h" +#include "../../includes/native/electrosphere_client_fluid_cache_FluidChunkData.h" #include "../../includes/mem/pool.h"