From 64cc26bc8a22ff8078a3650509aa7ecaa4f8fb5e Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 19 Sep 2025 06:12:36 -0600 Subject: Static yippee --- src/assets.c | 8 +++++--- src/assets.h | 7 +++++-- src/entity.c | 8 ++++++-- src/entity.h | 1 + 4 files changed, 17 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/assets.c b/src/assets.c index 3eb0a8a..68f59f8 100644 --- a/src/assets.c +++ b/src/assets.c @@ -6,7 +6,10 @@ const char textureAssetPaths[TEXTURE_ASSET_COUNT][FT_NAMEMAX] = { "tree.png", "bush.png", "flower.png", - "Samantha.png" + "Samantha1.png", + "Samantha2.png", + "Samantha3.png", + "Samantha4.png" }; const char imageAssetPaths[IMAGE_ASSET_COUNT][FT_NAMEMAX] = { @@ -37,8 +40,7 @@ void initShaderAssets(Shader shaders[SHADER_ASSET_COUNT]) void initModelAssets(Assets* assets) { - assets->models[SAMANTHA_MODEL].materials[0] - .maps[MATERIAL_MAP_DIFFUSE].texture = assets->textures[SAMANTHA_TEXTURE]; + } void initAssets(Assets* assets) diff --git a/src/assets.h b/src/assets.h index c2906c9..0b7db82 100644 --- a/src/assets.h +++ b/src/assets.h @@ -3,7 +3,7 @@ #ifndef ASSETS_H #define ASSETS_H -#define TEXTURE_ASSET_COUNT 6 +#define TEXTURE_ASSET_COUNT 9 #define IMAGE_ASSET_COUNT 1 #define SHADER_ASSET_COUNT 2 #define MODEL_ASSET_COUNT 2 @@ -22,7 +22,10 @@ enum { TREE_TEXTURE, BUSH_TEXTURE, FLOWER_TEXTURE, - SAMANTHA_TEXTURE + SAMANTHA_1_TEXTURE, + SAMANTHA_2_TEXTURE, + SAMANTHA_3_TEXTURE, + SAMANTHA_4_TEXTURE }; // Image asset ids. diff --git a/src/entity.c b/src/entity.c index 1548968..ef77e8f 100644 --- a/src/entity.c +++ b/src/entity.c @@ -12,7 +12,6 @@ BoundingBox entityBoxFromScale(float scale, float width, float height) }; } -// TODO: Entity creation system Entity createEntity(EntityId id, Vector3 position) { Entity entity; @@ -65,7 +64,6 @@ Entity createEntity(EntityId id, Vector3 position) return entity; } -// TODO: Mesh instance the utility poles and make a 3d model void updateEntity(Entity* entity, Game* game) { DrawBoundingBox(entity->box, RED); @@ -98,6 +96,12 @@ void updateEntity(Entity* entity, Game* game) (Vector2){POND_SIZE * 2.5, POND_SIZE * 2.5}, BLUE); break; case SAMANTHA: + // silly tv static effect + game->assets.models[SAMANTHA_MODEL].materials[0] + .maps[MATERIAL_MAP_DIFFUSE].texture = + game->assets.textures[ + SAMANTHA_1_TEXTURE + ((int)(GetTime() * SAMANTHA_STATIC_SPEED) % 4)]; + DrawModel(game->assets.models[SAMANTHA_MODEL], entity->position, 1.0, WHITE); break; diff --git a/src/entity.h b/src/entity.h index 934efa3..177df79 100644 --- a/src/entity.h +++ b/src/entity.h @@ -20,6 +20,7 @@ #define SAMANTHA_WIDTH 23.6414/2.0 #define SAMANTHA_HEIGHT 28.5382/2.0 #define SAMANTHA_THICKNESS 13.0529/2.0 +#define SAMANTHA_STATIC_SPEED 24 typedef int8_t EntityId; -- cgit v1.2.3