From a2c622ddc16a343e89fabde279ce48e8913b15b1 Mon Sep 17 00:00:00 2001 From: Dominic Masters Date: Wed, 3 Nov 2021 12:51:48 -0700 Subject: [PATCH] Fixed loading example. --- src/game/sandbox/game.c | 21 +++++++++------------ src/game/sandbox/game.h | 3 +-- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/game/sandbox/game.c b/src/game/sandbox/game.c index e9f77255..00a7261e 100644 --- a/src/game/sandbox/game.c +++ b/src/game/sandbox/game.c @@ -9,14 +9,15 @@ bool sandboxGameInit(sandboxgame_t *game) { - // assetTextureLoad(&game->texture, "textures/test_texture.png"); quadInit(&game->quad, 0, 0,0,0,0, 500,500,1,1); - game->texture.width = -1; assetManagerInit(&game->manager); - - assetManagerLoadTexture(&game->manager, &game->texture, "textures/test_texture.png"); - assetManagerLoadFont(&game->manager, &game->font, "fonts/opensans/OpenSans-Regular.ttf"); + assetManagerLoadTexture(&game->manager, &game->texture, + "textures/test_texture.png" + ); + assetManagerLoadFont(&game->manager, &game->font, + "fonts/opensans/OpenSans-Regular.ttf" + ); assetManagerShaderLoad(&game->manager, &game->shader, "shaders/textured.vert", "shaders/textured.frag" @@ -45,13 +46,9 @@ void sandboxGameUpdate(sandboxgame_t *game) { shaderUse(&game->shader); shaderUseCamera(&game->shader, &camera); - - - if(game->texture.width != -1) { - shaderUseTexture(&game->shader, &game->texture); - shaderUsePosition(&game->shader, 0,0,0, 0,0,0); - primitiveDraw(&game->quad, 0, -1); - } + shaderUseTexture(&game->shader, &game->texture); + shaderUsePosition(&game->shader, 0,0,0, 0,0,0); + primitiveDraw(&game->quad, 0, -1); } void sandboxGameDispose(sandboxgame_t *game) { diff --git a/src/game/sandbox/game.h b/src/game/sandbox/game.h index cd5162cb..bb728af1 100644 --- a/src/game/sandbox/game.h +++ b/src/game/sandbox/game.h @@ -21,10 +21,9 @@ typedef struct { engine_t engine; shader_t shader; font_t font; + texture_t texture; primitive_t quad; assetmanager_t manager; - - texture_t texture; } sandboxgame_t; /**