From be09120d1d044b476ef8b516efbdb526f20d9e2d Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Wed, 3 Feb 2021 01:35:58 -0500
Subject: Added animation system

---
 src/main.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index a092114..ea27511 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,26 +8,34 @@
 #include "mixer.h"
 #include "transform_system.h"
 #include "camera_system.h"
+#include "animation_system.h"
 
 void loop(Renderer& renderer, Mixer& mixer) {
   Game game;
   game.emplaceSystem<TransformSystem>();
   game.emplaceSystem<CameraSystem>();
+  game.emplaceSystem<AnimationSystem>();
 
   Input keystate;
 
   auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
   game.setMap(std::move(map));
 
-  int lucasSprite = game.addSprite(Sprite("../res/lucas_anim.txt", renderer));
-  int kumaSprite = game.addSprite(Sprite("../res/kuma_anim.txt", renderer));
-  int dusterSprite = game.addSprite(Sprite("../res/duster_anim.txt", renderer));
-  int boneySprite = game.addSprite(Sprite("../res/boney_anim.txt", renderer));
-
+  int lucasSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
+  game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/lucas_anim.txt", renderer);
+
+  int kumaSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
+  game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/kuma_anim.txt", renderer);
+
+  int dusterSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
+  game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/duster_anim.txt", renderer);
+
+  int boneySprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
+  game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/boney_anim.txt", renderer);
 
   Party party;
   party.addMember(game, lucasSprite);
@@ -41,7 +49,6 @@ void loop(Renderer& renderer, Mixer& mixer) {
   renderer.render(game);
 
   Timer inputTimer(33);
-  Timer animTimer(1000/5);//30fps * 1000 t/s;
 
   size_t lastTime = SDL_GetTicks();
 
@@ -72,11 +79,6 @@ void loop(Renderer& renderer, Mixer& mixer) {
       party.move(game, mixer, keystate);
     }
 
-    animTimer.accumulate(frameTime);
-    while (animTimer.step()) {
-      game.tickSpriteAnim();
-    }
-
     for (System& system : game.systems()) {
       system.tick(frameTime);
     }
-- 
cgit 1.4.1