From 451a8d5ea630f07379f3c5fa15c655b50cef963f Mon Sep 17 00:00:00 2001 From: light7734 Date: Mon, 2 Feb 2026 14:09:01 +0330 Subject: [PATCH] fix: accomodate recent math module renamings --- modules/input/events.cppm | 6 +++--- modules/mirror/system.cppm | 2 +- modules/renderer/_tests/utils.cppm | 2 +- modules/renderer/frontends.cppm | 2 +- modules/renderer/vk/api_wrapper.cppm | 20 ++++++++++---------- modules/renderer/vk/renderer.cppm | 2 +- modules/renderer/vk/surface.cppm | 4 ++-- modules/renderer/vk/swapchain.cppm | 4 ++-- modules/surface/components.cppm | 10 +++++----- modules/surface/events.cppm | 8 ++++---- modules/surface/requests.cppm | 4 ++-- modules/surface/system.cppm | 4 ++-- modules/surface/system.test.cpp | 4 ++-- 13 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/input/events.cppm b/modules/input/events.cppm index fdc4417..78732c0 100644 --- a/modules/input/events.cppm +++ b/modules/input/events.cppm @@ -10,7 +10,7 @@ namespace lt::input { export class AnalogEvent { public: - AnalogEvent(Key key, math::uvec2 pointer_position) + AnalogEvent(Key key, math::vec2_u32 pointer_position) : m_key(key) , m_pointer_position(pointer_position) { @@ -21,7 +21,7 @@ public: return m_key; }; - [[nodiscard]] auto get_pointer_position() const -> math::uvec2 + [[nodiscard]] auto get_pointer_position() const -> math::vec2_u32 { return m_pointer_position; } @@ -35,7 +35,7 @@ public: private: Key m_key; - math::uvec2 m_pointer_position; + math::vec2_u32 m_pointer_position; }; } // namespace lt::input diff --git a/modules/mirror/system.cppm b/modules/mirror/system.cppm index 6a1c005..b3c33d2 100644 --- a/modules/mirror/system.cppm +++ b/modules/mirror/system.cppm @@ -255,7 +255,7 @@ public: m_editor_registry->add( m_camera_id, camera::components::PerspectiveCamera { - .vertical_fov = math::radians(90.0f), + .vertical_fov = math::to_radians(90.0f), .near_plane = 0.1f, .far_plane = 30.0, .aspect_ratio = 1.0f, diff --git a/modules/renderer/_tests/utils.cppm b/modules/renderer/_tests/utils.cppm index 1a35e21..bc90904 100644 --- a/modules/renderer/_tests/utils.cppm +++ b/modules/renderer/_tests/utils.cppm @@ -15,7 +15,7 @@ export import math.mat4; export namespace constants { constexpr auto api = lt::renderer::Api::vulkan; -constexpr auto resolution = lt::math::uvec2 { 800u, 600u }; +constexpr auto resolution = lt::math::vec2_u32 { 800u, 600u }; constexpr auto frames_in_flight = u32 { 3u }; } // namespace constants diff --git a/modules/renderer/frontends.cppm b/modules/renderer/frontends.cppm index 16f17ca..a42a47d 100644 --- a/modules/renderer/frontends.cppm +++ b/modules/renderer/frontends.cppm @@ -52,7 +52,7 @@ public: virtual ~ISurface() = default; - [[nodiscard]] virtual auto get_framebuffer_size() const -> math::uvec2 = 0; + [[nodiscard]] virtual auto get_framebuffer_size() const -> math::vec2_u32 = 0; }; class ISwapchain diff --git a/modules/renderer/vk/api_wrapper.cppm b/modules/renderer/vk/api_wrapper.cppm index b0e392a..524788d 100644 --- a/modules/renderer/vk/api_wrapper.cppm +++ b/modules/renderer/vk/api_wrapper.cppm @@ -702,9 +702,9 @@ struct Viewport struct Rect2d { - math::ivec2 offset; + math::vec2_i32 offset; - math::uvec2 extent; + math::vec2_u32 extent; }; /** There is no global state in Vulkan and all per-application state is stored in a VkInstance @@ -809,11 +809,11 @@ public: u32 max_image_count; - math::uvec2 current_extent; + math::vec2_u32 current_extent; - math::uvec2 min_image_extent; + math::vec2_u32 min_image_extent; - math::uvec2 max_image_extent; + math::vec2_u32 max_image_extent; u32 max_image_array_layers; @@ -1126,7 +1126,7 @@ public: QueueFlags::T queue_flags {}; u32 queue_count {}; u32 timestamp_valid_bits {}; - math::uvec3 min_image_transfer_granularity; + math::vec3_u32 min_image_transfer_granularity; }; [[nodiscard]] @@ -2306,9 +2306,9 @@ public: Flags resolve_mode_flags; }; - math::ivec2 area_offset; + math::vec2_i32 area_offset; - math::uvec2 area_extent; + math::vec2_u32 area_extent; std::vector color_attachments; }; @@ -2459,7 +2459,7 @@ public: ColorSpace color_space; - math::uvec2 extent; + math::vec2_u32 extent; u32 min_image_count; @@ -3571,7 +3571,7 @@ Surface::~Surface() .queue_flags = static_cast(vk_property.queueFlags), .queue_count = vk_property.queueCount, .timestamp_valid_bits = vk_property.timestampValidBits, - .min_image_transfer_granularity = math::uvec3{ + .min_image_transfer_granularity = math::vec3_u32{ vk_property.minImageTransferGranularity.width, vk_property.minImageTransferGranularity.height, vk_property.minImageTransferGranularity.depth, diff --git a/modules/renderer/vk/renderer.cppm b/modules/renderer/vk/renderer.cppm index db31fd1..50fc152 100644 --- a/modules/renderer/vk/renderer.cppm +++ b/modules/renderer/vk/renderer.cppm @@ -78,7 +78,7 @@ private: std::vector m_submit_semaphores; - math::uvec2 m_resolution; + math::vec2_u32 m_resolution; FrameConstants m_frame_constants; diff --git a/modules/renderer/vk/surface.cppm b/modules/renderer/vk/surface.cppm index bd3196c..cd44dcb 100644 --- a/modules/renderer/vk/surface.cppm +++ b/modules/renderer/vk/surface.cppm @@ -22,7 +22,7 @@ public: return m_surface; } - [[nodiscard]] auto get_framebuffer_size() const -> math::uvec2 override; + [[nodiscard]] auto get_framebuffer_size() const -> math::vec2_u32 override; private: vk::Surface m_surface; @@ -78,7 +78,7 @@ Surface::Surface(IInstance *instance, const ecs::Entity &surface_entity) #endif } -[[nodiscard]] auto Surface::get_framebuffer_size() const -> math::uvec2 +[[nodiscard]] auto Surface::get_framebuffer_size() const -> math::vec2_u32 { return m_surface_entity.get().get_resolution(); } diff --git a/modules/renderer/vk/swapchain.cppm b/modules/renderer/vk/swapchain.cppm index 8872b07..410bc0e 100644 --- a/modules/renderer/vk/swapchain.cppm +++ b/modules/renderer/vk/swapchain.cppm @@ -23,7 +23,7 @@ public: return m_swapchain; } - [[nodiscard]] auto get_resolution() const -> math::uvec2 + [[nodiscard]] auto get_resolution() const -> math::vec2_u32 { return m_resolution; } @@ -66,7 +66,7 @@ private: std::vector m_image_views; - math::uvec2 m_resolution {}; + math::vec2_u32 m_resolution {}; vk::Format m_format {}; }; diff --git a/modules/surface/components.cppm b/modules/surface/components.cppm index adc1d43..45ca8fb 100644 --- a/modules/surface/components.cppm +++ b/modules/surface/components.cppm @@ -66,7 +66,7 @@ public: { std::string_view title; - math::uvec2 resolution; + math::vec2_u32 resolution; bool vsync; @@ -78,12 +78,12 @@ public: return m_title; } - [[nodiscard]] auto get_resolution() const -> const math::uvec2 & + [[nodiscard]] auto get_resolution() const -> const math::vec2_u32 & { return m_resolution; } - [[nodiscard]] auto get_position() const -> const math::ivec2 & + [[nodiscard]] auto get_position() const -> const math::vec2_i32 & { return m_position; } @@ -136,9 +136,9 @@ private: std::string m_title; - math::uvec2 m_resolution; + math::vec2_u32 m_resolution; - math::ivec2 m_position; + math::vec2_i32 m_position; bool m_vsync; diff --git a/modules/surface/events.cppm b/modules/surface/events.cppm index 1699f8d..de3c918 100644 --- a/modules/surface/events.cppm +++ b/modules/surface/events.cppm @@ -202,7 +202,7 @@ public: { } - [[nodiscard]] auto get_position() const -> const math::ivec2 & + [[nodiscard]] auto get_position() const -> const math::vec2_i32 & { return m_position; } @@ -213,7 +213,7 @@ public: } private: - math::ivec2 m_position; + math::vec2_i32 m_position; }; class ResizedEvent @@ -223,7 +223,7 @@ public: { } - [[nodiscard]] auto get_size() const -> const math::uvec2 & + [[nodiscard]] auto get_size() const -> const math::vec2_u32 & { return m_size; } @@ -234,7 +234,7 @@ public: } private: - math::uvec2 m_size; + math::vec2_u32 m_size; }; class LostFocusEvent diff --git a/modules/surface/requests.cppm b/modules/surface/requests.cppm index 5b5f951..eb2f72c 100644 --- a/modules/surface/requests.cppm +++ b/modules/surface/requests.cppm @@ -12,12 +12,12 @@ struct ModifyTitleRequest struct ModifyResolutionRequest { - math::uvec2 resolution; + math::vec2_u32 resolution; }; struct ModifyPositionRequest { - math::ivec2 position; + math::vec2_i32 position; }; struct ModifyVisibilityRequest diff --git a/modules/surface/system.cppm b/modules/surface/system.cppm index c617260..cca05d3 100644 --- a/modules/surface/system.cppm +++ b/modules/surface/system.cppm @@ -150,9 +150,9 @@ private: void modify_visiblity(SurfaceComponent &surface, const ModifyVisibilityRequest &request); - void modify_position(ecs::EntityId surface_entity, const math::ivec2 &new_size); + void modify_position(ecs::EntityId surface_entity, const math::vec2_i32 &new_size); - void modify_position(ecs::EntityId surface_entity, const math::uvec2 &new_size); + void modify_position(ecs::EntityId surface_entity, const math::vec2_u32 &new_size); void set_visibility(ecs::EntityId surface_entity, bool visible); diff --git a/modules/surface/system.test.cpp b/modules/surface/system.test.cpp index 6555204..b94bd85 100644 --- a/modules/surface/system.test.cpp +++ b/modules/surface/system.test.cpp @@ -227,8 +227,8 @@ Suite tick = "ticking"_suite = [] { auto system = System { fixture.registry() }; auto &surface = **fixture.create_component(); - constexpr auto position = lt::math::ivec2 { 50, 50 }; - constexpr auto resolution = lt::math::uvec2 { width, height }; + constexpr auto position = lt::math::vec2_i32 { 50, 50 }; + constexpr auto resolution = lt::math::vec2_u32 { width, height }; expect_eq(surface.peek_requests().size(), 0);