From 4f9e31a69d269a96ea3a725d722400a1865242a8 Mon Sep 17 00:00:00 2001 From: Warwick New Date: Fri, 31 Jul 2026 13:31:57 +0100 Subject: [PATCH] Tiny bit of cleanup --- include/wne/window.hpp | 4 ++-- src/main.cpp | 2 +- src/window.cpp | 20 ++++++++++++++------ 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/include/wne/window.hpp b/include/wne/window.hpp index 63eb48f..031ff5e 100644 --- a/include/wne/window.hpp +++ b/include/wne/window.hpp @@ -23,7 +23,7 @@ const char shaderCode[] = R"( } )"; -class window { +class Window { wgpu::Instance instance; wgpu::Adapter adapter; wgpu::Device device; @@ -41,7 +41,7 @@ class window { public: //TODO: make init the constructor - window(); + Window(); void Start(); }; } // namespace wne diff --git a/src/main.cpp b/src/main.cpp index 2cf9239..7e03637 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ #include "wne/window.hpp" int main() { - wne::window window = wne::window{}; + wne::Window window = wne::Window{}; window.Start(); } diff --git a/src/window.cpp b/src/window.cpp index c580e11..443dfc0 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1,13 +1,15 @@ #include "wne/window.hpp" +#include #include #include +#include #include #include namespace wne { -void window::ConfigureSurface() { +void Window::ConfigureSurface() { wgpu::SurfaceCapabilities capabilities; surface.GetCapabilities(adapter, &capabilities); format = capabilities.formats[0]; @@ -17,7 +19,7 @@ void window::ConfigureSurface() { surface.Configure(&config); } -void window::CreateRenderPipeline() { +void Window::CreateRenderPipeline() { wgpu::ShaderSourceWGSL wgsl{{.code = shaderCode}}; wgpu::ShaderModuleDescriptor shaderModuleDescriptor{.nextInChain = &wgsl}; @@ -33,7 +35,8 @@ void window::CreateRenderPipeline() { .fragment = &fragmentState}; pipeline = device.CreateRenderPipeline(&descriptor); } -void window::Render() { + +void Window::Render() { wgpu::SurfaceTexture surfaceTexture; surface.GetCurrentTexture(&surfaceTexture); @@ -53,12 +56,13 @@ void window::Render() { wgpu::CommandBuffer commands = encoder.Finish(); device.GetQueue().Submit(1, &commands); } -void window::InitGraphics() { + +void Window::InitGraphics() { ConfigureSurface(); CreateRenderPipeline(); } -window::window() { +Window::Window() { static const auto kTimedWaitAny = wgpu::InstanceFeatureName::TimedWaitAny; wgpu::InstanceDescriptor instanceDesc{.requiredFeatureCount = 1, .requiredFeatures = &kTimedWaitAny}; @@ -95,8 +99,11 @@ window::window() { }); instance.WaitAny(f2, UINT64_MAX); } -void window::Start() { + +void Window::Start() { if (!SDL_Init(SDL_INIT_VIDEO)) { + SDL_LogError(SDL_LOG_CATEGORY_ERROR, "Could not initialise SDL: %s", + SDL_GetError()); return; } @@ -134,4 +141,5 @@ void window::Start() { #endif SDL_Quit(); } + } // namespace wne