Added cutscene bars (and resized game)

8 files changed, 128 insertions, 10 deletions

@@ -42,6 +42,7 @@ add_executable(tanetane
   src/animation_system.cpp
   src/character_system.cpp
   src/input_system.cpp
+  src/message_system.cpp
 )
 
 set_property(TARGET tanetane PROPERTY CXX_STANDARD 17)
@@ -1,11 +1,11 @@
 #ifndef CONSTS_H_9561E49C
 #define CONSTS_H_9561E49C
 
-const int GAME_WIDTH = 640;
+const int GAME_WIDTH = 720;
 const int GAME_HEIGHT = 480;
 
-const int CANVAS_WIDTH = 320;
-const int CANVAS_HEIGHT = 240;
+const int CANVAS_WIDTH = 240;
+const int CANVAS_HEIGHT = 160;
 
 const int MOVEMENT_SPEED = 2;
 const int PARTY_FRAME_DELAY = 10;// / MOVEMENT_SPEED;
@@ -1,6 +1,7 @@
 #include "input_system.h"
 #include "game.h"
 #include "character_system.h"
+#include "message_system.h"
 
 struct Input {
   bool left = false;
@@ -16,11 +17,20 @@ void InputSystem::tick(double dt) {
       game_.quit();
 
       return;
-    } else if (e.type == SDL_KEYDOWN && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
-      for (int spriteId : game_.getSprites()) {
-        Sprite& sprite = game_.getSprite(spriteId);
-        if (sprite.controllable) {
-          game_.getSystem<CharacterSystem>().beginCrouch(spriteId);
+    } else if (e.type == SDL_KEYDOWN) {
+      if (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT) {
+        for (int spriteId : game_.getSprites()) {
+          Sprite& sprite = game_.getSprite(spriteId);
+          if (sprite.controllable) {
+            game_.getSystem<CharacterSystem>().beginCrouch(spriteId);
+          }
+        }
+      } else if (e.key.keysym.sym == SDLK_a) {
+        // TODO: Remove this, it's just for testing.
+        if (game_.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0) {
+          game_.getSystem<MessageSystem>().hideCutsceneBars();
+        } else {
+          game_.getSystem<MessageSystem>().displayCutsceneBars();
         }
       }
     } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
@@ -10,6 +10,7 @@
 #include "animation_system.h"
 #include "character_system.h"
 #include "input_system.h"
+#include "message_system.h"
 
 void loop(Renderer& renderer) {
   Game game;
@@ -18,6 +19,7 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<CharacterSystem>();
   game.emplaceSystem<AnimationSystem>();
   game.emplaceSystem<CameraSystem>();
+  game.emplaceSystem<MessageSystem>();
 
   auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
   game.setMap(std::move(map));
@@ -0,0 +1,34 @@
+#include "message_system.h"
+
+void MessageSystem::tick(double dt) {
+  if (barsState_ == BarsState::Opening || barsState_ == BarsState::Closing) {
+    accum_ += dt;
+
+    if (accum_ >= length_) {
+      if (barsState_ == BarsState::Opening) {
+        barsState_ = BarsState::Open;
+      } else {
+        barsState_ = BarsState::Closed;
+      }
+    }
+  }
+}
+
+void MessageSystem::displayCutsceneBars() {
+  accum_ = 0.0;
+  barsState_ = BarsState::Opening;
+}
+
+void MessageSystem::hideCutsceneBars() {
+  accum_ = 0.0;
+  barsState_ = BarsState::Closing;
+}
+
+double MessageSystem::getCutsceneBarsProgress() const {
+  switch (barsState_) {
+    case BarsState::Closed: return 0.0;
+    case BarsState::Opening: return accum_ / length_;
+    case BarsState::Open: return 1.0;
+    case BarsState::Closing: return 1.0 - (accum_ / length_);
+  }
+}
@@ -0,0 +1,42 @@
+#ifndef MESSAGE_SYSTEM_H_DE10D011
+#define MESSAGE_SYSTEM_H_DE10D011
+
+#include "system.h"
+
+class Game;
+
+class MessageSystem : public System {
+public:
+
+  static constexpr SystemKey Key = SystemKey::Message;
+
+  MessageSystem(Game& game) : game_(game) {}
+
+  void tick(double dt) override;
+
+  // Commands
+
+  void displayCutsceneBars();
+
+  void hideCutsceneBars();
+
+  // Info
+
+  double getCutsceneBarsProgress() const;
+
+private:
+
+  enum class BarsState {
+    Closed,
+    Opening,
+    Open,
+    Closing
+  };
+
+  Game& game_;
+  BarsState barsState_ = BarsState::Closed;
+  double accum_ = 0.0;
+  double length_ = 1000.0/8;
+};
+
+#endif /* end of include guard: MESSAGE_SYSTEM_H_DE10D011 */
@@ -4,6 +4,7 @@
 #include "map.h"
 #include "transform_system.h"
 #include "camera_system.h"
+#include "message_system.h"
 
 Renderer::Renderer() {
   win_ = window_ptr(
@@ -127,8 +128,35 @@ void Renderer::render(Game& game) {
     game.getSystem<CameraSystem>().getFieldOfView().h()
   };
 
-  SDL_SetRenderTarget(ren_.get(), nullptr);
+  texture_ptr cameraTex(
+    SDL_CreateTexture(
+      ren_.get(),
+      SDL_PIXELFORMAT_RGBA8888,
+      SDL_TEXTUREACCESS_TARGET,
+      CANVAS_WIDTH,
+      CANVAS_HEIGHT));
+
+  if (!cameraTex) {
+    throw sdl_error();
+  }
+
+  SDL_SetRenderTarget(ren_.get(), cameraTex.get());
   SDL_RenderCopy(ren_.get(), canvas.get(), &cameraField, nullptr);
+
+  if (game.getSystem<MessageSystem>().getCutsceneBarsProgress() > 0) {
+    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 255);
+
+    int topBarHeight = 16.0 * game.getSystem<MessageSystem>().getCutsceneBarsProgress();
+    SDL_Rect topBar { 0, 0, CANVAS_WIDTH, topBarHeight };
+    SDL_RenderFillRect(ren_.get(), &topBar);
+
+    int bottomBarHeight = 36.0 * game.getSystem<MessageSystem>().getCutsceneBarsProgress();
+    SDL_Rect bottomBar { 0, CANVAS_HEIGHT - bottomBarHeight, CANVAS_WIDTH, bottomBarHeight };
+    SDL_RenderFillRect(ren_.get(), &bottomBar);
+  }
+
+  SDL_SetRenderTarget(ren_.get(), nullptr);
+  SDL_RenderCopy(ren_.get(), cameraTex.get(), nullptr, nullptr);
   SDL_RenderPresent(ren_.get());
 }
 
@@ -6,7 +6,8 @@ enum class SystemKey {
   Input,
   Character,
   Animation,
-  Camera
+  Camera,
+  Message
 };
 
 class System {