5 files changed, 38 insertions, 2 deletions

@@ -423,6 +423,20 @@ function SetOpacity(spriteName, amount)
   sprite.opacity = amount
 end
 
+--- Fades out the given sprite.
+function FadeOutSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.shouldBeFadedIn = false
+end
+
+--- Fades out the given sprite.
+function FadeInSprite(spriteName)
+  local spriteId = getSpriteByAlias(spriteName)
+  local sprite = getSprite(spriteId)
+  sprite.shouldBeFadedIn = true
+end
+
 --- Sets the enclosure zone for a sprite.
 -- The sprite will be prevented from exiting the area defined by that zone.
 function AddEnclosureZone(spriteName, zone)
@@ -166,6 +166,25 @@ void AnimationSystem::tick(double dt) {
       }
     }
   }
+
+  fadingTimer_.accumulate(dt);
+  while (fadingTimer_.step()) {
+    for (Sprite& sprite : game_.getSprites() | game_.spriteView()) {
+      if (sprite.isAnimated) {
+        if (sprite.shouldBeFadedIn && sprite.opacity < 1.0) {
+          sprite.opacity += 0.05;
+          if (sprite.opacity > 1.0) {
+            sprite.opacity = 1.0;
+          }
+        } else if (!sprite.shouldBeFadedIn && sprite.opacity > 0.0) {
+          sprite.opacity -= 0.05;
+          if (sprite.opacity < 0.0) {
+            sprite.opacity = 0.0;
+          }
+        }
+      }
+    }
+  }
 }
 
 void AnimationSystem::setSpriteDirection(int spriteId, Direction dir) {
@@ -31,6 +31,7 @@ private:
   Game& game_;
   std::vector<Timer> animTimers_ = {{1000/5}, {1000/60}};//30fps * 1000 t/s;;
   Timer bobbingTimer_ {1000/7};
+  Timer fadingTimer_ {1000/60};
 };
 
 #endif /* end of include guard: ANIMATION_SYSTEM_H_CCCC7CB8 */
@@ -56,7 +56,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "behaviourType", &Sprite::behaviourType,
     "followSpriteId", &Sprite::followSpriteId,
     "interactionScript", &Sprite::interactionScript,
-    "opacity", &Sprite::opacity);
+    "opacity", &Sprite::opacity,
+    "shouldBeFadedIn", &Sprite::shouldBeFadedIn);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -100,13 +100,14 @@ public:
   int bobAmount = 0;
   bool bobbingDown = false;
   int animSlowdownProgress = 0;
-  double opacity = 1.0;
 
   // Animation (controls)
   bool normallyHasShadow = false;
   bool animPaused = false;
   bool bobbing = false;
   int animSlowdown = 1; // Animation will only advance every X frames (so, 1 means it's disabled)
+  double opacity = 1.0;
+  bool shouldBeFadedIn = true;
 
   // Character
   bool orientable = false;