math.hpp added

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

engine/include/sophia/application.hpp

@@ -7,6 +7,7 @@
 #include <sophia/canvas.hpp>
 #include <sophia/console/console_command_registry.hpp>
 #include <sophia/frame_info.hpp>
+#include <sophia/math.hpp>
 #include <sophia/resource_registry_ref.hpp>
 #include <sophia/scene_registry.hpp>
 #include <sophia/types.hpp>
@@ -16,10 +17,6 @@
 #include <string>
 #include <vector>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-
 namespace sophia {
 
 class Application {

engine/include/sophia/camera_2d.hpp

@@ -1,9 +1,7 @@
 #pragma once
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
+#include <sophia/math.hpp>
 
 namespace sophia {
 

engine/include/sophia/canvas.hpp

@@ -2,12 +2,9 @@
 
 #include <memory>
 #include <sophia/frame_info.hpp>
+#include <sophia/math.hpp>
 #include <vector>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-
 namespace sophia {
 
 class Application;

engine/include/sophia/components.hpp

@@ -1,20 +1,17 @@
 #pragma once
 
+#include <glm/gtc/matrix_transform.hpp>
 #include <iostream>
 #include <ostream>
 #include <sophia/handles.hpp>
+#include <sophia/math.hpp>
 #include <string>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/quaternion.hpp>
-
 namespace sophia {
 
 struct TagComponent {
   std::string tag;  // entt::hashed_string ?
+  uint32_t mask = 0;
 };
 
 struct TransformComponent {

engine/include/sophia/frame_info.hpp

@@ -1,12 +1,9 @@
 #pragma once
 
 #include <sophia/camera_2d.hpp>
+#include <sophia/math.hpp>
 #include <sophia/types.hpp>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-
 namespace sophia {
 
 struct FrameInfo {

engine/include/sophia/math.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <glm/glm.hpp>
+#include <glm/gtc/quaternion.hpp>
+
+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

engine/include/sophia/resource_registry_ref.hpp

@@ -2,16 +2,13 @@
 
 #include <sophia/canvas.hpp>
 #include <sophia/handles.hpp>
+#include <sophia/math.hpp>
 #include <sophia/types.hpp>
 #include <string>
 #include <type_traits>
 #include <utility>
 #include <vector>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-
 namespace sophia {
 
 class ResourceRegistry;

engine/src/application.cpp

@@ -1,6 +1,9 @@
+#include <imgui.h>
+
 #include <array>
 #include <chrono>
 #include <cstddef>
+#include <glm/glm.hpp>
 #include <sophia/application.hpp>
 #include <sophia/util/logger.hpp>
 #include <string>
@@ -8,12 +11,6 @@
 #include <vector>
 #include <vulkan/vulkan.hpp>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <imgui.h>
-
-#include <glm/glm.hpp>
-
 #include "rendering/imgui_renderer.hpp"
 #include "rendering/model_render_system.hpp"
 #include "rendering/render_context.hpp"

engine/src/resources/mesh.hpp

@@ -2,13 +2,10 @@
 
 #include <memory>
 #include <sophia/handles.hpp>
+#include <sophia/math.hpp>
 #include <sophia/types.hpp>
 #include <vector>
 
-#define GLM_FORCE_RADIANS
-#define GLM_FORCE_DEPTH_ZERO_TO_ONE
-#include <glm/glm.hpp>
-
 #include "vulkan/buffer.hpp"
 #include "vulkan/device.hpp"