Added submenus

#7

1 files changed, 19 insertions, 5 deletions

@@ -1,6 +1,7 @@
 #ifndef MENU_SYSTEM_H_205861EC
 #define MENU_SYSTEM_H_205861EC
 
+#include <deque>
 #include <vector>
 #include "interpolation.h"
 #include "menu.h"
@@ -34,16 +35,24 @@ public:
 
   double getPauseAnimationProgress() const { return pauseAnimation_.getProgress(); }
 
-  bool isMenuOpen() const { return openState_ == OpenState::Open; }
+  bool isMenuOpen() const { return openState_ == OpenState::Open && !isMenuChanging_; }
 
-  const std::vector<MenuItem>& getMenu() const { return menu_; }
+  // Only call this if a menu is open.
+  Menu& getMenu() { return menus_.back(); }
 
-  int getCursorPosition() const { return cursor_; }
+  // Only call this if a submenu is open.
+  Menu& getParentMenu() { return menus_[menus_.size()-2]; }
 
   int getCursorBob() const { return cursorBob_; }
 
+  double getMenuChangeAnimationProgress() const { return menuChangeAnimation_.getProgress(); }
+
+  bool isMenuChanging() const { return isMenuChanging_; }
+
 private:
 
+  void openSubmenu(Menu submenu);
+
   enum class OpenState {
     Closed,
     Animating,
@@ -51,13 +60,18 @@ private:
   };
 
   Game& game_;
+
   Interpolation pauseAnimation_;
   OpenState openState_ = OpenState::Closed;
-  std::vector<MenuItem> menu_;
-  int cursor_ = 0;
+
+  std::deque<Menu> menus_;
+
   int cursorBob_ = 0;
   bool cursorBobDown_ = true;
   Timer cursorBobTimer_ { 125 };
+
+  Interpolation menuChangeAnimation_;
+  bool isMenuChanging_ = false;
 };
 
 #endif /* end of include guard: MENU_SYSTEM_H_205861EC */