From 20cf016b06f50afbbb084b38037303d719e26779 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 8 Oct 2025 15:18:38 -0500 Subject: [PATCH] scene stuff --- src/console/consoledefs.h | 8 ++++---- src/display/CMakeLists.txt | 4 ++-- src/display/display.c | 2 -- src/scene/scene/scenemap.c | 21 ++++++++++++++++++++- src/scene/scene/scenemap.h | 2 ++ src/ui/ui.c | 1 - 6 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/console/consoledefs.h b/src/console/consoledefs.h index 3919046..fc84e47 100644 --- a/src/console/consoledefs.h +++ b/src/console/consoledefs.h @@ -10,10 +10,10 @@ #define CONSOLE_CMD_NAME_MAX 32 #define CONSOLE_CMD_ARGC_MAX 16 -#define CONSOLE_COMMANDS_MAX 128 -#define CONSOLE_VARIABLES_MAX 128 -#define CONSOLE_LINE_MAX 256 -#define CONSOLE_HISTORY_MAX 32 +#define CONSOLE_COMMANDS_MAX 32 +#define CONSOLE_VARIABLES_MAX 64 +#define CONSOLE_LINE_MAX 128 +#define CONSOLE_HISTORY_MAX 16 #define CONSOLE_EXEC_BUFFER_MAX 32 #define CONSOLE_ALIAS_MAX 32 diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index 3c88a0e..b2a4822 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -23,8 +23,8 @@ if(DUSK_TARGET_SYSTEM STREQUAL "linux") target_compile_definitions(${DUSK_TARGET_NAME} PRIVATE DISPLAY_SDL2=1 - DISPLAY_WINDOW_WIDTH_DEFAULT=960 - DISPLAY_WINDOW_HEIGHT_DEFAULT=720 + DISPLAY_WINDOW_WIDTH_DEFAULT=1080 + DISPLAY_WINDOW_HEIGHT_DEFAULT=810 ) elseif(DUSK_TARGET_SYSTEM STREQUAL "psp") target_compile_definitions(${DUSK_TARGET_NAME} diff --git a/src/display/display.c b/src/display/display.c index ef0015d..b7250b1 100644 --- a/src/display/display.c +++ b/src/display/display.c @@ -117,8 +117,6 @@ errorret_t displayUpdate(void) { ); sceneManagerRender(); uiRender(); - - // UI will probs go here // Finish up spriteBatchFlush(); diff --git a/src/scene/scene/scenemap.c b/src/scene/scene/scenemap.c index ff9268a..a50fe17 100644 --- a/src/scene/scene/scenemap.c +++ b/src/scene/scene/scenemap.c @@ -6,6 +6,7 @@ */ #include "scenemap.h" +#include "display/spritebatch.h" errorret_t sceneMapInit(scenedata_t *data) { errorOk(); @@ -15,7 +16,25 @@ void sceneMapUpdate(scenedata_t *data) { } void sceneMapRender(scenedata_t *data) { - + entity_t *ent = ENTITIES; + do { + sceneMapRenderEntity(ent); + } while(++ent, ent < &ENTITIES[ENTITY_COUNT]); +} + +void sceneMapRenderEntity(const entity_t *entity) { + assertNotNull(entity); + + if(entity->type == ENTITY_TYPE_NULL) return; + + spriteBatchPush( + NULL, + 0.0f, 0.0f, + 32.0f, 32.0f, + COLOR_RED, + 0.0f, 0.0f, + 1.0f, 1.0f + ); } void sceneMapDispose(scenedata_t *data) { diff --git a/src/scene/scene/scenemap.h b/src/scene/scene/scenemap.h index a907cc2..41f3208 100644 --- a/src/scene/scene/scenemap.h +++ b/src/scene/scene/scenemap.h @@ -7,6 +7,7 @@ #pragma once #include "scene/scene.h" +#include "rpg/entity/entity.h" typedef struct { int32_t nothing; @@ -15,6 +16,7 @@ typedef struct { errorret_t sceneMapInit(scenedata_t *data); void sceneMapUpdate(scenedata_t *data); void sceneMapRender(scenedata_t *data); +void sceneMapRenderEntity(const entity_t *entity); void sceneMapDispose(scenedata_t *data); static scene_t SCENE_MAP = { diff --git a/src/ui/ui.c b/src/ui/ui.c index e6fc597..49330e2 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -34,7 +34,6 @@ void uiUpdate(void) { } void uiRender(void) { - cameraPushMatrix(&UI.camera); // Render UI elements here