11 files changed, 190 insertions, 25 deletions

@@ -51,6 +51,7 @@ add_executable(tanetane
   src/input_system.cpp
   src/message_system.cpp
   src/script_system.cpp
+  src/effect_system.cpp
 )
 
 set_property(TARGET tanetane PROPERTY CXX_STANDARD 17)
@@ -41,6 +41,7 @@ function StartCutscene()
   local playerSprite = getSprite(playerId)
   playerSprite.controllable = false
   character():halt(playerId)
+  message():displayCutsceneBars()
 end
 
 function DisplayMessage(msg, name, type)
@@ -107,21 +108,27 @@ function StopSound(soundId)
 end
 
 function FadeToBlack(length)
-  local progress = 0.0
-  while progress < length do
-    progress = progress + coroutine.yield()
-    setFadeoutProgress(progress / length)
-  end
-  setFadeoutProgress(1.0)
+  effect():fadeScreen(length, 1.0)
+  repeat
+    coroutine.yield()
+  until effect():isScreenFadeComplete()
 end
 
 function RemoveFadeout(length)
-  local progress = length
-  while progress > 0 do
-    progress = progress - coroutine.yield()
-    setFadeoutProgress(progress / length)
+  effect():fadeScreen(length, 0.0)
+  repeat
+    coroutine.yield()
+  until effect():isScreenFadeComplete()
+end
+
+function FadeMap(length, amount)
+  effect():fadeMap(length, amount)
+end
+
+function WaitForMapFade()
+  while not effect():isMapFadeComplete() do
+    coroutine.yield()
   end
-  setFadeoutProgress(0.0)
 end
 
 function SetPartyDirection(spriteId, direction)
@@ -26,6 +26,9 @@ end
 
 function map2.mailbox_lightning()
   StartCutscene()
+  FadeMap(500, 0.5)
+  WaitForMapFade()
+
   DisplayMessage("* ...?", "", SpeakerType.NONE)
   WaitForEndOfMessage()
 
@@ -44,6 +47,9 @@ function map2.mailbox_lightning()
   SetAnimation("lucas", "lightning_collapse!")
   WaitForAnimation("lucas")
 
+  FadeMap(500, 0.0)
+  WaitForMapFade()
+
   DisplayMessage("* It was lightning.\n\fAh.", "", SpeakerType.NONE)
   WaitForEndOfMessage()
   HideCutsceneBars()
@@ -0,0 +1,35 @@
+#include "effect_system.h"
+
+void EffectSystem::tick(double dt) {
+  if (screenFade_ != screenFadeDest_) {
+    screenFadeThus_ += dt;
+    if (screenFadeThus_ >= screenFadeLength_) {
+      screenFadeThus_ = screenFadeLength_;
+    }
+
+    screenFade_ = (screenFadeDest_ - screenFadeStart_) / screenFadeLength_ * screenFadeThus_ + screenFadeStart_;
+  }
+
+  if (mapFade_ != mapFadeDest_) {
+    mapFadeThus_ += dt;
+    if (mapFadeThus_ >= mapFadeLength_) {
+      mapFadeThus_ = mapFadeLength_;
+    }
+
+    mapFade_ = (mapFadeDest_ - mapFadeStart_) / mapFadeLength_ * mapFadeThus_ + mapFadeStart_;
+  }
+}
+
+void EffectSystem::fadeScreen(int length, double amount) {
+  screenFadeStart_ = screenFade_;
+  screenFadeDest_ = amount;
+  screenFadeLength_ = length;
+  screenFadeThus_ = 0;
+}
+
+void EffectSystem::fadeMap(int length, double amount) {
+  mapFadeStart_ = mapFade_;
+  mapFadeDest_ = amount;
+  mapFadeLength_ = length;
+  mapFadeThus_ = 0;
+}
@@ -0,0 +1,60 @@
+#ifndef EFFECT_SYSTEM_H_0B497B39
+#define EFFECT_SYSTEM_H_0B497B39
+
+#include "system.h"
+
+class Game;
+
+class EffectSystem : public System {
+public:
+
+  static constexpr SystemKey Key = SystemKey::Effect;
+
+  explicit EffectSystem(Game& game) : game_(game) {}
+
+  void tick(double dt) override;
+
+  /* Commands */
+
+  // Fades the entire screen in or out
+  // - length is in milliseconds
+  // - amount is [0,1]
+  void fadeScreen(int length, double amount);
+
+  // Fades just the map, leaving the sprites, messages, etc unfaded.
+  // - length is in milliseconds
+  // - amount is [0,1]
+  void fadeMap(int length, double amount);
+
+  /* Information */
+
+  bool isScreenFaded() const { return screenFade_ > 0.0; }
+
+  double getScreenFadeProgress() const { return screenFade_; }
+
+  bool isScreenFadeComplete() const { return screenFade_ == screenFadeDest_; }
+
+  bool isMapFaded() const { return mapFade_ > 0.0; }
+
+  double getMapFadeProgress() const { return mapFade_; }
+
+  bool isMapFadeComplete() const { return mapFade_ == mapFadeDest_; }
+
+private:
+
+  Game& game_;
+
+  double screenFade_ = 0.0;
+  double screenFadeDest_ = 0.0;
+  double screenFadeStart_ = 0.0;
+  double screenFadeLength_ = 0;
+  double screenFadeThus_ = 0;
+
+  double mapFade_ = 0.0;
+  double mapFadeDest_ = 0.0;
+  double mapFadeStart_ = 0.0;
+  double mapFadeLength_ = 0.0;
+  double mapFadeThus_ = 0.0;
+};
+
+#endif /* end of include guard: EFFECT_SYSTEM_H_0B497B39 */
@@ -82,10 +82,6 @@ public:
 
   const Font& getFont() const { return font_; }
 
