wanp/townengine
2
1
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

rework to context: now there's engine and user code copies, renaming of fields, most things that shouldn't be there are hidden

Browse Source
This commit is contained in:
veclav talica
2024-10-12 20:24:47 +03:00
parent 7886650339
commit e70366f82f
14 changed files with 106 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/twn_loop.c
View File

@ -36,8 +36,8 @@ static int event_callback(void *userdata, SDL_Event *event) {
switch (event->window.event) {
case SDL_WINDOWEVENT_SIZE_CHANGED:
ctx.game.window_w = event->window.data1;
ctx.game.window_h = event->window.data2;
ctx.window_dims.x = event->window.data1;
ctx.window_dims.y = event->window.data2;
ctx.resync_flag = true;
break;
@ -59,12 +59,12 @@ static int event_callback(void *userdata, SDL_Event *event) {
static void poll_events(void) {
SDL_Event e;
ctx.game.window_size_has_changed = false;
ctx.window_size_has_changed = false;
while (SDL_PollEvent(&e)) {
switch (e.type) {
case SDL_QUIT:
ctx.game.is_running = false;
ctx.is_running = false;
break;
case SDL_WINDOWEVENT:
@ -73,7 +73,7 @@ static void poll_events(void) {
switch (e.window.event) {
case SDL_WINDOWEVENT_SIZE_CHANGED:
ctx.game.window_size_has_changed = true;
ctx.window_size_has_changed = true;
break;
default:
@ -111,6 +111,11 @@ static void APIENTRY opengl_log(GLenum source,
#endif
void preserve_persistent_ctx_fields(void) {
ctx.game.udata = ctx.game_copy.udata;
}
static void main_loop(void) {
/*
if (!ctx.is_running) {
@ -124,7 +129,7 @@ static void main_loop(void) {
int64_t current_frame_time = SDL_GetPerformanceCounter();
int64_t delta_time = current_frame_time - ctx.prev_frame_time;
ctx.prev_frame_time = current_frame_time;
ctx.game.delta_time = delta_time;
ctx.delta_time = delta_time;
/* handle unexpected timer anomalies (overflow, extra slow frames, etc) */
if (delta_time > ctx.desired_frametime * 8) { /* ignore extra-slow frames */
@ -188,24 +193,23 @@ static void main_loop(void) {
ctx.resync_flag = false;
}
ctx.game_copy = ctx.game;
/* finally, let's get to work */
int frames = 0;
while (ctx.frame_accumulator >= ctx.desired_frametime * ctx.game.update_multiplicity) {
while (ctx.frame_accumulator >= ctx.desired_frametime * ctx.update_multiplicity) {
frames += 1;
for (size_t i = 0; i < ctx.game.update_multiplicity; ++i) {
for (size_t i = 0; i < ctx.update_multiplicity; ++i) {
/* TODO: disable rendering pushes on not-last ? */
render_queue_clear();
poll_events();
input_state_update(&ctx.input);
game_object_tick();
preserve_persistent_ctx_fields();
ctx.frame_accumulator -= ctx.desired_frametime;
ctx.game.tick_count = (ctx.game.tick_count % ULLONG_MAX) + 1;
ctx.game.frame_number = (ctx.game.frame_number % ULLONG_MAX) + 1;
ctx.game.initialization_needed = false;
}
}
@ -439,7 +443,7 @@ static bool initialize(void) {
goto fail;
}
ctx.base_render_width = datum_base_render_width.u.i;
ctx.game.base_draw_w = (int)ctx.base_render_width;
ctx.game.resolution.x = (int)ctx.base_render_width;
toml_datum_t datum_base_render_height = toml_int_in(game, "base_render_height");
if (!datum_base_render_height.ok) {
@ -447,7 +451,7 @@ static bool initialize(void) {
goto fail;
}
ctx.base_render_height = datum_base_render_height.u.i;
ctx.game.base_draw_h = (int)ctx.base_render_height;
ctx.game.resolution.y = (int)ctx.base_render_height;
ctx.window = SDL_CreateWindow(datum_title.u.s,
SDL_WINDOWPOS_CENTERED,
@ -503,8 +507,8 @@ static bool initialize(void) {
/* TODO: */
// SDL_GetRendererOutputSize(ctx.renderer, &ctx.window_w, &ctx.window_h);
ctx.game.window_w = (int)ctx.base_render_width;
ctx.game.window_h = (int)ctx.base_render_height;
ctx.window_dims.x = (int)ctx.base_render_width;
ctx.window_dims.y = (int)ctx.base_render_height;
/* add a watcher for immediate updates on window size */
SDL_AddEventWatch(event_callback, NULL);
@ -532,7 +536,7 @@ static bool initialize(void) {
}
/* you could change this at runtime if you wanted */
ctx.game.update_multiplicity = 1;
ctx.update_multiplicity = 1;
#ifndef EMSCRIPTEN
/* hook up opengl debugging callback */
@ -561,13 +565,13 @@ static bool initialize(void) {
}
}
ctx.game.is_running = true;
ctx.is_running = true;
ctx.resync_flag = true;
ctx.clocks_per_second = SDL_GetPerformanceFrequency();
ctx.prev_frame_time = SDL_GetPerformanceCounter();
ctx.desired_frametime = ctx.clocks_per_second / ctx.ticks_per_second;
ctx.frame_accumulator = 0;
ctx.game.tick_count = 0;
ctx.game.frame_number = 0;
/* delta time averaging */
ctx.delta_averager_residual = 0;
@ -772,7 +776,7 @@ int enter_loop(int argc, char **argv) {
ctx.was_successful = true;
ctx.game.initialization_needed = true;
while (ctx.game.is_running) {
while (ctx.is_running) {
if (game_object_try_reloading()) {
ctx.game.initialization_needed = true;
reset_state();