polymorphic windows

This commit is contained in:
2026-02-08 11:57:18 -06:00
parent bad4bd70bc
commit f277dee1f7
4 changed files with 76 additions and 77 deletions

View File

@@ -5,7 +5,7 @@
#include "pch.hpp"
#include "utils/Window/WindowEvents.h"
#include "utils/Window/Window.h"
#include <SDL3/SDL.h>
@@ -17,8 +17,6 @@
namespace Archimedes {
class Window;
static bool EventCallback(void* ptr, SDL_Event* e) {
WindowData& data = *(WindowData*) ptr;
@@ -66,13 +64,13 @@ namespace Archimedes {
return true;
}
class WindowSDL3 {
class WindowSDL3 : public Window {
public:
WindowSDL3(Window* p, const std::function<void(Event*)>& sendEvent) {
WindowSDL3(const std::function<void(Event*)>& sendEvent) : Window(sendEvent) {
data.window = p;
data.window = this;
data.sendEvent = sendEvent;
if (!SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMEPAD)) {
@@ -90,16 +88,16 @@ namespace Archimedes {
SDL_WindowFlags window_flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN | SDL_WINDOW_HIGH_PIXEL_DENSITY;
#endif
w = SDL_CreateWindow("Archimedes", 1280, 720, window_flags);
if (w == nullptr)
window = SDL_CreateWindow("Archimedes", 1280, 720, window_flags);
if (window == nullptr)
{
std::cerr << "Error: SDL_CreateWindow(): " << SDL_GetError() << std::endl;
std::abort();
}
SDL_SetWindowPosition(w, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
SDL_SetWindowPosition(window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
#if RENDERER == 1
gl_context = SDL_GL_CreateContext(w);
gl_context = SDL_GL_CreateContext(window);
if (gl_context == nullptr)
{
@@ -107,12 +105,12 @@ namespace Archimedes {
std::abort();
}
SDL_GL_MakeCurrent(w, gl_context);
SDL_GL_MakeCurrent(window, gl_context);
SDL_GL_SetSwapInterval(1); // Enable vsync
#endif
SDL_AddEventWatch(EventCallback, &data);
SDL_ShowWindow(w);
SDL_ShowWindow(window);
}
~WindowSDL3() {
@@ -120,52 +118,52 @@ namespace Archimedes {
SDL_GL_DestroyContext(gl_context);
#endif
SDL_RemoveEventWatch(EventCallback, &data);
SDL_DestroyWindow(w);
SDL_DestroyWindow(window);
SDL_Quit();
}
bool shouldClose() { return false; }
bool shouldClose() override { return false; }
void doFrame() {
void swapBuffers() override {
#if RENDERER == 1
restoreContext();
SDL_GL_SwapWindow(w);
SDL_GL_SwapWindow(window);
#endif
}
void pollEvents() {
void pollEvents() override {
static SDL_Event e;
while(SDL_PollEvent(&e)) {}
while(SDL_PollEvent(&e));
}
WindowSDL3* getWindowImpl() { return this; };
#if RENDERER == 1
void restoreContext() { SDL_GL_MakeCurrent(w, gl_context); }
void restoreContext() { SDL_GL_MakeCurrent(window, gl_context); }
#endif
void getSize(int& w, int& h) {
w = this->width;
h = this->height;
void getSize(int& w, int& h) override {
w = this->w;
h = this->h;
}
void setSize(int& w, int& h) {
this->width = w;
this->height = h;
this->w = w;
this->h = h;
}
SDL_Window* getWindow() { return w; }
SDL_Window* getWindow() { return window; }
#if RENDERER == 1
SDL_GLContext getContext() { return gl_context; }
#endif
WindowData data;
private:
SDL_Window* w;
int width = 0, height = 0;
SDL_Window* window;
#if RENDERER == 1
SDL_GLContext gl_context;
#endif
};
typedef WindowSDL3 WindowImpl;
}
#endif