mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-08 01:34:34 +00:00
Code Issues Releases Wiki Activity

Use enum and array for cleaner management of controller button overlay

Browse source
This commit is contained in:
Andrew Lanzone 2025-07-19 16:31:25 -07:00
parent c2ad1df030
commit f8d9149e4f
2 changed files with 69 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
apps/openmw/mwgui/controllerbuttonsoverlay.cpp
View file

@ -11,65 +11,28 @@ namespace MWGui
{
MWBase::InputManager* inputMgr = MWBase::Environment::get().getInputManager();
getWidget(mImageA, "BtnAImage");
getWidget(mTextA, "BtnAText");
setIcon(mImageA, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_A));
mButtons[Button::Button_A] = { "A", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_A) };
mButtons[Button::Button_B] = { "B", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_B) };
mButtons[Button::Button_Dpad] = { "Dpad", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_DPAD_UP) };
mButtons[Button::Button_L1] = { "L1", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_LEFTSHOULDER) };
mButtons[Button::Button_L2] = { "L2", inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_TRIGGERLEFT) };
mButtons[Button::Button_L3] = { "L3", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_LEFTSTICK) };
mButtons[Button::Button_LStick] = { "LStick", inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_LEFTY) };
mButtons[Button::Button_Menu] = { "Menu", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_BACK) };
mButtons[Button::Button_R1] = { "R1", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_RIGHTSHOULDER) };
mButtons[Button::Button_R2] = { "R2", inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_TRIGGERRIGHT) };
mButtons[Button::Button_R3] = { "R3", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_RIGHTSTICK) };
mButtons[Button::Button_RStick] = { "RStick", inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_RIGHTY) };
mButtons[Button::Button_View] = { "View", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_START) };
mButtons[Button::Button_X] = { "X", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_X) };
mButtons[Button::Button_Y] = { "Y", inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_Y) };
getWidget(mImageB, "BtnBImage");
getWidget(mTextB, "BtnBText");
setIcon(mImageB, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_B));
getWidget(mImageDpad, "BtnDpadImage");
getWidget(mTextDpad, "BtnDpadText");
setIcon(mImageDpad, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_DPAD_UP));
getWidget(mImageL1, "BtnL1Image");
getWidget(mTextL1, "BtnL1Text");
setIcon(mImageL1, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_LEFTSHOULDER));
getWidget(mImageL2, "BtnL2Image");
getWidget(mTextL2, "BtnL2Text");
setIcon(mImageL2, inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_TRIGGERLEFT));
getWidget(mImageL3, "BtnL3Image");
getWidget(mTextL3, "BtnL3Text");
setIcon(mImageL3, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_LEFTSTICK));
getWidget(mImageLStick, "BtnLStickImage");
getWidget(mTextLStick, "BtnLStickText");
setIcon(mImageLStick, inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_LEFTY));
getWidget(mImageMenu, "BtnMenuImage");
getWidget(mTextMenu, "BtnMenuText");
setIcon(mImageMenu, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_BACK));
getWidget(mImageR1, "BtnR1Image");
getWidget(mTextR1, "BtnR1Text");
setIcon(mImageR1, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_RIGHTSHOULDER));
getWidget(mImageR2, "BtnR2Image");
getWidget(mTextR2, "BtnR2Text");
setIcon(mImageR2, inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_TRIGGERRIGHT));
getWidget(mImageR3, "BtnR3Image");
getWidget(mTextR3, "BtnR3Text");
setIcon(mImageR3, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_RIGHTSTICK));
getWidget(mImageRStick, "BtnRStickImage");
getWidget(mTextRStick, "BtnRStickText");
setIcon(mImageRStick, inputMgr->getControllerAxisIcon(SDL_CONTROLLER_AXIS_RIGHTY));
getWidget(mImageView, "BtnViewImage");
getWidget(mTextView, "BtnViewText");
setIcon(mImageView, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_START));
getWidget(mImageX, "BtnXImage");
getWidget(mTextX, "BtnXText");
setIcon(mImageX, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_X));
getWidget(mImageY, "BtnYImage");
getWidget(mTextY, "BtnYText");
setIcon(mImageY, inputMgr->getControllerButtonIcon(SDL_CONTROLLER_BUTTON_Y));
for (size_t i = 0; i < mButtons.size(); i++)
{
getWidget(mButtons[i].mImage, "Btn" + mButtons[i].mName + "Image");
getWidget(mButtons[i].mText, "Btn" + mButtons[i].mName + "Text");
setIcon(mButtons[i].mImage, mButtons[i].mImagePath);
}
getWidget(mHBox, "ButtonBox");
}
@ -77,21 +40,22 @@ namespace MWGui
void ControllerButtonsOverlay::setButtons(ControllerButtonStr* buttons)
{
int buttonCount = 0;
buttonCount += updateButton(mTextA, mImageA, buttons->a);
buttonCount += updateButton(mTextB, mImageB, buttons->b);
buttonCount += updateButton(mTextDpad, mImageDpad, buttons->dpad);
buttonCount += updateButton(mTextL1, mImageL1, buttons->l1);
buttonCount += updateButton(mTextL2, mImageL2, buttons->l2);
buttonCount += updateButton(mTextL3, mImageL3, buttons->l3);
buttonCount += updateButton(mTextLStick, mImageLStick, buttons->lStick);
buttonCount += updateButton(mTextMenu, mImageMenu, buttons->menu);
buttonCount += updateButton(mTextR1, mImageR1, buttons->r1);
buttonCount += updateButton(mTextR2, mImageR2, buttons->r2);
buttonCount += updateButton(mTextR3, mImageR3, buttons->r3);
buttonCount += updateButton(mTextRStick, mImageRStick, buttons->rStick);
buttonCount += updateButton(mTextView, mImageView, buttons->view);
buttonCount += updateButton(mTextX, mImageX, buttons->x);
buttonCount += updateButton(mTextY, mImageY, buttons->y);
buttonCount += updateButton(Button::Button_A, buttons->a);
buttonCount += updateButton(Button::Button_B, buttons->b);
buttonCount += updateButton(Button::Button_Dpad, buttons->dpad);
buttonCount += updateButton(Button::Button_L1, buttons->l1);
buttonCount += updateButton(Button::Button_L2, buttons->l2);
buttonCount += updateButton(Button::Button_L3, buttons->l3);
buttonCount += updateButton(Button::Button_LStick, buttons->lStick);
buttonCount += updateButton(Button::Button_Menu, buttons->menu);
buttonCount += updateButton(Button::Button_R1, buttons->r1);
buttonCount += updateButton(Button::Button_R2, buttons->r2);
buttonCount += updateButton(Button::Button_R3, buttons->r3);
buttonCount += updateButton(Button::Button_RStick, buttons->rStick);
buttonCount += updateButton(Button::Button_View, buttons->view);
buttonCount += updateButton(Button::Button_X, buttons->x);
buttonCount += updateButton(Button::Button_Y, buttons->y);
mHBox->notifyChildrenSizeChanged();
setVisible(buttonCount > 0);
@ -103,9 +67,11 @@ namespace MWGui
image->setImageTexture(imagePath);
}
int ControllerButtonsOverlay::updateButton(
MyGUI::TextBox* text, MyGUI::ImageBox* image, const std::string& buttonStr)
int ControllerButtonsOverlay::updateButton(ControllerButtonsOverlay::Button button, const std::string& buttonStr)
{
MyGUI::TextBox* text = mButtons[button].mText;
MyGUI::ImageBox* image = mButtons[button].mImage;
if (buttonStr.empty())
{
image->setVisible(false);

71
apps/openmw/mwgui/controllerbuttonsoverlay.hpp
View file

@ -18,55 +18,40 @@ namespace MWGui
void setButtons(ControllerButtonStr* buttons);
private:
MyGUI::ImageBox* mImageA;
MyGUI::TextBox* mTextA;
enum Button
{
Button_A = 0,
Button_B,
Button_Dpad,
Button_L1,
Button_L2,
Button_L3,
Button_LStick,
Button_Menu,
Button_R1,
Button_R2,
Button_R3,
Button_RStick,
Button_View,
Button_X,
Button_Y,
Button_Max,
};
MyGUI::ImageBox* mImageB;
MyGUI::TextBox* mTextB;
struct ButtonDetails
{
std::string mName;
std::string mImagePath;
MyGUI::ImageBox* mImage = nullptr;
MyGUI::TextBox* mText = nullptr;
};
MyGUI::ImageBox* mImageDpad;
MyGUI::TextBox* mTextDpad;
MyGUI::ImageBox* mImageL1;
MyGUI::TextBox* mTextL1;
MyGUI::ImageBox* mImageL2;
MyGUI::TextBox* mTextL2;
MyGUI::ImageBox* mImageL3;
MyGUI::TextBox* mTextL3;
MyGUI::ImageBox* mImageLStick;
MyGUI::TextBox* mTextLStick;
MyGUI::ImageBox* mImageMenu;
MyGUI::TextBox* mTextMenu;
MyGUI::ImageBox* mImageR1;
MyGUI::TextBox* mTextR1;
MyGUI::ImageBox* mImageR2;
MyGUI::TextBox* mTextR2;
MyGUI::ImageBox* mImageR3;
MyGUI::TextBox* mTextR3;
MyGUI::ImageBox* mImageRStick;
MyGUI::TextBox* mTextRStick;
MyGUI::ImageBox* mImageView;
MyGUI::TextBox* mTextView;
MyGUI::ImageBox* mImageX;
MyGUI::TextBox* mTextX;
MyGUI::ImageBox* mImageY;
MyGUI::TextBox* mTextY;
std::array<ButtonDetails, Button::Button_Max> mButtons;
Gui::HBox* mHBox;
void setIcon(MyGUI::ImageBox* image, const std::string& imagePath);
int updateButton(MyGUI::TextBox* text, MyGUI::ImageBox* image, const std::string& buttonStr);
int updateButton(Button button, const std::string& buttonStr);
};
}