From 5adb8f7a54b1172dbd671140b528abd2c13d226f Mon Sep 17 00:00:00 2001
From: adany292 <adany292@student.liu.se>
Date: Sat, 7 Dec 2024 23:42:06 +0100
Subject: [PATCH] Moved include files
---
CMakeLists.txt | 1 +
src/Camera.cpp | 2 +-
src/GUI_fluid_sim.cpp | 8 ++++----
src/{ => include}/Camera.h | 0
src/{ => include}/PCISPH_sim.h | 0
src/{ => include}/spawn_particles.h | 0
src/itterative_PCISPH.cu | 4 ++--
src/{ => settings}/constants.h | 0
src/spawn_particles.cpp | 2 +-
9 files changed, 9 insertions(+), 8 deletions(-)
rename src/{ => include}/Camera.h (100%)
rename src/{ => include}/PCISPH_sim.h (100%)
rename src/{ => include}/spawn_particles.h (100%)
rename src/{ => settings}/constants.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d591302..aa0ad58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,6 +68,7 @@ add_library(common_lib STATIC ${COMMON_SOURCES})
target_include_directories(common_lib PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/src # For src/*.h if needed
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/settings # For src/*.h if needed
/usr/local/cuda/include # CUDA include directory
${OPENGL_INCLUDE_DIRS}
${GLEW_INCLUDE_DIRS}
diff --git a/src/Camera.cpp b/src/Camera.cpp
index 7437faf..eab52c4 100644
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -1,5 +1,5 @@
// Camera.cpp
-#include "Camera.h"
+#include "include/Camera.h"
#include <cstdio>
#include <cstdlib>
diff --git a/src/GUI_fluid_sim.cpp b/src/GUI_fluid_sim.cpp
index 22b212b..5ffb22f 100644
--- a/src/GUI_fluid_sim.cpp
+++ b/src/GUI_fluid_sim.cpp
@@ -16,10 +16,10 @@
#include "imgui_impl_glfw.h" // Use the GLFW backend
#include "imgui_impl_opengl3.h" // Use the OpenGL3 backend
-#include "PCISPH_sim.h" // Header for CUDA function declarations
-#include "spawn_particles.h"
-#include "Camera.h"
-#include "constants.h"
+#include "include/PCISPH_sim.h" // Header for CUDA function declarations
+#include "include/spawn_particles.h"
+#include "include/Camera.h"
+#include "settings/constants.h"
#define MAIN
#include "VectorUtils4.h"
diff --git a/src/Camera.h b/src/include/Camera.h
similarity index 100%
rename from src/Camera.h
rename to src/include/Camera.h
diff --git a/src/PCISPH_sim.h b/src/include/PCISPH_sim.h
similarity index 100%
rename from src/PCISPH_sim.h
rename to src/include/PCISPH_sim.h
diff --git a/src/spawn_particles.h b/src/include/spawn_particles.h
similarity index 100%
rename from src/spawn_particles.h
rename to src/include/spawn_particles.h
diff --git a/src/itterative_PCISPH.cu b/src/itterative_PCISPH.cu
index 6ab2f69..f4cc0bb 100644
--- a/src/itterative_PCISPH.cu
+++ b/src/itterative_PCISPH.cu
@@ -1,7 +1,7 @@
// kernels_cuda_pcisph.cu
-#include "PCISPH_sim.h"
-#include "constants.h"
+#include "include/PCISPH_sim.h"
+#include "settings/constants.h"
#include "include/float3_helper_math.h"
#include <cuda_runtime.h>
#include <cuda_gl_interop.h>
diff --git a/src/constants.h b/src/settings/constants.h
similarity index 100%
rename from src/constants.h
rename to src/settings/constants.h
diff --git a/src/spawn_particles.cpp b/src/spawn_particles.cpp
index e448070..98ddfaf 100644
--- a/src/spawn_particles.cpp
+++ b/src/spawn_particles.cpp
@@ -1,5 +1,5 @@
// spawn_particles.cpp
-#include "spawn_particles.h"
+#include "include/spawn_particles.h"
#include "constants.h"
#include <cmath> // For std::pow
--
GitLab