From 6a7dc92966dda6c7e63354a23692e88c5964b111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Thu, 29 Sep 2022 16:29:31 +0200 Subject: [PATCH] fix invalid calls --- code/foundation/src/gen/asset_setup.h | 4 - code/foundation/src/models/prefabs/furnace.c | 1 + .../src/renderers/renderer_bridge.c | 109 ------------------ 3 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 code/foundation/src/renderers/renderer_bridge.c diff --git a/code/foundation/src/gen/asset_setup.h b/code/foundation/src/gen/asset_setup.h index ecbcdf2..8375903 100644 --- a/code/foundation/src/gen/asset_setup.h +++ b/code/foundation/src/gen/asset_setup.h @@ -20,7 +20,3 @@ // NOTE(zaklaus): Register an item #include "items_list.c" - -// NOTE(zaklaus): Register a spawnable entity -#include "models/entity_spawnlist.c" - diff --git a/code/foundation/src/models/prefabs/furnace.c b/code/foundation/src/models/prefabs/furnace.c index fe6bd94..fb5ccc3 100644 --- a/code/foundation/src/models/prefabs/furnace.c +++ b/code/foundation/src/models/prefabs/furnace.c @@ -1,5 +1,6 @@ #include "furnace.h" #include "models/device.h" +#include "world/world.h" #include "models/components.h" diff --git a/code/foundation/src/renderers/renderer_bridge.c b/code/foundation/src/renderers/renderer_bridge.c deleted file mode 100644 index 6d63328..0000000 --- a/code/foundation/src/renderers/renderer_bridge.c +++ /dev/null @@ -1,109 +0,0 @@ -#include "debug/debug_draw.h" - -#if GFX_KIND == 0 || !defined(GFX_KIND) -// NOTE(zaklaus): renderer_v0 -#include "renderers/renderer_v0.c" -#define renderer_init renderer_init_v0 -#define renderer_shutdown renderer_shutdown_v0 -#define renderer_draw renderer_draw_v0 -#define renderer_draw_single renderer_draw_single_v0 -#define renderer_debug_draw renderer_debug_draw_v0 -#define renderer_zoom_get renderer_zoom_get_v0 -void renderer_switch(int kind) {} -#elif GFX_KIND == 1 -// NOTE(zaklaus): renderer_3d -#include "renderers/renderer_3d.c" -#define renderer_init renderer_init_3d -#define renderer_shutdown renderer_shutdown_3d -#define renderer_draw renderer_draw_3d -#define renderer_draw_single renderer_draw_single_3d -#define renderer_debug_draw renderer_debug_draw_3d -#define renderer_zoom_get renderer_zoom_get_3d -void renderer_switch(int kind) {} -#elif GFX_KIND == 2 -#include "renderers/renderer_3d.c" -#include "renderers/renderer_v0.c" -// NOTE(zaklaus): hybrid mode -static int gfx_kind = 0; // 2d -- 0, 3d -- 1 - -void renderer_draw(void) { - switch (gfx_kind) { - case 0:{ - renderer_draw_v0(); - }break; - case 1:{ - renderer_draw_3d(); - }break; - } -} - -void renderer_init(void) { - switch (gfx_kind) { - case 0:{ - renderer_init_v0(); - }break; - case 1:{ - renderer_init_3d(); - }break; - } -} - -void renderer_shutdown(void) { - switch (gfx_kind) { - case 0:{ - renderer_shutdown_v0(); - }break; - case 1:{ - renderer_shutdown_3d(); - }break; - } -} - -void renderer_debug_draw(void) { - switch (gfx_kind) { - case 0:{ - renderer_debug_draw_v0(); - }break; - case 1:{ - renderer_debug_draw_3d(); - }break; - } -} - -float renderer_zoom_get(void) { - switch (gfx_kind) { - case 0:{ - return renderer_zoom_get_v0(); - }break; - case 1:{ - return renderer_zoom_get_3d(); - }break; - } - return 1.0f; -} - -void renderer_draw_single(float x, float y, asset_id id, Color color) { - switch (gfx_kind) { - case 0:{ - renderer_draw_single_v0(x, y, id, color); - }break; - case 1:{ - renderer_draw_single_3d(x, y, id, color); - }break; - } -} - -void renderer_bake_chunk(uint64_t key, entity_view * data) { - if (data->kind != EKIND_CHUNK) return; - world_view *view = game_world_view_get_active(); - blocks_build_chunk_tex(key, data->blocks, view); -} - -void renderer_switch(int kind) { - renderer_shutdown(); - gfx_kind = kind; - renderer_init(); - - game_world_view_active_entity_map(renderer_bake_chunk); -} -#endif