diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt index 41f862c..abb899f 100644 --- a/engine/CMakeLists.txt +++ b/engine/CMakeLists.txt @@ -17,6 +17,11 @@ target_include_directories(${ENGINE_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" ) +target_compile_definitions(${ENGINE_NAME} PUBLIC + GLM_FORCE_RADIANS + GLM_FORCE_DEPTH_ZERO_TO_ONE +) + target_link_libraries(${ENGINE_NAME} PUBLIC vulkan shaderc diff --git a/engine/include/sophia/application.hpp b/engine/include/sophia/application.hpp index f7675b0..f2a2542 100644 --- a/engine/include/sophia/application.hpp +++ b/engine/include/sophia/application.hpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -16,10 +17,6 @@ #include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - namespace sophia { class Application { diff --git a/engine/include/sophia/camera_2d.hpp b/engine/include/sophia/camera_2d.hpp index fed29ed..88a87f0 100644 --- a/engine/include/sophia/camera_2d.hpp +++ b/engine/include/sophia/camera_2d.hpp @@ -1,9 +1,7 @@ #pragma once -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include #include +#include namespace sophia { diff --git a/engine/include/sophia/canvas.hpp b/engine/include/sophia/canvas.hpp index 54b6d84..f11b811 100644 --- a/engine/include/sophia/canvas.hpp +++ b/engine/include/sophia/canvas.hpp @@ -2,12 +2,9 @@ #include #include +#include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - namespace sophia { class Application; diff --git a/engine/include/sophia/components.hpp b/engine/include/sophia/components.hpp index a67b198..9b39b76 100644 --- a/engine/include/sophia/components.hpp +++ b/engine/include/sophia/components.hpp @@ -1,20 +1,17 @@ #pragma once +#include #include #include #include +#include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include -#include -#include - namespace sophia { struct TagComponent { std::string tag; // entt::hashed_string ? + uint32_t mask = 0; }; struct TransformComponent { diff --git a/engine/include/sophia/frame_info.hpp b/engine/include/sophia/frame_info.hpp index b542555..78f92bb 100644 --- a/engine/include/sophia/frame_info.hpp +++ b/engine/include/sophia/frame_info.hpp @@ -1,12 +1,9 @@ #pragma once #include +#include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - namespace sophia { struct FrameInfo { diff --git a/engine/include/sophia/math.hpp b/engine/include/sophia/math.hpp new file mode 100644 index 0000000..1ecfa71 --- /dev/null +++ b/engine/include/sophia/math.hpp @@ -0,0 +1,17 @@ +#pragma once + +#include +#include + +namespace sophia { + +using vec2 = glm::vec2; +using vec3 = glm::vec3; +using vec4 = glm::vec4; +using ivec2 = glm::ivec2; +using uvec2 = glm::uvec2; +using mat3 = glm::mat3; +using mat4 = glm::mat4; +using quat = glm::quat; + +} // namespace sophia diff --git a/engine/include/sophia/resource_registry_ref.hpp b/engine/include/sophia/resource_registry_ref.hpp index f63bf09..9ea4200 100644 --- a/engine/include/sophia/resource_registry_ref.hpp +++ b/engine/include/sophia/resource_registry_ref.hpp @@ -2,16 +2,13 @@ #include #include +#include #include #include #include #include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - namespace sophia { class ResourceRegistry; diff --git a/engine/src/application.cpp b/engine/src/application.cpp index 1fd3776..cf7f12f 100644 --- a/engine/src/application.cpp +++ b/engine/src/application.cpp @@ -1,6 +1,9 @@ +#include + #include #include #include +#include #include #include #include @@ -8,12 +11,6 @@ #include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - -#include - #include "rendering/imgui_renderer.hpp" #include "rendering/model_render_system.hpp" #include "rendering/render_context.hpp" diff --git a/engine/src/resources/mesh.hpp b/engine/src/resources/mesh.hpp index 54b8306..86bd302 100644 --- a/engine/src/resources/mesh.hpp +++ b/engine/src/resources/mesh.hpp @@ -2,13 +2,10 @@ #include #include +#include #include #include -#define GLM_FORCE_RADIANS -#define GLM_FORCE_DEPTH_ZERO_TO_ONE -#include - #include "vulkan/buffer.hpp" #include "vulkan/device.hpp"