Skip to content

Commit

Permalink
Misc update
Browse files Browse the repository at this point in the history
  • Loading branch information
ConniBug committed Sep 19, 2023
1 parent 0ca8daa commit b8ebc24
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
15 changes: 13 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions include/Window.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,12 @@ class Window {
Scene* loaded_scene;
Camera* camera;

// Shader list
std::vector<Shader*> 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);
Expand Down

0 comments on commit b8ebc24

Please sign in to comment.