From b8ebc24b71d47798035a5ed6f38bbe3e4beb44dd Mon Sep 17 00:00:00 2001 From: Conni Bilham Date: Tue, 19 Sep 2023 17:01:25 +0100 Subject: [PATCH] Misc update --- CMakeLists.txt | 15 +++++++++++++-- include/Window.h | 4 +--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2239d65..ca15656 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,11 +22,22 @@ set(SOURCE_FILES src/Storage.cpp include/Storage.h src/Scene.cpp include/Scene.h - src/DebugRendering.cpp src/DebugRendering.h src/PhysicsEngine.cpp include/PhysicsEngine.h Scenes/main_scene.cpp Scenes/main_scene.h - ) + Scenes/orth_scene.cpp Scenes/orth_scene.h + + src/CollisionEngine.cpp include/CollisionEngine.h + + src/DebugRendering.cpp + include/DebugRendering.h + + include/DebugRendering/DebugBox.h + src/DebugRendering/DebugBox.cpp + + include/DebugRendering/DebugEntry.h + src/DebugRendering/DebugEntry.cpp +) # add includes diff --git a/include/Window.h b/include/Window.h index 161ae0a..ee3c9f5 100644 --- a/include/Window.h +++ b/include/Window.h @@ -28,14 +28,12 @@ class Window { Scene* loaded_scene; Camera* camera; - // Shader list - std::vector shaders = {}; - Window(int width, int height, std::string title, int fullscreen, Camera* camera_n); ~Window(); void set_camera(Camera* camera_n); + void set_window_title(std::string title_n); static void window_size_callback(GLFWwindow* window, int width, int height); void window_loop_callback(GLFWwindow* window);