diff --git a/include/parks/app.h b/include/blt/app.h similarity index 98% rename from include/parks/app.h rename to include/blt/app.h index 78ca9fe..53d585c 100644 --- a/include/parks/app.h +++ b/include/blt/app.h @@ -1,11 +1,11 @@ #pragma once #include -#include +#include "traits.h" #include #include "blt/std/logging.h" #include "status.h" -#include +#include "error_logging.h" namespace parks { namespace Properties { diff --git a/include/parks/config.h b/include/blt/config.h similarity index 100% rename from include/parks/config.h rename to include/blt/config.h diff --git a/include/parks/error_logging.h b/include/blt/error_logging.h similarity index 97% rename from include/parks/error_logging.h rename to include/blt/error_logging.h index c280707..1e40bfb 100644 --- a/include/parks/error_logging.h +++ b/include/blt/error_logging.h @@ -5,7 +5,7 @@ #ifndef PARKSNREC_ERROR_LOGGING_H #define PARKSNREC_ERROR_LOGGING_H -#include +#include "blt/std/logging.h" #ifdef __linux__ #include #endif diff --git a/include/parks/renderer/OpenGL.h b/include/blt/renderer/OpenGL.h similarity index 98% rename from include/parks/renderer/OpenGL.h rename to include/blt/renderer/OpenGL.h index 2b6f4c1..bc8b1b2 100644 --- a/include/parks/renderer/OpenGL.h +++ b/include/blt/renderer/OpenGL.h @@ -5,13 +5,13 @@ #ifndef PARKSNREC_OPENGL_H #define PARKSNREC_OPENGL_H -#include +#include "glad/gl.h" #include -#include -#include +#include "blt/math/math.h" +#include "blt/std/string.h" #include #include -#include +#include "stb/stb_image.h" namespace parks { diff --git a/include/parks/renderer/engine.h b/include/blt/renderer/engine.h similarity index 87% rename from include/parks/renderer/engine.h rename to include/blt/renderer/engine.h index 1d17e6c..70749b3 100644 --- a/include/parks/renderer/engine.h +++ b/include/blt/renderer/engine.h @@ -5,15 +5,15 @@ #ifndef PARKSNREC_ENGINE_H #define PARKSNREC_ENGINE_H -#include -#include "parks/window.h" +#include "resources.h" +#include "blt/window.h" #include "blt/math/vectors.h" -#include "parks/config.h" -#include -#include -#include -#include -#include +#include "blt/config.h" +#include "blt/shader/basic_shader.vert" +#include "blt/shader/ui_shader.vert" +#include "blt/shader/basic_shader.frag" +#include "blt/shader/ui_shader.frag" +#include "player.h" namespace parks { struct StaticEntity { diff --git a/include/parks/renderer/player.h b/include/blt/renderer/player.h similarity index 97% rename from include/parks/renderer/player.h rename to include/blt/renderer/player.h index e8cea4b..81424a0 100644 --- a/include/parks/renderer/player.h +++ b/include/blt/renderer/player.h @@ -5,7 +5,7 @@ #ifndef PARKSNREC_PLAYER_H #define PARKSNREC_PLAYER_H -#include +#include "blt/math/vectors.h" #include "blt/math/matrix.h" namespace parks { diff --git a/include/parks/renderer/resources.h b/include/blt/renderer/resources.h similarity index 95% rename from include/parks/renderer/resources.h rename to include/blt/renderer/resources.h index 0461609..72dd732 100644 --- a/include/parks/renderer/resources.h +++ b/include/blt/renderer/resources.h @@ -6,7 +6,7 @@ #define PARKSNREC_RESOURCES_H #include -#include +#include "OpenGL.h" namespace parks::resources { diff --git a/include/parks/shader/basic_shader.frag b/include/blt/shader/basic_shader.frag similarity index 100% rename from include/parks/shader/basic_shader.frag rename to include/blt/shader/basic_shader.frag diff --git a/include/parks/shader/basic_shader.vert b/include/blt/shader/basic_shader.vert similarity index 100% rename from include/parks/shader/basic_shader.vert rename to include/blt/shader/basic_shader.vert diff --git a/include/parks/shader/ui_shader.frag b/include/blt/shader/ui_shader.frag similarity index 100% rename from include/parks/shader/ui_shader.frag rename to include/blt/shader/ui_shader.frag diff --git a/include/parks/shader/ui_shader.vert b/include/blt/shader/ui_shader.vert similarity index 100% rename from include/parks/shader/ui_shader.vert rename to include/blt/shader/ui_shader.vert diff --git a/include/parks/status.h b/include/blt/status.h similarity index 100% rename from include/parks/status.h rename to include/blt/status.h diff --git a/include/parks/traits.h b/include/blt/traits.h similarity index 100% rename from include/parks/traits.h rename to include/blt/traits.h diff --git a/include/parks/window.h b/include/blt/window.h similarity index 91% rename from include/parks/window.h rename to include/blt/window.h index 33e7f36..88a16c1 100644 --- a/include/parks/window.h +++ b/include/blt/window.h @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include "glad/gl.h" +#include "GLFW/glfw3.h" -#include -#include +#include "app.h" +#include "blt/math/math.h" namespace parks::Window { diff --git a/src/parks/app.cpp b/src/parks/app.cpp index afa396f..b85f4de 100644 --- a/src/parks/app.cpp +++ b/src/parks/app.cpp @@ -1,4 +1,4 @@ -#include +#include "blt/app.h" namespace parks { diff --git a/src/parks/renderer/OpenGL.cpp b/src/parks/renderer/OpenGL.cpp index 17930e3..4ae29a7 100644 --- a/src/parks/renderer/OpenGL.cpp +++ b/src/parks/renderer/OpenGL.cpp @@ -3,7 +3,7 @@ // #define GLAD_GL_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION -#include +#include #include "blt/std/memory.h" #include diff --git a/src/parks/renderer/engine.cpp b/src/parks/renderer/engine.cpp index e2b0782..fef2613 100644 --- a/src/parks/renderer/engine.cpp +++ b/src/parks/renderer/engine.cpp @@ -1,7 +1,7 @@ // // Created by brett on 6/5/23. // -#include "parks/renderer/engine.h" +#include "blt/renderer/engine.h" #include #include #include diff --git a/src/parks/renderer/player.cpp b/src/parks/renderer/player.cpp index bac86b0..0920fc3 100644 --- a/src/parks/renderer/player.cpp +++ b/src/parks/renderer/player.cpp @@ -1,10 +1,10 @@ // // Created by brett on 6/14/23. // -#include -#include +#include +#include "blt/window.h" #include -#include +#include "blt/config.h" namespace parks { diff --git a/src/parks/renderer/resources.cpp b/src/parks/renderer/resources.cpp index a551390..e6e0495 100644 --- a/src/parks/renderer/resources.cpp +++ b/src/parks/renderer/resources.cpp @@ -1,14 +1,14 @@ // // Created by brett on 6/12/23. // -#include +#include #include #include #include #include -#include -#include -#include "parks/status.h" +#include "blt/config.h" +#include "blt/error_logging.h" +#include "blt/status.h" namespace parks { diff --git a/src/parks/window.cpp b/src/parks/window.cpp index db7f2b1..928face 100644 --- a/src/parks/window.cpp +++ b/src/parks/window.cpp @@ -1,7 +1,7 @@ -#include +#include "blt/window.h" #include #include -#include "parks/status.h" +#include "blt/status.h" #include "imgui.h" #include "imgui_impl_glfw.h" #include "imgui_impl_opengl3.h"