Work on animation subsystem

- Also incomplete refactor of inline functions

3 files changed, 75 insertions, 14 deletions

diff --git a/include/constants.h b/include/constants.h
index 870c7fb..2fd6ace 100644
--- a/include/constants.h
+++ b/include/constants.h
@@ -9,3 +9,6 @@
 #define MAX_SPRITE_COUNT 4 //Maximum number of sprites per entity
 
 #define NO_OFFSET 0
+
+#define MAX_FRAMES 30
+#define MAX_ANIMATIONS 20
diff --git a/include/game.h b/include/game.h
index e54afd3..530ae73 100644
--- a/include/game.h
+++ b/include/game.h
@@ -21,10 +21,25 @@ typedef enum DrawLayer {
     Foreground_Layer = 1
 } DrawLayer;
 
+typedef struct Animation {
+    int numFrames;
+    bool isLooping;
+    bool isComplete;
+    Rectangle srcRects[MAX_FRAMES];
+    float frameTimes[MAX_FRAMES];
+
+    int currentFrame;
+    float currentFrameTimer;
+} Animation;
+
 typedef struct Sprite {
     Texture2D texture;
     DrawLayer layer;
     Rectangle destRect; //Destination rectangle relative to player position
+
+    int numAnimations; //Zero for static spritesx
+    Animation animations[MAX_ANIMATIONS];
+    int currentAnimation;
 } Sprite;
 
 typedef struct Entity {
@@ -69,20 +84,8 @@ void InitGame();
 void UpdateGame(float deltaTime);
 void DrawGame();
 
-static inline bool EntityAllocated(const Entity* e) {
-    return (e->flags & ENTITY_ALLOCATED);
-}
-
-static inline bool SameEntity(const Entity* a, const Entity* b) {
-    return a->id == b->id;
-}
-
-static inline void AddSpriteToEntity(Entity* e, Sprite s) {
-    if (e->numSprites < MAX_SPRITE_COUNT) {
-        e->sprites[e->numSprites++] = s;
-    }
-}
-
+void UpdateCurrentSpriteAnimation(Sprite* sprite, float dt);
+void DrawEntitySprite(const Sprite* sprite, int spriteIndex);
 
 #ifdef BEATEMUP_DEBUG
 void DebugHighlights(const Entity* e);
diff --git a/include/utils.h b/include/utils.h
new file mode 100644
index 0000000..59c1bc4
--- /dev/null
+++ b/include/utils.h
@@ -0,0 +1,55 @@
+#ifndef UTILS_H_
+#define UTILS_H_
+
+#include <stdbool.h>
+#include "game.h"
+
+static inline bool EntityAllocated(const Entity* e) {
+    return (e->flags & ENTITY_ALLOCATED);
+}
+
+static inline bool PhysicsEnabled(const Entity* e) {
+    return EntityAllocated(e) && (e->flags & ENTITY_PHYSICS_ACTIVE);
+}
+
+static inline bool SameEntity(const Entity* a, const Entity* b) {
+    return a->id == b->id;
+}
+
+static inline void AddSpriteToEntity(Entity* e, Sprite s) {
+    if (e->numSprites < MAX_SPRITE_COUNT) {
+        e->sprites[e->numSprites++] = s;
+    }
+}
+
+static inline bool IsAnimated(const Sprite* s) {
+  return s->numAnimations > 0;
+}
+
+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;
+}
+
+static inline Rectangle GetPhysicsColliderGlobal(const Entity* e) {
+    Rectangle physicsColliderGlobal = e->physicsCollider;
+    physicsColliderGlobal.x += e->position.x;
+    physicsColliderGlobal.y += e->position.y;
+
+    return physicsColliderGlobal;
+}
+
+static inline Animation* GetCurrentAnimation(Sprite* s) {
+    return &s->animations[s->currentAnimation];
+}
+
+#endif // UTILS_H_