-  double getFadeoutProgress() const { return fadeout_; }
-
-  void setFadeoutProgress(double val) { fadeout_ = val; }
-
 private:
 
   void clearSprites();
@@ -101,7 +97,6 @@ private:
   std::map<std::string, int> spritesByAlias_;
   std::unique_ptr<Map> map_;
   Font font_;
-  double fadeout_ = 0.0;
 };
 
 #endif /* end of include guard: GAME_H_E6F1396E */
@@ -11,6 +11,7 @@
 #include "input_system.h"
 #include "message_system.h"
 #include "script_system.h"
+#include "effect_system.h"
 
 void loop(Renderer& renderer) {
   Game game(renderer);
@@ -21,6 +22,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<AnimationSystem>();
   game.emplaceSystem<CameraSystem>();
   game.emplaceSystem<MessageSystem>();
+  game.emplaceSystem<EffectSystem>();
 
   game.loadMap("map2", "debugWarp_mailboxes", Direction::down);
   game.getSprite(game.getSpriteByAlias("lucas")).controllable = true;
@@ -6,6 +6,7 @@
 #include "transform_system.h"
 #include "camera_system.h"
 #include "message_system.h"
+#include "effect_system.h"
 
 Renderer::Renderer() {
   win_ = window_ptr(
@@ -110,10 +111,22 @@ void Renderer::renderSprite(const Sprite& sprite) {
 }
 
 void Renderer::render(Game& game) {
+  auto& effects = game.getSystem<EffectSystem>();
+
   if (cachedMapName_ != game.getMap().getName()) {
     cachedMapName_ = game.getMap().getName();
     renLay1_ = renderMapLayer(game.getMap(), 0);
     renLay0_ = renderMapLayer(game.getMap(), 1);
+
+    vec2i mapBounds = game.getMap().getMapSize() * game.getMap().getTileSize();
+    mapSwapTex_.reset(SDL_CreateTexture(
+      ren_.get(),
+      SDL_PIXELFORMAT_RGBA8888,
+      SDL_TEXTUREACCESS_TARGET,
+      mapBounds.w(),
+      mapBounds.h()));
+
+    SDL_SetTextureBlendMode(mapSwapTex_.get(), SDL_BLENDMODE_BLEND);
   }
 
   vec2i mapBounds = game.getMap().getMapSize() * game.getMap().getTileSize();
@@ -135,14 +148,48 @@ void Renderer::render(Game& game) {
   SDL_SetRenderDrawColor(ren_.get(), 255, 255, 255, 255);
   SDL_RenderClear(ren_.get());
 
+  // Render lower map layer
   SDL_RenderCopy(ren_.get(), renLay1_.get(), nullptr, nullptr);
 
+  if (effects.isMapFaded()) {
+    SDL_SetRenderTarget(ren_.get(), mapSwapTex_.get());
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 0);
+    SDL_RenderClear(ren_.get());
+    SDL_RenderCopy(ren_.get(), renLay1_.get(), nullptr, nullptr);
+
+    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_MOD);
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 255);
+    SDL_RenderFillRect(ren_.get(), nullptr);
+
+    SDL_SetRenderTarget(ren_.get(), canvas.get());
+    SDL_SetTextureAlphaMod(mapSwapTex_.get(), effects.getMapFadeProgress() * 255);
+    SDL_RenderCopy(ren_.get(), mapSwapTex_.get(), nullptr, nullptr);
+  }
+
+  // Render normal sprite layer
   for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY(SpriteLayer::Normal) | game.spriteView()) {
     renderSprite(sprite);
   }
 
+  // Render upper map layer
   SDL_RenderCopy(ren_.get(), renLay0_.get(), nullptr, nullptr);
 
+  if (effects.isMapFaded()) {
+    SDL_SetRenderTarget(ren_.get(), mapSwapTex_.get());
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 0);
+    SDL_RenderClear(ren_.get());
+    SDL_RenderCopy(ren_.get(), renLay0_.get(), nullptr, nullptr);
+
+    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_MOD);
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 255);
+    SDL_RenderFillRect(ren_.get(), nullptr);
+
+    SDL_SetRenderTarget(ren_.get(), canvas.get());
+    SDL_SetTextureAlphaMod(mapSwapTex_.get(), effects.getMapFadeProgress() * 255);
+    SDL_RenderCopy(ren_.get(), mapSwapTex_.get(), nullptr, nullptr);
+  }
+
+  // Render above sprite layer
   for (const Sprite& sprite : game.getSystem<TransformSystem>().getSpritesByY(SpriteLayer::Above) | game.spriteView()) {
     renderSprite(sprite);
   }
