From 8a8ed6d3fa7059dbb2a95072bbae4bf4618349a0 Mon Sep 17 00:00:00 2001 From: BoredGuy Date: Thu, 21 Aug 2025 20:07:04 +0300 Subject: Work on animation subsystem - Also incomplete refactor of inline functions --- src/game.c | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'src/game.c') diff --git a/src/game.c b/src/game.c index 55b65c2..8659939 100644 --- a/src/game.c +++ b/src/game.c @@ -8,23 +8,10 @@ #include "player.h" #include "background.h" #include +#include "utils.h" Game game; -static inline bool ShouldDrawEntity(const Entity* e, DrawLayer layerDrawing) { - return EntityAllocated(e) - && (e->flags & ENTITY_VISIBLE); -} - -static inline Rectangle GetSpriteDrawDestinationRectGlobal(const Entity* e, int spriteIndex) { - Rectangle destRectGlobal = e->sprites[spriteIndex].destRect; - - destRectGlobal.x += e->position.x; - destRectGlobal.y += e->position.y; - - return destRectGlobal; -} - void AddEntity(Entity* e) { static int nextId = 0; @@ -158,3 +145,33 @@ void AddWall(float xpos, float ypos, float width, float height) { AddEntity(&wall); } + +static inline float GetCurrentFrameTime(const Animation* animation) { + return animation->frameTimes[animation->currentFrame]; +} + +void UpdateCurrentSpriteAnimation(Sprite* sprite, float dt) { + if (!IsAnimated(sprite)) + return; + + Animation* currentAnimation = GetCurrentAnimation(sprite); + + if (currentAnimation->isComplete) + return; + + currentAnimation->currentFrameTimer += dt; + + if (currentAnimation->currentFrameTimer >= GetCurrentFrameTime(currentAnimation)) { + currentAnimation->currentFrame++; + currentAnimation->currentFrameTimer = 0; + } + + if (currentAnimation->currentFrame >= currentAnimation->numFrames) { + if (currentAnimation->isLooping) + currentAnimation->currentFrame = 0; + else { + currentAnimation->currentFrame = currentAnimation->numFrames - 1; + currentAnimation->isComplete = true; + } + } +} -- cgit v1.2.3