From 933cf2f1f40fd2cb60c7babb37b08dc60090f266 Mon Sep 17 00:00:00 2001 From: Lorenzo Torres Date: Mon, 4 Aug 2025 13:43:09 +0200 Subject: [PATCH] Removed unecessary Window struct --- src/renderer/Renderer.zig | 1 - src/renderer/Window.zig | 89 --------------------------------------- src/renderer/vulkan.zig | 1 - 3 files changed, 91 deletions(-) delete mode 100644 src/renderer/Window.zig diff --git a/src/renderer/Renderer.zig b/src/renderer/Renderer.zig index 16df8f7..6727e3e 100644 --- a/src/renderer/Renderer.zig +++ b/src/renderer/Renderer.zig @@ -2,7 +2,6 @@ const c = @import("sideros").c; const ecs = @import("ecs"); const std = @import("std"); const vk = @import("vulkan.zig"); -pub const Window = @import("Window.zig"); pub const Mesh = @import("Mesh.zig"); const Allocator = std.mem.Allocator; diff --git a/src/renderer/Window.zig b/src/renderer/Window.zig deleted file mode 100644 index ff3d6cd..0000000 --- a/src/renderer/Window.zig +++ /dev/null @@ -1,89 +0,0 @@ -const c = @import("sideros").c; -const ecs = @import("ecs"); -const std = @import("std"); - -const Window = @This(); - -pub const Error = error{ - platform_unavailable, - platform_error, -}; - -pub fn getExtensions() [][*c]const u8 { - const raw: [*c][*c]const u8 = .{"VK_KHR_wayland_surface", "VK_KHR_surface"}; - const extensions = raw[0..2]; - - return extensions; -} - -title: []const u8, -width: usize, -height: usize, -raw: *c.wl_display, - -pub fn create(width: usize, height: usize, title: []const u8) !Window { - const raw = c.wl_display_connect(null); - - return Window{ - .title = title, - .width = width, - .height = height, - .raw = raw.?, - }; -} - -pub fn setResources(self: *Window, resources: *ecs.Resources) void { - c.glfwSetWindowUserPointer(self.raw, resources); -} - -pub fn shouldClose(self: Window) bool { - return c.wl_display_dispatch(self.raw) != -1; -} - -pub fn size(self: Window) struct { usize, usize } { - var width: u32 = undefined; - var height: u32 = undefined; - - c.glfwGetFramebufferSize(self.raw, @ptrCast(&width), @ptrCast(&height)); - - return .{ @intCast(width), @intCast(height) }; -} - -pub fn destroy(self: Window) void { - c.wl_display_disconnect(self.raw); -} - -pub fn getTime() f64 { - return c.glfwGetTime(); -} - -pub fn keyCallback(window: ?*c.GLFWwindow, key: c_int, scancode: c_int, action: c_int, mods: c_int) callconv(.c) void { - _ = scancode; - _ = mods; - if (c.glfwGetWindowUserPointer(window)) |r| { - const resources: *ecs.Resources = @alignCast(@ptrCast(r)); - if (action == c.GLFW_PRESS) { - resources.input.key_pressed[@intCast(key)] = true; - } else if (action == c.GLFW_RELEASE) { - resources.input.key_pressed[@intCast(key)] = false; - } - } -} - -pub fn cursorCallback(window: ?*c.GLFWwindow, x: f64, y: f64) callconv(.c) void { - if (c.glfwGetWindowUserPointer(window)) |r| { - const resources: *ecs.Resources = @alignCast(@ptrCast(r)); - var input = resources.input; - - if (input.mouse_first) { - input.mouse_x = x; - input.mouse_y = y; - input.mouse_first = false; - } - - input.mouse_delta_x = (x - input.mouse_x); - input.mouse_delta_y = (y - input.mouse_y); - input.mouse_x = x; - input.mouse_y = y; - } -} diff --git a/src/renderer/vulkan.zig b/src/renderer/vulkan.zig index 753cdcc..882c824 100644 --- a/src/renderer/vulkan.zig +++ b/src/renderer/vulkan.zig @@ -1,6 +1,5 @@ const std = @import("std"); const c = @import("sideros").c; -const Window = @import("Window.zig"); const Mesh = @import("Mesh.zig"); const sideros = @import("sideros"); const Camera = @import("Camera.zig");