fancier textboxes

7 files changed, 44 insertions, 10 deletions

@@ -121,6 +121,8 @@ void Renderer::loadAllTextures() {
   loadTextureFromFile("read_instruction.png", readInstruction_);
   loadTextureFromFile("menu.png", menuBg_);
   loadTextureFromFile("help.png", help_);
+  loadTextureFromFile("message.png", messageBg_);
+  loadTextureFromFile("feather.png", feather_);
 
   loadTextureFromFile("title0.png", titles_[0]);
   SDL_QueryTexture(titles_[0].get(), nullptr, nullptr, &titleWidths_[0], &titleHeights_[0]);
@@ -455,16 +457,8 @@ void Renderer::renderGame(
       opacity = game.sign.signDisplayFade.getProgress(255, 0);
     }
 
-    SDL_Rect signRect {
-      0,
-      GAME_HEIGHT / 2 - (45 * 2 + 1 + MESSAGE_MARGIN * 2) / 2,
-      GAME_WIDTH,
-      45 * 2 + 1 + MESSAGE_MARGIN * 2
-    };
-
-    SDL_SetRenderDrawBlendMode(ren_.get(), SDL_BLENDMODE_BLEND);
-    SDL_SetRenderDrawColor(ren_.get(), 0, 0, 0, opacity);
-    SDL_RenderFillRect(ren_.get(), &signRect);
+    SDL_SetTextureAlphaMod(messageBg_.get(), opacity);
+    SDL_RenderCopy(ren_.get(), messageBg_.get(), nullptr, nullptr);
 
     if (game.sign.signDisplayState == SignInstructionState::Visible) {
       int lineIndex = 0;
@@ -493,6 +487,17 @@ void Renderer::renderGame(
 
         lineIndex++;
       }
+
+      if (game.sign.showNextArrow) {
+        SDL_Rect destRect {
+          GAME_WIDTH - MESSAGE_MARGIN - 32,
+          GAME_HEIGHT / 2 + (45 + 1 + MESSAGE_MARGIN) / 2 + game.sign.nextArrowBobPos - 32,
+          64,
+          64 };
+
+        SDL_SetRenderTarget(ren_.get(), overlays.get());
+        SDL_RenderCopy(ren_.get(), feather_.get(), nullptr, &destRect);
+      }
     }
   }
 
@@ -188,6 +188,8 @@ private:
   texture_ptr readInstruction_;
   texture_ptr menuBg_;
   texture_ptr help_;
+  texture_ptr messageBg_;
+  texture_ptr feather_;
 
   std::array<texture_ptr, NUM_TITLES> titles_;
   std::array<int, NUM_TITLES> titleWidths_;
@@ -92,6 +92,8 @@ void Sign::update(size_t dt, Game& game) {
         }
 
         if (fullyRevealed) {
+          showNextArrow = false;
+
           if (linesToShow.back().pause) {
             linesToShow.back().pause = false;
             // Play a sound
@@ -126,6 +128,27 @@ void Sign::update(size_t dt, Game& game) {
             }
             linesToShow.push_back(lines.front());
             lines.pop_front();
+          } else {
+            showNextArrow = true;
+          }
+        }
+      }
+
+      if (showNextArrow) {
+        nextArrowBobTimer_.accumulate(dt);
+        while (nextArrowBobTimer_.step()) {
+          if (nextArrowBobDown_) {
+            nextArrowBobPos++;
+
+            if (nextArrowBobPos >= 4) {
+              nextArrowBobDown_ = false;
+            }
+          } else {
+            nextArrowBobPos--;
+
+            if (nextArrowBobPos <= 0) {
+              nextArrowBobDown_ = true;
+            }
           }
         }
       }
@@ -35,11 +35,15 @@ public:
   Interpolation signDisplayFade;
   std::list<SignLine> lines;
   std::list<SignLine> linesToShow;
+  bool showNextArrow = false;
+  int nextArrowBobPos = 0;
 
 private:
 
   TTF_Font* font_;
   Timer textAdvTimer_ { 15 };
+  bool nextArrowBobDown_ = true;
+  Timer nextArrowBobTimer_ { 125 };
 };
 
 #endif /* end of include guard: SIGN_H_B0491849 */