diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/include/engine/core/platform.h | 7 | ||||
| -rw-r--r-- | src/core/src/loop.c | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/core/include/engine/core/platform.h b/src/core/include/engine/core/platform.h index 0a1bb45..de39f71 100644 --- a/src/core/include/engine/core/platform.h +++ b/src/core/include/engine/core/platform.h @@ -9,7 +9,6 @@ extern "C" { #include <engine/core/types.h> #include <engine/core/memory.h> -#include <engine/ctrl/input.h> #include <engine/rendering/window.h> #include <engine/resources.h> @@ -37,12 +36,6 @@ typedef struct Instance { memory* mem; - /* The ctrl is probably the only sensible thing in this struct. */ - usize bindings_sz; - usize bindings_len; - i_ctx** bindings; - - binding_t bindings_global[NUM_GLOBAL_BINDINGS]; } Instance; #ifdef __cplusplus diff --git a/src/core/src/loop.c b/src/core/src/loop.c index 56567f6..4e9df36 100644 --- a/src/core/src/loop.c +++ b/src/core/src/loop.c @@ -116,7 +116,9 @@ Instance* engine_init(const char* windowtitle, i32 windowWidth, i32 windowHeight Resources* resources = calloc(1, sizeof(Resources)); // TODO: Initialize them :) - w = Platform_GLFW.window_init(p, windowtitle, (ivec2){windowsize[0], windowsize[1]}, flags); + w = Window_new(windowtitle, + WINDOW_FRAMEWORK_GLFW, WINDOW_RENDERER_OPENGL, + (ivec2){windowsize[0], windowsize[1]}, flags); p->window = w; p->quit = false; @@ -132,10 +134,6 @@ Instance* engine_init(const char* windowtitle, i32 windowWidth, i32 windowHeight p->mem = memory_new(initial_memory); - p->bindings = NULL; - p->bindings_sz = 0; - p->bindings_len = 0; - p->cam = &default_camera; glm_ortho_default(45.f, p->cam->per); @@ -149,7 +147,7 @@ Instance* engine_init(const char* windowtitle, i32 windowWidth, i32 windowHeight #ifdef DAW_BUILD_HOTRELOAD #define State(name) \ - if (!State_reload(STATE_##name, p->bindings, p->bindings_len)) { \ + if (!State_reload(STATE_##name, p->window->bindings, p->window->bindings_len)) { \ ERROR("Failed to reload shared object file for state %s", #name); \ }; |