From aaaa1951671fe08e1e0a34489c2765d6603d6dd9 Mon Sep 17 00:00:00 2001 From: maelstrom Date: Fri, 27 Sep 2024 22:48:57 +0200 Subject: [PATCH] Moved rendering files to rendering/ --- CMakeLists.txt | 2 +- src/main.cpp | 2 +- src/{ => rendering}/defaultmeshes.cpp | 0 src/{ => rendering}/defaultmeshes.h | 0 src/{ => rendering}/light.h | 0 src/{ => rendering}/material.h | 0 src/{ => rendering}/mesh.cpp | 0 src/{ => rendering}/mesh.h | 0 src/{ => rendering}/renderer.cpp | 2 +- src/{ => rendering}/renderer.h | 0 src/{ => rendering}/shader.cpp | 0 src/{ => rendering}/shader.h | 0 12 files changed, 3 insertions(+), 3 deletions(-) rename src/{ => rendering}/defaultmeshes.cpp (100%) rename src/{ => rendering}/defaultmeshes.h (100%) rename src/{ => rendering}/light.h (100%) rename src/{ => rendering}/material.h (100%) rename src/{ => rendering}/mesh.cpp (100%) rename src/{ => rendering}/mesh.h (100%) rename src/{ => rendering}/renderer.cpp (99%) rename src/{ => rendering}/renderer.h (100%) rename src/{ => rendering}/shader.cpp (100%) rename src/{ => rendering}/shader.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92201c5..d13dfa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ find_package(assimp REQUIRED) file(MAKE_DIRECTORY bin) -file(GLOB SOURCES "src/*.cpp" "src/*.h") +file(GLOB_RECURSE SOURCES "src/*.cpp" "src/*.h") add_executable(${PROJECT_NAME} ${SOURCES}) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "gltest") target_link_libraries(${PROJECT_NAME} ${SDL2_LIBRARIES} ${GLEW_LIBRARIES} ${GLUT_LIBRARIES} OpenGL::GL OpenGL::GLU glfw glm::glm assimp) \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 315e15e..ca24e25 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,7 +3,7 @@ #include #include -#include "renderer.h" +#include "rendering/renderer.h" #include "camera.h" void errorCatcher(int id, const char* str); diff --git a/src/defaultmeshes.cpp b/src/rendering/defaultmeshes.cpp similarity index 100% rename from src/defaultmeshes.cpp rename to src/rendering/defaultmeshes.cpp diff --git a/src/defaultmeshes.h b/src/rendering/defaultmeshes.h similarity index 100% rename from src/defaultmeshes.h rename to src/rendering/defaultmeshes.h diff --git a/src/light.h b/src/rendering/light.h similarity index 100% rename from src/light.h rename to src/rendering/light.h diff --git a/src/material.h b/src/rendering/material.h similarity index 100% rename from src/material.h rename to src/rendering/material.h diff --git a/src/mesh.cpp b/src/rendering/mesh.cpp similarity index 100% rename from src/mesh.cpp rename to src/rendering/mesh.cpp diff --git a/src/mesh.h b/src/rendering/mesh.h similarity index 100% rename from src/mesh.h rename to src/rendering/mesh.h diff --git a/src/renderer.cpp b/src/rendering/renderer.cpp similarity index 99% rename from src/renderer.cpp rename to src/rendering/renderer.cpp index 60d0fda..089bd3d 100644 --- a/src/renderer.cpp +++ b/src/rendering/renderer.cpp @@ -7,7 +7,7 @@ #include "shader.h" #include "mesh.h" #include "defaultmeshes.h" -#include "camera.h" +#include "../camera.h" #include "renderer.h" diff --git a/src/renderer.h b/src/rendering/renderer.h similarity index 100% rename from src/renderer.h rename to src/rendering/renderer.h diff --git a/src/shader.cpp b/src/rendering/shader.cpp similarity index 100% rename from src/shader.cpp rename to src/rendering/shader.cpp diff --git a/src/shader.h b/src/rendering/shader.h similarity index 100% rename from src/shader.h rename to src/rendering/shader.h