AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CGuiWidgetDrawParms: Make constexpr constructible 

We can allow this structure to be constructed in a constexpr context.

This also allows us to remove the cpp file, given it's no longer
necessary.
This commit is contained in:
Lioncash 2020-04-26 01:15:02 -04:00
parent 07ebdd364c
commit 6c475b6764
7 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/GuiSys/CGuiWidgetDrawParms.cpp
View File

@ -1,5 +0,0 @@
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {
const CGuiWidgetDrawParms CGuiWidgetDrawParms::Default = {};
}

7
Runtime/GuiSys/CGuiWidgetDrawParms.hpp
View File

@ -8,10 +8,11 @@ struct CGuiWidgetDrawParms {
float x0_alphaMod = 1.f; float x0_alphaMod = 1.f;
zeus::CVector3f x4_cameraOffset; zeus::CVector3f x4_cameraOffset;
CGuiWidgetDrawParms() = default; constexpr CGuiWidgetDrawParms() = default;
CGuiWidgetDrawParms(float alphaMod, const zeus::CVector3f& cameraOff) constexpr CGuiWidgetDrawParms(float alphaMod, const zeus::CVector3f& cameraOff)
: x0_alphaMod(alphaMod), x4_cameraOffset(cameraOff) {} : x0_alphaMod(alphaMod), x4_cameraOffset(cameraOff) {}
static const CGuiWidgetDrawParms Default;
static constexpr CGuiWidgetDrawParms Default() { return {}; }
}; };
} // namespace urde } // namespace urde

2
Runtime/GuiSys/CHudDecoInterface.cpp
View File

