From ed933607765a6e010689aaaf85184053ff6e8a2b Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 13 Feb 2021 12:14:58 -0500
Subject: Added non-looping animations

Lucas can get electrocuted now.
---
 src/animation_system.cpp | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/animation_system.cpp')

diff --git a/src/animation_system.cpp b/src/animation_system.cpp
index 997b7f7..3f3f22a 100644
--- a/src/animation_system.cpp
+++ b/src/animation_system.cpp
@@ -65,21 +65,26 @@ void AnimationSystem::initSprite(int spriteId, std::string_view filename) {
   std::string animLine;
   std::getline(datafile, animLine); // blank
   while (std::getline(datafile, animLine)) {
-    std::regex re(R"(([a-z]+)\[([a-z_]+)\]: ([0-9,]+))");
+    std::regex re(R"(([a-z!]+)\[([a-z_]+)\]: ([0-9,]+))");
     std::smatch m;
     std::regex_match(animLine, m, re);
 
-    std::vector<int> frames;
+    std::string animName = m[1];
+    Animation anim;
     auto framestrs = splitStr<std::list<std::string>>(m[3], ",");
     for (const std::string& f : framestrs) {
-      frames.push_back(std::stoi(f));
+      anim.frameIndices.push_back(std::stoi(f));
+    }
+
+    if (animName.back() == '!') {
+      anim.looping = false;
     }
 
     int animId = sprite.animations.size();
-    sprite.animations.push_back(std::move(frames));
+    sprite.animations.push_back(std::move(anim));
 
     Direction dir = directionFromString(std::string(m[2]));
-    sprite.nameDirToAnim[m[1]][dir] = animId;
+    sprite.nameDirToAnim[animName][dir] = animId;
   }
 
   updateAnimation(spriteId);
@@ -89,10 +94,17 @@ void AnimationSystem::tick(double dt) {
   animTimer_.accumulate(dt);
   while (animTimer_.step()) {
     for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
-      if (sprite.isAnimated) {
+      if (sprite.isAnimated && !sprite.animFinished) {
         sprite.animationFrame++;
-        if (sprite.animationFrame >= sprite.animations[sprite.animationId].size()) {
-          sprite.animationFrame = 0;
+        if (sprite.animations[sprite.animationId].looping) {
+          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size()) {
+            sprite.animationFrame = 0;
+          }
+        } else {
+          if (sprite.animationFrame >= sprite.animations[sprite.animationId].frameIndices.size() - 1) {
+            sprite.animationFrame = sprite.animations[sprite.animationId].frameIndices.size() - 1;
+            sprite.animFinished = true;
+          }
         }
       }
     }
@@ -119,4 +131,5 @@ void AnimationSystem::updateAnimation(int spriteId) {
   Sprite& sprite = game_.getSprite(spriteId);
   sprite.animationId = sprite.nameDirToAnim[sprite.animationName][sprite.dir];
   sprite.animationFrame = 0;
+  sprite.animFinished = false;
 }
-- 
cgit 1.4.1