4 files changed, 38 insertions, 0 deletions

@@ -12,6 +12,23 @@ void MenuSystem::tick(double dt) {
     } else if (pauseAnimation_.getProgress() == 1.0) {
       openState_ = OpenState::Open;
     }
+  } else if (openState_ == OpenState::Open) {
+    cursorBobTimer_.accumulate(dt);
+    while (cursorBobTimer_.step()) {
+      if (cursorBobDown_) {
+        cursorBob_++;
+
+        if (cursorBob_ >= 4) {
+          cursorBobDown_ = false;
+        }
+      } else {
+        cursorBob_--;
+
+        if (cursorBob_ <= 0) {
+          cursorBobDown_ = true;
+        }
+      }
+    }
   }
 }
 
@@ -5,6 +5,7 @@
 #include "interpolation.h"
 #include "menu.h"
 #include "system.h"
+#include "timer.h"
 
 class Game;
 
@@ -31,6 +32,10 @@ public:
 
   const std::vector<MenuItem>& getMenu() const { return menu_; }
 
+  int getCursorPosition() const { return cursor_; }
+
+  int getCursorBob() const { return cursorBob_; }
+
 private:
 
   enum class OpenState {
@@ -43,6 +48,10 @@ private:
   Interpolation pauseAnimation_;
   OpenState openState_ = OpenState::Closed;
   std::vector<MenuItem> menu_;
+  int cursor_ = 0;
+  int cursorBob_ = 0;
+  bool cursorBobDown_ = true;
+  Timer cursorBobTimer_ { 125 };
 };
 
 #endif /* end of include guard: MENU_SYSTEM_H_205861EC */
@@ -559,6 +559,7 @@ void Renderer::renderMenu(Game& game) {
 
   const int lineHeight = 16;
   int totalHeight = menus.getMenu().size() * lineHeight;
+  std::vector<vec2i> positions;
 
   int index = 0;
   for (const MenuItem& menuItem : menus.getMenu()) {
@@ -577,11 +578,22 @@ void Renderer::renderMenu(Game& game) {
         SDL_SetRenderTarget(ren_.get(), menuTex_.get());
         SDL_RenderCopy(ren_.get(), output.renderedTex.get(), nullptr, &dest);
 
+        positions.emplace_back(dest.x, dest.y);
+
         break;
       }
     }
+
     index++;
   }
+
+  int cursorTexId = loadImageFromFile("../res/feather_pen.png");
+  const SDL_Rect cursorDest {
+    positions[menus.getCursorPosition()].x() - 2 - 16 - menus.getCursorBob(),
+    positions[menus.getCursorPosition()].y() - 8 - menus.getCursorBob(),
+    16,
+    16 };
+  SDL_RenderCopy(ren_.get(), textures_.at(cursorTexId).get(), nullptr, &cursorDest);
 }
 
 int Renderer::loadImageFromFile(std::string filename) {