sigonasr2
/
AdventuresInLestoria
1
1
Fork 0
Code Issues 9 Pull Requests Projects 1 Releases Wiki Activity

Converted menu storage to pointers.

Browse Source
pull/28/head
sigonasr2 1 year ago
parent 461265a8a4
commit dd2ff24d85
7 changed files with 33 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      Crawler/InventoryWindow.cpp
  2. 14
      Crawler/Menu.cpp
  3. 9
      Crawler/Menu.h
  4. 12
      Crawler/TestMenu.cpp
  5. 14
      Crawler/TestSubMenu.cpp
  6. 2
      Crawler/Version.h
  7. BIN
      x64/Release/Crawler.exe

12
Crawler/InventoryWindow.cpp
Unescape View File

@ -10,7 +10,7 @@
INCLUDE_GFX INCLUDE_GFX
typedef Attribute A; typedef Attribute A;
const Menu Menu::InitializeInventoryWindow(){ Menu*Menu::InitializeInventoryWindow(){
constexpr int invWidth=5; constexpr int invWidth=5;
constexpr int invHeight=3; constexpr int invHeight=3;
constexpr int totalItemSlots=invWidth*invHeight; constexpr int totalItemSlots=invWidth*invHeight;
@ -19,7 +19,7 @@ const Menu Menu::InitializeInventoryWindow(){
constexpr int buttonSize=24; constexpr int buttonSize=24;
constexpr int totalSpacing=buttonSize+itemSpacing; constexpr int totalSpacing=buttonSize+itemSpacing;
Menu inventoryWindow(CENTERED,{totalSpacing*invWidth-itemSpacing,totalSpacing*(invHeight+1)-itemSpacing}); Menu*inventoryWindow=new Menu(CENTERED,{totalSpacing*invWidth-itemSpacing,totalSpacing*(invHeight+1)-itemSpacing});
MenuFunc useItemFunc=[](MenuFuncData data){ MenuFunc useItemFunc=[](MenuFuncData data){
MenuItemButton*button=(MenuItemButton*)data.component; MenuItemButton*button=(MenuItemButton*)data.component;
@ -30,14 +30,14 @@ const Menu Menu::InitializeInventoryWindow(){
for(int x=0;x<invWidth;x++){ for(int x=0;x<invWidth;x++){
int itemIndex=y*invWidth+x; int itemIndex=y*invWidth+x;
MenuItemButton*button=new MenuItemButton{INVENTORY,{{float(totalSpacing*x),float(totalSpacing*y)},{float(buttonSize),float(buttonSize)}},Inventory::get("Consumables"),itemIndex,useItemFunc}; MenuItemButton*button=new MenuItemButton{INVENTORY,{{float(totalSpacing*x),float(totalSpacing*y)},{float(buttonSize),float(buttonSize)}},Inventory::get("Consumables"),itemIndex,useItemFunc};
inventoryWindow.AddComponent("item"+std::to_string(itemIndex),button); inventoryWindow->AddComponent("item"+std::to_string(itemIndex),button);
} }
} }
MenuLabel*itemNameLabel=new MenuLabel{INVENTORY,vf2d{0,invHeight*totalSpacing-4},"",false,true}; MenuLabel*itemNameLabel=new MenuLabel{INVENTORY,vf2d{0,invHeight*totalSpacing-4},"",false,true};
inventoryWindow.AddComponent("itemName",itemNameLabel); inventoryWindow->AddComponent("itemName",itemNameLabel);
MenuLabel*itemDescriptionLabel=new MenuLabel{INVENTORY,vf2d{2+inventoryWindow.size.x/2,invHeight*totalSpacing+4+itemSpacing},"",true,true}; MenuLabel*itemDescriptionLabel=new MenuLabel{INVENTORY,vf2d{2+inventoryWindow->size.x/2,invHeight*totalSpacing+4+itemSpacing},"",true,true};
inventoryWindow.AddComponent("itemDescription",itemDescriptionLabel); inventoryWindow->AddComponent("itemDescription",itemDescriptionLabel);
return inventoryWindow; return inventoryWindow;
} }

14
Crawler/Menu.cpp
Unescape View File

@ -5,7 +5,7 @@
bool Menu::MOUSE_NAVIGATION=true; bool Menu::MOUSE_NAVIGATION=true;
std::vector<Menu*>Menu::stack; std::vector<Menu*>Menu::stack;
std::map<MenuType,Menu>Menu::menus; std::map<MenuType,Menu*>Menu::menus;
std::string Menu::themeSelection="BlueDefault"; std::string Menu::themeSelection="BlueDefault";
safeunorderedmap<std::string,Theme>Menu::themes; safeunorderedmap<std::string,Theme>Menu::themes;
const vf2d Menu::CENTERED = {-456,-456}; const vf2d Menu::CENTERED = {-456,-456};
@ -16,7 +16,9 @@ extern vi2d WINDOW_SIZE;
Menu::Menu(){} Menu::Menu(){}
Menu::Menu(vf2d pos,vf2d size) Menu::Menu(vf2d pos,vf2d size)
:pos(pos==CENTERED?WINDOW_SIZE/2-size/2:vi2d{pos}),size(size){} :pos(pos==CENTERED?WINDOW_SIZE/2-size/2:vi2d{pos}),size(size){
}
void Menu::InitializeMenus(){ void Menu::InitializeMenus(){
stack.reserve(32); stack.reserve(32);
@ -29,7 +31,7 @@ void Menu::InitializeMenus(){
std::cout<<"WARNING! Menu Type "<<type<<" does not exist!"<<std::endl; std::cout<<"WARNING! Menu Type "<<type<<" does not exist!"<<std::endl;
throw; throw;
} }
menus[type].components.SetInitialized(); //Lock all known components to prevent invalid access. menus[type]->components.SetInitialized(); //Lock all known components to prevent invalid access.
} }
} }
@ -68,7 +70,7 @@ void Menu::MenuSelect(Crawler*game){
buttons[selection.y][selection.x]->onClick(MenuFuncData{*this,game,buttons[selection.y][selection.x]}); buttons[selection.y][selection.x]->onClick(MenuFuncData{*this,game,buttons[selection.y][selection.x]});
if(buttons[selection.y][selection.x]->menuDest!=MenuType::ENUM_END){ if(buttons[selection.y][selection.x]->menuDest!=MenuType::ENUM_END){
if(stack.size()<32){ if(stack.size()<32){
stack.push_back(&menus[buttons[selection.y][selection.x]->menuDest]);//Navigate to the next menu. stack.push_back(menus[buttons[selection.y][selection.x]->menuDest]);//Navigate to the next menu.
}else{ }else{
std::cout<<"WARNING! Exceeded menu stack size limit!"<<std::endl; std::cout<<"WARNING! Exceeded menu stack size limit!"<<std::endl;
throw; throw;
@ -166,14 +168,14 @@ void Menu::Draw(Crawler*game){
void Menu::OpenMenu(MenuType menu){ void Menu::OpenMenu(MenuType menu){
stack.clear(); stack.clear();
stack.push_back(&(menus[menu])); stack.push_back(menus[menu]);
} }
void Menu::KeyboardButtonNavigation(Crawler*game,vf2d menuPos){ void Menu::KeyboardButtonNavigation(Crawler*game,vf2d menuPos){
if(game->GetKey(RIGHT).bPressed){ if(game->GetKey(RIGHT).bPressed){
if(selection==vi2d{-1,-1})return; if(selection==vi2d{-1,-1})return;
MOUSE_NAVIGATION=false; MOUSE_NAVIGATION=false;
selection.x=(selection.x+1)%buttons[selection.y].size(); selection.x=(size_t(selection.x)+1)%buttons[selection.y].size();
} }
if(game->GetKey(LEFT).bPressed){ if(game->GetKey(LEFT).bPressed){
if(selection==vi2d{-1,-1})return; if(selection==vi2d{-1,-1})return;

9
Crawler/Menu.h
Unescape View File

@ -24,7 +24,7 @@ class Menu:IAttributable{
friend class Crawler; friend class Crawler;
friend class Player; friend class Player;
static bool MOUSE_NAVIGATION; static bool MOUSE_NAVIGATION;
static std::map<MenuType,Menu>menus; static std::map<MenuType,Menu*>menus;
float buttonHoldTime=0; float buttonHoldTime=0;
std::map<int/*Y*/,std::vector<MenuComponent*>>buttons; //Buttons are stored in rows followed by their column order. std::map<int/*Y*/,std::vector<MenuComponent*>>buttons; //Buttons are stored in rows followed by their column order.
@ -35,6 +35,7 @@ class Menu:IAttributable{
vf2d size; //Size in tiles (24x24), every menu will be tile-based vf2d size; //Size in tiles (24x24), every menu will be tile-based
MenuComponent*draggingComponent=nullptr; MenuComponent*draggingComponent=nullptr;
Renderable r;
public: public:
Menu(); Menu();
Menu(vf2d pos,vf2d size); Menu(vf2d pos,vf2d size);
@ -53,9 +54,9 @@ private:
void HoverMenuSelect(Crawler*game); void HoverMenuSelect(Crawler*game);
void MenuSelect(Crawler*game); void MenuSelect(Crawler*game);
void CheckClickAndPerformMenuSelect(Crawler*game); void CheckClickAndPerformMenuSelect(Crawler*game);
static const Menu InitializeTestMenu(); static Menu*InitializeTestMenu();
static const Menu InitializeTestSubMenu(); static Menu*InitializeTestSubMenu();
static const Menu InitializeInventoryWindow(); static Menu*InitializeInventoryWindow();
//X (0-3), Y (0-2) for specific 9-patch tile (tiled version). //X (0-3), Y (0-2) for specific 9-patch tile (tiled version).
static Renderable&GetPatchPart(int x,int y); static Renderable&GetPatchPart(int x,int y);

12
Crawler/TestMenu.cpp
Unescape View File

@ -1,26 +1,26 @@
#include "Crawler.h" #include "Crawler.h"
#include "MenuComponent.h" #include "MenuComponent.h"
const Menu Menu::InitializeTestMenu(){ Menu*Menu::InitializeTestMenu(){
Menu testMenu(CENTERED,{24*8,24*6}); Menu*testMenu=new Menu(CENTERED,{24*8,24*6});
MenuFunc quitWindow=[](MenuFuncData data){ MenuFunc quitWindow=[](MenuFuncData data){
data.menu.stack.clear(); data.menu.stack.clear();
}; };
testMenu.AddComponent("Close",new MenuComponent(TEST,{{24*1,24*1},{24*2,24*1}},"Close",quitWindow)); testMenu->AddComponent("Close",new MenuComponent(TEST,{{24*1,24*1},{24*2,24*1}},"Close",quitWindow));
MenuFunc doNothing=[](MenuFuncData data){}; MenuFunc doNothing=[](MenuFuncData data){};
testMenu.AddComponent("Test",new MenuComponent(TEST,{{24*4,24*1},{24*3,24*1}},"Test",doNothing)); testMenu->AddComponent("Test",new MenuComponent(TEST,{{24*4,24*1},{24*3,24*1}},"Test",doNothing));
MenuFunc HurtPlayer=[](MenuFuncData data){ MenuFunc HurtPlayer=[](MenuFuncData data){
data.game->GetPlayer()->Hurt(20,data.game->GetPlayer()->OnUpperLevel(),data.game->GetPlayer()->GetZ()); data.game->GetPlayer()->Hurt(20,data.game->GetPlayer()->OnUpperLevel(),data.game->GetPlayer()->GetZ());
}; };
testMenu.AddComponent("Hurt Player",new MenuComponent(TEST,{{24*4,24*3},{24*3,24*1}},"Hurt Player",HurtPlayer)); testMenu->AddComponent("Hurt Player",new MenuComponent(TEST,{{24*4,24*3},{24*3,24*1}},"Hurt Player",HurtPlayer));
testMenu.AddComponent("Open SubMenu",new MenuComponent(TEST,{{24*2,24*4.5},{24*4,24*1}},"Open Another\n Menu",TEST_2,doNothing)); testMenu->AddComponent("Open SubMenu",new MenuComponent(TEST,{{24*2,24*4.5},{24*4,24*1}},"Open Another\n Menu",TEST_2,doNothing));
return testMenu; return testMenu;
} }

14
Crawler/TestSubMenu.cpp
Unescape View File

@ -8,19 +8,19 @@
INCLUDE_GFX INCLUDE_GFX
typedef Attribute A; typedef Attribute A;
const Menu Menu::InitializeTestSubMenu(){ Menu*Menu::InitializeTestSubMenu(){
Menu testSubMenu({30,30},{24*4,24*5}); Menu*testSubMenu=new Menu({30,30},{24*4,24*5});
MenuFunc goBack=[](MenuFuncData data){ MenuFunc goBack=[](MenuFuncData data){
data.menu.stack.pop_back(); data.menu.stack.pop_back();
}; };
testSubMenu.AddComponent("BACK",new MenuComponent(TEST_2,{{24*1,24*1},{24*2,24*1}},"Go Back",goBack)); testSubMenu->AddComponent("BACK",new MenuComponent(TEST_2,{{24*1,24*1},{24*2,24*1}},"Go Back",goBack));
int index=0; int index=0;
for(auto&theme:Menu::themes){ for(auto&theme:Menu::themes){
if(theme.displayName==Menu::themeSelection){ if(theme.displayName==Menu::themeSelection){
testSubMenu.I(A::INDEXED_THEME)=index; testSubMenu->I(A::INDEXED_THEME)=index;
break; break;
} }
index++; index++;
@ -43,9 +43,9 @@ const Menu Menu::InitializeTestSubMenu(){
} }
}; };
testSubMenu.AddComponent("PREV_THEME",new MenuComponent(TEST_2,{{24*-0.5,24*3},{24*1,24*1}},"<",themePrev)); testSubMenu->AddComponent("PREV_THEME",new MenuComponent(TEST_2,{{24*-0.5,24*3},{24*1,24*1}},"<",themePrev));
testSubMenu.AddComponent("THEME_DISPLAY",new MenuLabel(TEST_2,{{24*0.5,24*3},{24*3,24*1}},"Theme\n"+Menu::themes[themeSelection].GetThemeName())); testSubMenu->AddComponent("THEME_DISPLAY",new MenuLabel(TEST_2,{{24*0.5,24*3},{24*3,24*1}},"Theme\n"+Menu::themes[themeSelection].GetThemeName()));
MenuFunc themeNext=[](MenuFuncData data){ MenuFunc themeNext=[](MenuFuncData data){
data.menu.I(A::INDEXED_THEME)=(size_t(data.menu.I(A::INDEXED_THEME))+1)%themes.size(); data.menu.I(A::INDEXED_THEME)=(size_t(data.menu.I(A::INDEXED_THEME))+1)%themes.size();
@ -60,7 +60,7 @@ const Menu Menu::InitializeTestSubMenu(){
} }
}; };
testSubMenu.AddComponent("NEXT_THEME",new MenuComponent(TEST_2,{{24*3.5,24*3},{24*1,24*1}},">",themeNext)); testSubMenu->AddComponent("NEXT_THEME",new MenuComponent(TEST_2,{{24*3.5,24*3},{24*1,24*1}},">",themeNext));
return testSubMenu; return testSubMenu;
} }

2
Crawler/Version.h
Unescape View File

@ -2,7 +2,7 @@
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_BUILD 1895 #define VERSION_BUILD 1899
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

BIN
x64/Release/Crawler.exe
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save