@@ -170,6 +217,7 @@ void Renderer::render(Game& game) {
   SDL_RenderCopy(ren_.get(), canvas.get(), &cameraField, nullptr);
 
   if (game.getSystem<MessageSystem>().getCutsceneBarsProgress() > 0) {
+    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_NONE);
     SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 255);
 
     int topBarHeight = 16.0 * game.getSystem<MessageSystem>().getCutsceneBarsProgress();
@@ -277,9 +325,9 @@ void Renderer::render(Game& game) {
     }
   }
 
-  if (game.getFadeoutProgress() > 0.0) {
+  if (effects.isScreenFaded()) {
     SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_BLEND);
-    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, game.getFadeoutProgress() * 255);
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, effects.getScreenFadeProgress() * 255);
     SDL_RenderFillRect(ren_.get(), nullptr);
   }
 
@@ -145,6 +145,7 @@ private:
   texture_ptr tilesetTex_;
   texture_ptr renLay0_;
   texture_ptr renLay1_;
+  texture_ptr mapSwapTex_;
 
   // Text rendering
   struct MessageCache {
@@ -5,6 +5,7 @@
 #include "animation_system.h"
 #include "character_system.h"
 #include "transform_system.h"
+#include "effect_system.h"
 #include "vector.h"
 
 ScriptSystem::ScriptSystem(Game& game) : game_(game) {
@@ -31,6 +32,7 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "message",
     "displayMessage", &MessageSystem::displayMessage,
     "showChoice", &MessageSystem::showChoice,
+    "displayCutsceneBars", &MessageSystem::displayCutsceneBars,
     "hideCutsceneBars", &MessageSystem::hideCutsceneBars,
     "isMessageActive", sol::property(&MessageSystem::isMessageActive),
     "getChoiceSelection", &MessageSystem::getChoiceSelection);
@@ -52,6 +54,13 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       transform.initSprite(spriteId, vec2i{x, y}, layer);
     });
 
+  engine_.new_usertype<EffectSystem>(
+    "effect",
+    "fadeScreen", &EffectSystem::fadeScreen,
+    "isScreenFadeComplete", &EffectSystem::isScreenFadeComplete,
+    "fadeMap", &EffectSystem::fadeMap,
+    "isMapFadeComplete", &EffectSystem::isMapFadeComplete);
+
   engine_.new_usertype<Mixer>(
     "mixer",
     "playSound", &Mixer::playSound,
@@ -83,6 +92,12 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
+    "effect",
+    [&] () -> EffectSystem& {
+      return game_.getSystem<EffectSystem>();
+    });
+
+  engine_.set_function(
     "mixer",
     [&] () -> Mixer& {
       return game_.getMixer();
@@ -130,12 +145,6 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       game_.loadMap(filename, warpPoint, dir);
     });
 
-  engine_.set_function(
-    "setFadeoutProgress",
-    [&] (double val) {
-      game_.setFadeoutProgress(val);
-    });
-
   engine_.script_file("../res/scripts/common.lua");
 }
 
@@ -2,13 +2,14 @@
 #define SYSTEM_H_6B40E1B9
 
 enum class SystemKey {
+  Script,
   Transform,
   Input,
   Character,
   Animation,
   Camera,
   Message,
-  Script
+  Effect
 };
 
 class System {