@ -324,7 +324,7 @@ void CHudDecoInterfaceScan::Update(float dt, const CStateManager& stateMgr) {
void CHudDecoInterfaceScan::Draw() { void CHudDecoInterfaceScan::Draw() {
x18_scanDisplay.Draw(); x18_scanDisplay.Draw();
if (x10_loadedScanHudFlat) { if (x10_loadedScanHudFlat) {
x10_loadedScanHudFlat->Draw(CGuiWidgetDrawParms::Default); x10_loadedScanHudFlat->Draw(CGuiWidgetDrawParms::Default());
} }
} }

2
Runtime/GuiSys/CMakeLists.txt
View File

@ -17,7 +17,7 @@ set(GUISYS_SOURCES
CGuiTextPane.hpp CGuiTextPane.cpp CGuiTextPane.hpp CGuiTextPane.cpp
CGuiTextSupport.hpp CGuiTextSupport.cpp CGuiTextSupport.hpp CGuiTextSupport.cpp
CGuiWidget.hpp CGuiWidget.cpp CGuiWidget.hpp CGuiWidget.cpp
CGuiWidgetDrawParms.hpp CGuiWidgetDrawParms.cpp CGuiWidgetDrawParms.hpp
CSplashScreen.hpp CSplashScreen.cpp CSplashScreen.hpp CSplashScreen.cpp
CGuiCompoundWidget.hpp CGuiCompoundWidget.cpp CGuiCompoundWidget.hpp CGuiCompoundWidget.cpp
CSaveableState.hpp CSaveableState.cpp CSaveableState.hpp CSaveableState.cpp

8
Runtime/MP1/CFrontEndUI.cpp
View File

@ -296,7 +296,7 @@ CFrontEndUI::SNewFileSelectFrame::ProcessUserInput(const CFinalInput& input, CFr
void CFrontEndUI::SNewFileSelectFrame::Draw() const { void CFrontEndUI::SNewFileSelectFrame::Draw() const {
if (x1c_loadedFrame && x10c_saveReady) if (x1c_loadedFrame && x10c_saveReady)
x1c_loadedFrame->Draw(CGuiWidgetDrawParms::Default); x1c_loadedFrame->Draw(CGuiWidgetDrawParms::Default());
} }
void CFrontEndUI::SNewFileSelectFrame::HandleActiveChange(CGuiTableGroup* active) { void CFrontEndUI::SNewFileSelectFrame::HandleActiveChange(CGuiTableGroup* active) {
@ -909,7 +909,7 @@ void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::FinishedLoading() {
SetUIText(EUIType::InsertPak); SetUIText(EUIType::InsertPak);
} }
void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::Draw() { x8_frme->Draw(CGuiWidgetDrawParms::Default); } void CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::Draw() { x8_frme->Draw(CGuiWidgetDrawParms::Default()); }
CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::SGBALinkFrame(CGuiFrame* linkFrame, CGBASupport* support, CFrontEndUI::SFusionBonusFrame::SGBALinkFrame::SGBALinkFrame(CGuiFrame* linkFrame, CGBASupport* support,
bool linkInProgress) bool linkInProgress)
@ -1103,7 +1103,7 @@ void CFrontEndUI::SFusionBonusFrame::Draw() const {
if (x0_gbaLinkFrame) if (x0_gbaLinkFrame)
x0_gbaLinkFrame->Draw(); x0_gbaLinkFrame->Draw();
else if (x24_loadedFrame) else if (x24_loadedFrame)
x24_loadedFrame->Draw(CGuiWidgetDrawParms::Default); x24_loadedFrame->Draw(CGuiWidgetDrawParms::Default());
} }
void CFrontEndUI::SFusionBonusFrame::DoCancel(CGuiTableGroup* caller) { void CFrontEndUI::SFusionBonusFrame::DoCancel(CGuiTableGroup* caller) {
@ -1289,7 +1289,7 @@ CFrontEndUI::SFrontEndFrame::ProcessUserInput(const CFinalInput& input, CFrontEn
return x4_action; return x4_action;
} }
void CFrontEndUI::SFrontEndFrame::Draw() const { x14_loadedFrme->Draw(CGuiWidgetDrawParms::Default); } void CFrontEndUI::SFrontEndFrame::Draw() const { x14_loadedFrme->Draw(CGuiWidgetDrawParms::Default()); }
void CFrontEndUI::SFrontEndFrame::HandleActiveChange(CGuiTableGroup* active) { void CFrontEndUI::SFrontEndFrame::HandleActiveChange(CGuiTableGroup* active) {
active->SetColors(zeus::skWhite, zeus::CColor{0.627450f, 0.627450f, 0.627450f, 0.784313f}); active->SetColors(zeus::skWhite, zeus::CColor{0.627450f, 0.627450f, 0.627450f, 0.784313f});

2
Runtime/MP1/CSamusHud.cpp
View File

@ -1429,7 +1429,7 @@ void CSamusHud::Draw(const CStateManager& mgr, float alpha, CInGameGuiManager::E
} }
if (x274_loadedFrmeBaseHud) { if (x274_loadedFrmeBaseHud) {
x274_loadedFrmeBaseHud->Draw(CGuiWidgetDrawParms::Default); x274_loadedFrmeBaseHud->Draw(CGuiWidgetDrawParms::Default());
} }
} }

2
Runtime/MP1/CSaveGameScreen.cpp
View File

@ -329,7 +329,7 @@ void CSaveGameScreen::SetUIColors() {
void CSaveGameScreen::Draw() const { void CSaveGameScreen::Draw() const {
SCOPED_GRAPHICS_DEBUG_GROUP("CSaveGameScreen::Draw", zeus::skPurple); SCOPED_GRAPHICS_DEBUG_GROUP("CSaveGameScreen::Draw", zeus::skPurple);
if (x50_loadedFrame) if (x50_loadedFrame)
x50_loadedFrame->Draw(CGuiWidgetDrawParms::Default); x50_loadedFrame->Draw(CGuiWidgetDrawParms::Default());
} }
void CSaveGameScreen::ContinueWithoutSaving() { void CSaveGameScreen::ContinueWithoutSaving() {