Added text boxes

Text now reveals itself and scrolls! Yay! It even plays speaker beeps.

TODO: the arror indicating an A press is needed. Bullets on lines that need bullets. The header that says who the speaker is, if relevant.

18 files changed, 474 insertions, 4 deletions

@@ -37,6 +37,7 @@ add_executable(tanetane
   src/mixer.cpp
   src/game.cpp
   src/map.cpp
+  src/font.cpp
   src/transform_system.cpp
   src/camera_system.cpp
   src/animation_system.cpp
@@ -0,0 +1,96 @@
+../res/font.png
+90 characters
+10 characters per row
+12x12 tile size
+8 baseline
+
+! 1
+" 3
+# 5
+$ 5
+% 9
+& 7
+' 2
+( 3
+) 3
+* 3
++ 5
+, 2
+- 3
+. 1
+/ 4
+0 4
+1 2
+2 4
+3 4
+4 5
+5 4
+6 4
+7 4
+8 4
+9 4
+: 1
+; 2
+< 4
+= 5
+> 4
+? 4
+@ 7
+A 6
+B 5
+C 5
+D 5
+E 4
+F 4
+G 5
+H 5
+I 1
+J 4
+K 5
+L 4
+M 7
+N 5
+O 5
+P 5
+Q 5
+R 5
+S 5
+T 5
+U 5
+V 6
+W 7
+X 5
+Y 5
+Z 4
+[ 2
+~ 6
+] 2
+^ 3
+_ 2
+` 0
+a 5
+b 4
+c 4
+d 4
+e 4
+f 3
+g 4
+h 4
+i 1
+j 2
+k 4
+l 1
+m 7
+n 4
+o 4
+p 4
+q 4
+r 3
+s 4
+t 3
+u 4
+v 5
+w 7
+x 4
+y 4
+z 4
\ No newline at end of file
@@ -10,4 +10,6 @@ const int CANVAS_HEIGHT = 160;
 const int MOVEMENT_SPEED = 2;
 const int PARTY_FRAME_DELAY = 10;// / MOVEMENT_SPEED;
 
+const int MESSAGE_TEXT_WIDTH = 196;
+
 #endif /* end of include guard: CONSTS_H_9561E49C */
@@ -0,0 +1,63 @@
+#include "font.h"
+#include <fstream>
+#include <iostream>
+#include "renderer.h"
+
+inline int charToIndex(char ch) {
+  return static_cast<int>(ch) - static_cast<int>('!');
+}
+
+Font::Font(std::string_view filename, Renderer& renderer) {
+  std::ifstream fontfile(filename.data());
+  if (!fontfile.is_open()) {
+    throw std::invalid_argument("Can't find font file: " + std::string(filename));
+  }
+
+  std::string imagefilename;
+  fontfile >> imagefilename;
+  textureId_ = renderer.loadImageFromFile(imagefilename);
+
+  std::string line;
+  char ch;
+
+  int numChars;
+  fontfile >> numChars;
+  std::getline(fontfile, line); // characters
+
+  fontfile >> columns_;
+  std::getline(fontfile, line); // characters per row
+
+  fontfile >> tileSize_.x();
+  fontfile >> ch; // x
+  fontfile >> tileSize_.y();
+  std::getline(fontfile, line); // tile size
+
+  std::getline(fontfile, line); // ignore the baseline location
+  std::getline(fontfile, line); // blank
+
+  for (int i=0; i<numChars; i++) {
+    fontfile >> ch; // the character
+
+    int width;
+    fontfile >> width;
+
+    widths_.push_back(width);
+  }
+}
+
+vec2i Font::getCharacterLocation(char ch) const {
+  int index = charToIndex(ch);
+  return (vec2i { index % columns_, index / columns_ }) * tileSize_;
+}
+
+vec2i Font::getCharacterSize(char ch) const {
+  int index = charToIndex(ch);
+  return { widths_.at(index), tileSize_.h() };
+}
+
+int Font::getCharacterWidth(char ch) const {
+  if (ch == ' ') {
+    return 3;
+  }
+  return widths_.at(charToIndex(ch));
+}
@@ -0,0 +1,33 @@
+#ifndef FONT_H_C80183A7
+#define FONT_H_C80183A7
+
+#include <string_view>
+#include <vector>
+#include "vector.h"
+
+class Renderer;
+
+class Font {
+public:
+
+  Font(std::string_view filename, Renderer& renderer);
+
+  int getTextureId() const { return textureId_; }
+
+  vec2i getCharacterLocation(char ch) const;
+
+  vec2i getCharacterSize(char ch) const;
+
+  int getCharacterWidth(char ch) const;
+
+  int getCharacterHeight() const { return tileSize_.h(); }
+
+private:
+
+  int textureId_;
+  int columns_;
+  vec2i tileSize_;
+  std::vector<int> widths_;
+};
+
+#endif /* end of include guard: FONT_H_C80183A7 */
@@ -11,10 +11,15 @@
 #include "consts.h"
 #include "system.h"
 #include "mixer.h"
+#include "font.h"
+
+class Renderer;
 
 class Game {
 public:
 
+  explicit Game(Renderer& renderer) : font_("../res/font.txt", renderer) {}
+
   Mixer& getMixer() { return mixer_; }
 
   bool shouldQuit() const { return shouldQuit_; }
@@ -68,6 +73,8 @@ public:
 
   const Map& getMap() const { return *map_; }
 
+  const Font& getFont() const { return font_; }
+
 private:
 
   Mixer mixer_;
@@ -79,6 +86,7 @@ private:
   std::vector<int> spriteIds_;
   std::vector<Sprite> sprites_;
   std::unique_ptr<Map> map_;
+  Font font_;
 };
 
 #endif /* end of include guard: GAME_H_E6F1396E */
@@ -27,11 +27,16 @@ void InputSystem::tick(double dt) {
         }
       } else if (e.key.keysym.sym == SDLK_a) {
         // TODO: Remove this, it's just for testing.
-        if (game_.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0) {
+        /*if (game_.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0) {
           game_.getSystem<MessageSystem>().hideCutsceneBars();
         } else {
           game_.getSystem<MessageSystem>().displayCutsceneBars();
-        }
+        }*/
+        //game_.getSystem<MessageSystem>().displayMessage("Some people always try to avoid fighting when there are enemies around. You know the type, right? They use the dash ability to zoom right by. I guess you could say they're followers of \"peace at any price\".", SpeakerType::Woman);
+        game_.getSystem<MessageSystem>().displayMessage("Go to sleep.\nIn the absolute darkness.\nDon't do aaaanything.\nDon't see anyone.\nJust sleep.\nIt'll be oh, so much fun......!\nOhohohoho!", SpeakerType::Woman);
+      } else if (e.key.keysym.sym == SDLK_b) {
+        // TODO: Remove this, it's just for testing.
+        game_.getSystem<MessageSystem>().advanceText();
       }
     } else if (e.type == SDL_KEYUP && (e.key.keysym.sym == SDLK_LSHIFT || e.key.keysym.sym == SDLK_RSHIFT)) {
       for (int spriteId : game_.getSprites()) {
@@ -4,7 +4,6 @@
 #include "game.h"
 #include "timer.h"
 #include "map.h"
-#include "mixer.h"
 #include "transform_system.h"
 #include "camera_system.h"
 #include "animation_system.h"
@@ -13,7 +12,7 @@
 #include "message_system.h"
 
 void loop(Renderer& renderer) {
-  Game game;
+  Game game(renderer);
   game.emplaceSystem<TransformSystem>();
   game.emplaceSystem<InputSystem>();
   game.emplaceSystem<CharacterSystem>();
@@ -1,4 +1,9 @@
 #include "message_system.h"
+#include "game.h"
+#include "util.h"
+
+const int CHARS_TO_REVEAL = 1;
+const int CHARS_PER_BEEP = 10;
 
 void MessageSystem::tick(double dt) {
   if (barsState_ == BarsState::Opening || barsState_ == BarsState::Closing) {
@@ -11,6 +16,53 @@ void MessageSystem::tick(double dt) {
         barsState_ = BarsState::Closed;
       }
     }
+  } else if (barsState_ == BarsState::Open) {
+    if (!linesToShow_.empty()) {
+      textAdvTimer_.accumulate(dt);
+      while (textAdvTimer_.step()) {
+        // Try to advance text on the first line that isn't totally revealed yet.
+        bool advancedChars = false;
+        for (MessageLine& line : linesToShow_) {
+          if (line.charsRevealed < line.text.size()) {
+            // Every so often play a beep.
+            if (line.charsRevealed % CHARS_PER_BEEP == 0) {
+              if (speaker_ == SpeakerType::Man) {
+                game_.getMixer().playSound("../res/speaking_man.wav");
+              } else if (speaker_ == SpeakerType::Woman) {
+                game_.getMixer().playSound("../res/speaking_woman.wav");
+              } else if (speaker_ == SpeakerType::Boy) {
+                game_.getMixer().playSound("../res/speaking_boy.wav");
+              } else if (speaker_ == SpeakerType::Girl) {
+                game_.getMixer().playSound("../res/speaking_girl.wav");
+              } else if (speaker_ == SpeakerType::Nonhuman) {
+                game_.getMixer().playSound("../res/speaking_nonhuman.wav");
+              }
+            }
+
+            line.charsRevealed += CHARS_TO_REVEAL;
+            if (line.charsRevealed > line.text.size()) {
+              line.charsRevealed = line.text.size();
+            }
+            advancedChars = true;
+            break;
+          }
+        }
+
+        if (!advancedChars) {
+          // If both lines are totally revealed, see if we can scroll up a line.
+          // This is doable as long as the next line isn't the sentinel value that
+          // means an A press is required.
+          if (!lines_.empty() && lines_.front() != "\n") {
+            if (linesToShow_.size() == 2) {
+              linesToShow_.pop_front();
+            }
+
+            linesToShow_.push_back(MessageLine { .text = lines_.front() });
+            lines_.pop_front();
+          }
+        }
+      }
+    }
   }
 }
 
@@ -24,6 +76,107 @@ void MessageSystem::hideCutsceneBars() {
   barsState_ = BarsState::Closing;
 }
 
+void MessageSystem::displayMessage(std::string_view msg, SpeakerType speaker) {
+  if (!(barsState_ == BarsState::Opening || barsState_ == BarsState::Open)) {
+    displayCutsceneBars();
+  }
+
+  speaker_ = speaker;
+
+  auto lineChunks = splitStr<std::list<std::string>>(std::string(msg), "\n");
+  for (const std::string& text : lineChunks) {
+    auto words = splitStr<std::list<std::string>>(text, " ");
+
+    std::string curLine;
+    int curWidth = 0;
+    bool firstWord = true;
+    bool shouldAddBlank = false;
+
+    // I'm gonna be frank and admit it: I'm not gonna take hyphenation into
+    // consideration. Please don't write any words that are wider than the
+    // textbox.
+    for (const std::string& word : words) {
+      int wordWidth = 0;
+      bool firstChar = true;
+      for (int i=0; i<word.size(); i++) {
+        if (firstChar) {
+          firstChar = false;
+        } else {
+          wordWidth++;
+        }
+
+        wordWidth += game_.getFont().getCharacterWidth(word[i]);
+      }
+
+      int nextWidth = curWidth + wordWidth;
+      if (!firstWord) {
+        nextWidth += game_.getFont().getCharacterWidth(' ');
+      }
+
+      if (nextWidth > MESSAGE_TEXT_WIDTH) {
+        lines_.push_back(curLine);
+        curLine = word;
+        curWidth = wordWidth + game_.getFont().getCharacterWidth(' ');
+
+        if (shouldAddBlank) {
+          shouldAddBlank = false;
+          lines_.push_back("\n");
+        } else {
+          shouldAddBlank = true;
+        }
+      } else {
+        curWidth = nextWidth;
+        if (!firstWord) {
+          curLine.append(" ");
+        }
+        curLine.append(word);
+      }
+
+      firstWord = false;
+    }
+
+    lines_.push_back(curLine);
+    lines_.push_back("\n");
+  }
+
+  if (linesToShow_.empty()) {
+    linesToShow_.push_back(MessageLine { .text = lines_.front() });
+    lines_.pop_front();
+
+    if (lines_.front() != "\n") {
+      linesToShow_.push_back(MessageLine { .text = lines_.front() });
+      lines_.pop_front();
+    }
+  }
+}
+
+void MessageSystem::advanceText() {
+  if (barsState_ != BarsState::Open) {
+    return;
+  }
+
+  for (const MessageLine& line : linesToShow_) {
+    if (line.charsRevealed != line.text.size()) {
+      return;
+    }
+  }
+
+  if (lines_.empty()) {
+    linesToShow_.clear();
+    return;
+  }
+
+  if (lines_.front() != "\n") {
+    return;
+  }
+
+  lines_.pop_front();
+
+  if (lines_.empty()) {
+    linesToShow_.clear();
+  }
+}
+
 double MessageSystem::getCutsceneBarsProgress() const {
   switch (barsState_) {
     case BarsState::Closed: return 0.0;
@@ -1,10 +1,23 @@
 #ifndef MESSAGE_SYSTEM_H_DE10D011
 #define MESSAGE_SYSTEM_H_DE10D011
 
+#include <list>
+#include <string_view>
+#include <string>
 #include "system.h"
+#include "timer.h"
 
 class Game;
 
+enum class SpeakerType {
+  None,
+  Man,
+  Woman,
+  Boy,
+  Girl,
+  Nonhuman
+};
+
 class MessageSystem : public System {
 public:
 
@@ -20,10 +33,21 @@ public:
 
   void hideCutsceneBars();
 
+  void displayMessage(std::string_view msg, SpeakerType speaker);
+
+  void advanceText();
+
   // Info
 
   double getCutsceneBarsProgress() const;
 
+  struct MessageLine {
+    std::string text;
+    int charsRevealed = 0;
+  };
+
+  const std::list<MessageLine>& getLines() const { return linesToShow_; }
+
 private:
 
   enum class BarsState {
@@ -37,6 +61,10 @@ private:
   BarsState barsState_ = BarsState::Closed;
   double accum_ = 0.0;
   double length_ = 1000.0/8;
+  SpeakerType speaker_ = SpeakerType::None;
+  std::list<std::string> lines_;
+  std::list<MessageLine> linesToShow_;
+  Timer textAdvTimer_ { 10 };
 };
 
 #endif /* end of include guard: MESSAGE_SYSTEM_H_DE10D011 */
@@ -1,4 +1,5 @@
 #include "renderer.h"
+#include <iostream>
 #include "consts.h"
 #include "game.h"
 #include "map.h"
@@ -153,6 +154,33 @@ void Renderer::render(Game& game) {
     int bottomBarHeight = 36.0 * game.getSystem<MessageSystem>().getCutsceneBarsProgress();
     SDL_Rect bottomBar { 0, CANVAS_HEIGHT - bottomBarHeight, CANVAS_WIDTH, bottomBarHeight };
     SDL_RenderFillRect(ren_.get(), &bottomBar);
+
+    if (game.getSystem<MessageSystem>().getCutsceneBarsProgress() == 1.0 &&
+        !game.getSystem<MessageSystem>().getLines().empty()) {
+      int lineIndex = 0;
+      for (const MessageSystem::MessageLine& line : game.getSystem<MessageSystem>().getLines()) {
+        if (messageLines_[lineIndex].line != line.text) {
+          renderMessageLine(lineIndex, line.text, game);
+        }
+
+        // 18x, 127y1, 143y2
+        if (line.charsRevealed > 0) {
+          SDL_Rect srcRect {
+            0, 0, messageLines_[lineIndex].charIndexToWidth[line.charsRevealed],
+            game.getFont().getCharacterHeight()
+          };
+          SDL_Rect destRect {
+            18,
+            127 + 16 * lineIndex,
+            srcRect.w,
+            srcRect.h };
+
+          SDL_RenderCopy(ren_.get(), messageLines_[lineIndex].renderedTex.get(), &srcRect, &destRect);
+        }
+
+        lineIndex++;
+      }
+    }
   }
 
   SDL_SetRenderTarget(ren_.get(), nullptr);
@@ -175,3 +203,46 @@ int Renderer::loadImageFromFile(std::string_view filename) {
 
   return texId;
 }
+
+void Renderer::renderMessageLine(int lineIndex, const std::string& text, Game& game) {
+  MessageCache& line = messageLines_[lineIndex];
+  line.line = text;
+
+  line.renderedTex.reset(
+    SDL_CreateTexture(
+      ren_.get(),
+      SDL_PIXELFORMAT_RGBA8888,
+      SDL_TEXTUREACCESS_TARGET,
+      MESSAGE_TEXT_WIDTH,
+      game.getFont().getCharacterHeight()));
+
+  SDL_SetTextureBlendMode(line.renderedTex.get(), SDL_BLENDMODE_BLEND);
+
+  SDL_SetRenderTarget(ren_.get(), line.renderedTex.get());
+  SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_BLEND);
+  SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, 0);
+  SDL_RenderClear(ren_.get());
+
+  line.charIndexToWidth.clear();
+  line.charIndexToWidth.push_back(0);
+
+  int length = 0;
+
+  for (int i=0; i<line.line.size(); i++) {
+    if (line.line[i] != ' ') {
+      vec2i charLoc = game.getFont().getCharacterLocation(line.line[i]);
+      vec2i charSize = game.getFont().getCharacterSize(line.line[i]);
+      SDL_Rect srcRect { charLoc.x(), charLoc.y(), charSize.w(), charSize.h() };
+      SDL_Rect destRect { length, 0, charSize.w(), charSize.h() };
+
+      SDL_RenderCopy(ren_.get(), textures_.at(game.getFont().getTextureId()).get(), &srcRect, &destRect);
+
+      length++;
+    }
+
+    length += game.getFont().getCharacterWidth(line.line[i]);
+    line.charIndexToWidth.push_back(length);
+  }
+
+  line.charIndexToWidth.back()--;
+}
@@ -6,6 +6,7 @@
 #include <stdexcept>
 #include <memory>
 #include <string_view>
+#include <string>
 #include <vector>
 
 class Game;
@@ -124,6 +125,8 @@ private:
 
   texture_ptr renderMapLayer(const Map& map, int layer);
 
+  void renderMessageLine(int lineIndex, const std::string& text, Game& game);
+
   sdl_wrapper sdl_;
   img_wrapper img_;
   window_ptr win_;
@@ -132,6 +135,14 @@ private:
   std::vector<texture_ptr> textures_;
   texture_ptr renLay0_;
   texture_ptr renLay1_;
+
+  struct MessageCache {
+    texture_ptr renderedTex;
+    std::vector<int> charIndexToWidth;
+    std::string line;
+  };
+
+  MessageCache messageLines_[2];
 };
 
 #endif /* end of include guard: RENDERER_H_6A58EC30 */