From daeb0e879f03c43f6f9a09c88e58808d89f39ab6 Mon Sep 17 00:00:00 2001 From: tom Date: Tue, 17 Mar 2026 14:34:07 +0000 Subject: [PATCH] more renaming --- CMakeLists.txt | 13 +++++++------ gl_render/CMakeLists.txt | 4 ++-- {lib => gl_render}/shaders/basic-texture.frag | 0 {lib => gl_render}/shaders/basic-texture.vert | 0 {lib => gl_render}/shaders/basic.frag | 0 {lib => gl_render}/shaders/basic.vert | 0 {lib => gl_render}/shaders/depth-only.frag | 0 {lib => gl_render}/shaders/depth-only.vert | 0 {lib => scene}/CMakeLists.txt | 8 ++++---- {lib => scene}/arena.cpp | 0 {lib => scene}/camera.cpp | 0 {lib => scene}/include/arena.h | 0 {lib => scene}/include/arena.hpp | 0 {lib => scene}/include/camera.h | 0 {lib => scene}/include/light.h | 0 {lib => scene}/include/loaders.h | 0 {lib => scene}/include/material.h | 0 {lib => scene}/include/mesh.h | 0 {lib => scene}/include/raycast.h | 0 {lib => scene}/include/scene.h | 0 {lib => scene}/loaders.cpp | 0 {lib => scene}/raycast.cpp | 0 {lib => scene}/scene.cpp | 0 23 files changed, 13 insertions(+), 12 deletions(-) rename {lib => gl_render}/shaders/basic-texture.frag (100%) rename {lib => gl_render}/shaders/basic-texture.vert (100%) rename {lib => gl_render}/shaders/basic.frag (100%) rename {lib => gl_render}/shaders/basic.vert (100%) rename {lib => gl_render}/shaders/depth-only.frag (100%) rename {lib => gl_render}/shaders/depth-only.vert (100%) rename {lib => scene}/CMakeLists.txt (85%) rename {lib => scene}/arena.cpp (100%) rename {lib => scene}/camera.cpp (100%) rename {lib => scene}/include/arena.h (100%) rename {lib => scene}/include/arena.hpp (100%) rename {lib => scene}/include/camera.h (100%) rename {lib => scene}/include/light.h (100%) rename {lib => scene}/include/loaders.h (100%) rename {lib => scene}/include/material.h (100%) rename {lib => scene}/include/mesh.h (100%) rename {lib => scene}/include/raycast.h (100%) rename {lib => scene}/include/scene.h (100%) rename {lib => scene}/loaders.cpp (100%) rename {lib => scene}/raycast.cpp (100%) rename {lib => scene}/scene.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6f7b77..5200bd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ else() endif() add_subdirectory(third_party/tracy) -add_subdirectory(lib lib) +add_subdirectory(scene scene) add_subdirectory(linalg linalg) add_subdirectory(gl_render gl_render) @@ -36,7 +36,7 @@ add_executable(native index.cpp events.cpp) target_link_libraries(native PRIVATE linalg gl_render - lib + scene SDL3::SDL3 ${OPENGL_LIBRARIES} Tracy::TracyClient @@ -46,18 +46,19 @@ target_link_libraries(native PRIVATE target_include_directories(native PUBLIC include) -# shaders copy on configure +# assets copy on configure file(COPY assets DESTINATION ${CMAKE_BINARY_DIR}) # only runs on configure +# shaders copy on configure add_custom_command( TARGET native POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory - ${CMAKE_SOURCE_DIR}/lib/shaders ${CMAKE_BINARY_DIR}/shaders + ${CMAKE_SOURCE_DIR}/gl_render/shaders ${CMAKE_BINARY_DIR}/shaders COMMENT "Copying shaders to build directory" VERBATIM ) -######################## tests ############## +####################### tests ############## # executable @@ -71,7 +72,7 @@ add_executable(tests target_link_libraries(tests PRIVATE linalg - lib + scene ) target_include_directories(tests PUBLIC tests/include) diff --git a/gl_render/CMakeLists.txt b/gl_render/CMakeLists.txt index 33eaafb..ff218d8 100644 --- a/gl_render/CMakeLists.txt +++ b/gl_render/CMakeLists.txt @@ -5,7 +5,7 @@ project(GlRenderer) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) find_package(OpenGL REQUIRED) -add_subdirectory(../lib lib) +add_subdirectory(../scene scene) add_library(gl_render SHARED basic_color_render_program.cpp @@ -15,5 +15,5 @@ add_library(gl_render SHARED ) target_include_directories(gl_render PUBLIC include) -target_link_libraries(gl_render PUBLIC lib) +target_link_libraries(gl_render PUBLIC scene) diff --git a/lib/shaders/basic-texture.frag b/gl_render/shaders/basic-texture.frag similarity index 100% rename from lib/shaders/basic-texture.frag rename to gl_render/shaders/basic-texture.frag diff --git a/lib/shaders/basic-texture.vert b/gl_render/shaders/basic-texture.vert similarity index 100% rename from lib/shaders/basic-texture.vert rename to gl_render/shaders/basic-texture.vert diff --git a/lib/shaders/basic.frag b/gl_render/shaders/basic.frag similarity index 100% rename from lib/shaders/basic.frag rename to gl_render/shaders/basic.frag diff --git a/lib/shaders/basic.vert b/gl_render/shaders/basic.vert similarity index 100% rename from lib/shaders/basic.vert rename to gl_render/shaders/basic.vert diff --git a/lib/shaders/depth-only.frag b/gl_render/shaders/depth-only.frag similarity index 100% rename from lib/shaders/depth-only.frag rename to gl_render/shaders/depth-only.frag diff --git a/lib/shaders/depth-only.vert b/gl_render/shaders/depth-only.vert similarity index 100% rename from lib/shaders/depth-only.vert rename to gl_render/shaders/depth-only.vert diff --git a/lib/CMakeLists.txt b/scene/CMakeLists.txt similarity index 85% rename from lib/CMakeLists.txt rename to scene/CMakeLists.txt index c1f761a..f88a850 100644 --- a/lib/CMakeLists.txt +++ b/scene/CMakeLists.txt @@ -1,6 +1,6 @@ include_guard(GLOBAL) cmake_minimum_required(VERSION 3.24) -project(NativeRendererLib) +project(3DScene) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set (CMAKE_CXX_STANDARD 20) @@ -21,7 +21,7 @@ add_subdirectory(../third_party/assimp assimp) add_subdirectory(../linalg linalg) # lib (include is for templates) -add_library(lib SHARED +add_library(scene SHARED camera.cpp scene.cpp raycast.cpp @@ -30,9 +30,9 @@ add_library(lib SHARED include/arena.hpp ) -target_include_directories(lib PUBLIC include) +target_include_directories(scene PUBLIC include) -target_link_libraries(lib +target_link_libraries(scene linalg SDL3::SDL3 assimp::assimp diff --git a/lib/arena.cpp b/scene/arena.cpp similarity index 100% rename from lib/arena.cpp rename to scene/arena.cpp diff --git a/lib/camera.cpp b/scene/camera.cpp similarity index 100% rename from lib/camera.cpp rename to scene/camera.cpp diff --git a/lib/include/arena.h b/scene/include/arena.h similarity index 100% rename from lib/include/arena.h rename to scene/include/arena.h diff --git a/lib/include/arena.hpp b/scene/include/arena.hpp similarity index 100% rename from lib/include/arena.hpp rename to scene/include/arena.hpp diff --git a/lib/include/camera.h b/scene/include/camera.h similarity index 100% rename from lib/include/camera.h rename to scene/include/camera.h diff --git a/lib/include/light.h b/scene/include/light.h similarity index 100% rename from lib/include/light.h rename to scene/include/light.h diff --git a/lib/include/loaders.h b/scene/include/loaders.h similarity index 100% rename from lib/include/loaders.h rename to scene/include/loaders.h diff --git a/lib/include/material.h b/scene/include/material.h similarity index 100% rename from lib/include/material.h rename to scene/include/material.h diff --git a/lib/include/mesh.h b/scene/include/mesh.h similarity index 100% rename from lib/include/mesh.h rename to scene/include/mesh.h diff --git a/lib/include/raycast.h b/scene/include/raycast.h similarity index 100% rename from lib/include/raycast.h rename to scene/include/raycast.h diff --git a/lib/include/scene.h b/scene/include/scene.h similarity index 100% rename from lib/include/scene.h rename to scene/include/scene.h diff --git a/lib/loaders.cpp b/scene/loaders.cpp similarity index 100% rename from lib/loaders.cpp rename to scene/loaders.cpp diff --git a/lib/raycast.cpp b/scene/raycast.cpp similarity index 100% rename from lib/raycast.cpp rename to scene/raycast.cpp diff --git a/lib/scene.cpp b/scene/scene.cpp similarity index 100% rename from lib/scene.cpp rename to scene/scene.cpp