more generic menu info handling

Author: FolkertVanVerseveld

game/src/engine.cpp

@@ -1119,6 +1119,9 @@ void Engine::key_tapped(SDL &sdl, GameKey k) {
 	case MenuState::start:
 		mainMenu.key_tapped(k);
 		break;
+	case MenuState::editor_menu:
+		scenarioMenu.key_tapped(k);
+		break;
 	case MenuState::singleplayer_game:
 	case MenuState::multiplayer_game:
 		kbp_game(k);
@@ -1133,8 +1136,14 @@ void Engine::kbp_down(GameKey k) {
 	if (k >= GameKey::max)
 		return;
 
-	if (menu_state == MenuState::start)
+	switch (menu_state) {
+	case MenuState::start:
 		mainMenu.key_down(k, keyctl, sfx);
+		break;
+	case MenuState::editor_menu:
+		scenarioMenu.key_down(k, keyctl, sfx);
+		break;
+	}
 }
 
 void Engine::eventloop(SDL &sdl, gfx::GLprogram &prog, GLuint vao) {
@@ -1150,6 +1159,8 @@ void Engine::eventloop(SDL &sdl, gfx::GLprogram &prog, GLuint vao) {
 		// - When io.WantCaptureKeyboard is true, do not dispatch keyboard input data to your main application, or clear/overwrite your copy of the keyboard data.
 		// Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
 		SDL_Event event;
+		const MenuInfo *mi = HasMenuInfo(menu_state);
+
 		while (SDL_PollEvent(&event)) {
 			switch (event.type) {
 			case SDL_QUIT:
@@ -1168,23 +1179,23 @@ void Engine::eventloop(SDL &sdl, gfx::GLprogram &prog, GLuint vao) {
 			case SDL_KEYDOWN:
 				ImGui_ImplSDL2_ProcessEvent(&event);
 
-				if (menu_state == MenuState::start || (capture_keys() && !io.WantCaptureKeyboard))
+				if ((mi && mi->menu) || (capture_keys() && !io.WantCaptureKeyboard))
 					kbp_down(keyctl.down(event.key));
 				break;
 			case SDL_MOUSEBUTTONDOWN:
 				ImGui_ImplSDL2_ProcessEvent(&event);
 
-				if (menu_state == MenuState::start) {
-					if (event.button.button = SDL_BUTTON_LEFT)
-						mainMenu.mouse_down(event.button.x, event.button.y, sfx);
+				if (mi && mi->menu) {
+					if (event.button.button == SDL_BUTTON_LEFT)
+						mi->menu->mouse_down(event.button.x, event.button.y, sfx);
 				}
 				break;
 			case SDL_MOUSEBUTTONUP:
 				ImGui_ImplSDL2_ProcessEvent(&event);
 
-				if (menu_state == MenuState::start) {
-					if (event.button.button = SDL_BUTTON_LEFT)
-						mainMenu.mouse_up(event.button.x, event.button.y);
+				if (mi && mi->menu) {
+					if (event.button.button == SDL_BUTTON_LEFT)
+						mi->menu->mouse_up(event.button.x, event.button.y);
 				}
 				break;
 			default:

game/src/engine/menu.cpp

@@ -1,13 +1,15 @@
 #include "menu.hpp"
 #include "../engine.hpp"
 
+#include "../ui/fullscreenmenu.hpp"
+
 namespace aoe {
 
 using namespace io;
 
 const MenuInfo menu_info[] = {
 	{ false, KeyboardMode::configure, DrsId::bkg_main_menu }, // init
-	{ true, KeyboardMode::fullscreen_menu, DrsId::bkg_main_menu }, // start
+	{ true, KeyboardMode::fullscreen_menu, DrsId::bkg_main_menu, &mainMenu }, // start
 	{ true, KeyboardMode::other, DrsId::bkg_singleplayer },
 	{ true, KeyboardMode::other, DrsId::bkg_singleplayer },
 	{ false, KeyboardMode::other, (DrsId)0 }, // sp game
@@ -17,7 +19,7 @@ const MenuInfo menu_info[] = {
 	{ false, KeyboardMode::other, (DrsId)0 }, // mp settings
 	{ true, KeyboardMode::other, DrsId::bkg_defeat },
 	{ true, KeyboardMode::other, DrsId::bkg_victory },
-	{ true, KeyboardMode::other, DrsId::bkg_editor_menu }, // edit menu
+	{ true, KeyboardMode::fullscreen_menu, DrsId::bkg_editor_menu, &scenarioMenu }, // edit menu
 	{ false, KeyboardMode::other, (DrsId)0 }, // edit scn
 };
 
@@ -39,11 +41,15 @@ enum class MainMenuButtonIdx {
 	quit,
 };
 
-void MenuButtonActivate(MenuState state, unsigned idx)
-{
-	if (state != MenuState::start)
-		return;
+enum class EditorMenuButtonIdx {
+	create_scenario,
+	load_scenario,
+	campaign_editor,
+	cancel
+};
 
+void StartMenuButtonActivate(unsigned idx)
+{
 	MainMenuButtonIdx btn = (MainMenuButtonIdx)idx;
 
 	switch (btn) {
@@ -64,4 +70,30 @@ void MenuButtonActivate(MenuState state, unsigned idx)
 	}
 }
 
+void EditorMenuButtonActivate(unsigned idx)
+{
+	EditorMenuButtonIdx btn = (EditorMenuButtonIdx)idx;
+
+	switch (btn) {
+	case EditorMenuButtonIdx::create_scenario:
+		next_menu_state = MenuState::editor_scenario;
+		break;
+	default:
+		next_menu_state = MenuState::start;
+		break;
+	}
+}
+
+void MenuButtonActivate(MenuState state, unsigned idx)
+{
+ 	switch (state) {
+	case MenuState::start:
+		StartMenuButtonActivate(idx);
+		break;
+	case MenuState::editor_menu:
+		EditorMenuButtonActivate(idx);
+		break;
+	}
+}
+
 }

game/src/engine/menu.hpp

@@ -5,6 +5,12 @@
 
 namespace aoe {
 
+namespace ui {
+
+class FullscreenMenu;
+
+}
+
 enum class MenuState {
 	init,
 	start,
@@ -26,6 +32,7 @@ struct MenuInfo final {
 	bool draw_border;
 	KeyboardMode keyboard_mode;
 	io::DrsId border_col;
+	ui::FullscreenMenu *menu;
 };
 
 extern const MenuInfo menu_info[(unsigned)MenuState::max];

game/src/ui.cpp

@@ -637,6 +637,8 @@ void Engine::show_multiplayer_host() {
 	}
 }
 
+static void DrawScenarioMenu(Frame &f, Audio &sfx, Assets &ass);
+
 void UICache::show_editor_menu() {
 	ZoneScoped;
 	ImGuiViewport *vp = ImGui::GetMainViewport();
@@ -658,6 +660,7 @@ void UICache::show_editor_menu() {
 		f.str2("Scenario Editor", TextHalign::center);
 	}
 
+#if 0
 	FontGuard fg(fnt.copper);
 
 	ImGui::SetCursorPosY(272.0f / 768.0f * vp->WorkSize.y);
@@ -678,7 +681,9 @@ void UICache::show_editor_menu() {
 	if (btn(f, "Cancel", TextHalign::center, e->sfx))
 		next_menu_state = MenuState::start;
 
-	ImGui::SetCursorPosX(old_x);
+#else
+	DrawScenarioMenu(f, e->sfx, *e->assets.get());
+#endif
 }
 
 
@@ -1049,9 +1054,32 @@ MenuButton mainMenuButtons[] = {
 	{604, "Exit"},
 };
 
+MenuButton scenarioMenuButtons[] = {
+	{272, "Create Scenario"},
+	{352, "Edit Scenario"},
+	{432, "Campaign Editor"},
+	{512, "Cancel"},
+};
+
 static void DrawMainMenu(Frame &f, Audio &sfx, Assets &ass);
+static void DrawScenarioMenu(Frame &f, Audio &sfx, Assets &ass);
 
 FullscreenMenu mainMenu(MenuState::start, mainMenuButtons, ARRAY_SIZE(mainMenuButtons), DrawMainMenu);
+FullscreenMenu scenarioMenu(MenuState::editor_menu, scenarioMenuButtons, ARRAY_SIZE(scenarioMenuButtons), DrawScenarioMenu);
+
+static void DrawScenarioMenu(Frame &f, Audio &sfx, Assets &ass)
+{
+	FullscreenMenu &mm = scenarioMenu;
+	ImGuiViewport *vp = ImGui::GetMainViewport();
+
+	FontGuard fg(fnt.copper);
+	mm.reshape(vp);
+
+	BackgroundColors col = ass.bkg_cols.at(io::DrsId::bkg_editor_menu);
+
+	for (unsigned i = 0, n = mm.buttonCount; i < n; ++i)
+		mm.buttons[i].show(f, sfx, col);
+}
 
 static void DrawMainMenu(Frame &f, Audio &sfx, Assets &ass)
 {
@@ -1063,14 +1091,8 @@ static void DrawMainMenu(Frame &f, Audio &sfx, Assets &ass)
 
 	BackgroundColors col = ass.bkg_cols.at(io::DrsId::bkg_main_menu);
 
-	bool activated = false;
-
-	for (unsigned i = 0, n = mm.buttonCount; i < n; ++i) {
-		if (mm.buttons[i].show(f, sfx, col) && !activated) {
-			activated = true;
-			MenuButtonActivate(MenuState::start, i);
-		}
-	}
+	for (unsigned i = 0, n = mm.buttonCount; i < n; ++i)
+		mm.buttons[i].show(f, sfx, col);
 }
 
 void Engine::show_start() {

game/src/ui/fullscreenmenu.hpp

@@ -78,7 +78,7 @@ class FullscreenMenu final {
 
 void MenuButtonActivate(MenuState state, unsigned idx);
 
-extern ui::FullscreenMenu mainMenu;
+extern ui::FullscreenMenu mainMenu, scenarioMenu;
 
 }