AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-05-14 10:31:22 +00:00
Code Issues Projects Releases Wiki Activity

CIOWin: Make Draw() non-const

Browse Source 
Allows removing several const_cast usages within the codebase.
This commit is contained in:
Lioncash 2020-03-29 21:55:58 -04:00
parent 0d3bab4c14
commit 6dce70895c
17 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/CIOWin.hpp
View File

@ -21,8 +21,8 @@ public:
virtual ~CIOWin() = default; virtual ~CIOWin() = default;
virtual EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) = 0; virtual EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) = 0;
virtual bool GetIsContinueDraw() const { return true; } virtual bool GetIsContinueDraw() const { return true; }
virtual void Draw() const {} virtual void Draw() {}
virtual void PreDraw() const {} virtual void PreDraw() {}
std::string_view GetName() const { return x4_name; } std::string_view GetName() const { return x4_name; }
size_t GetNameHash() const { return m_nameHash; } size_t GetNameHash() const { return m_nameHash; }

2
Runtime/CPlayMovieBase.hpp
View File

@ -11,7 +11,7 @@ class CPlayMovieBase : public CIOWin {
public: public:
CPlayMovieBase(const char* iowName, const char* path) : CIOWin(iowName), x18_moviePlayer(path, 0.0, false, false) {} CPlayMovieBase(const char* iowName, const char* path) : CIOWin(iowName), x18_moviePlayer(path, 0.0, false, false) {}
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override { return EMessageReturn::Normal; } EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override { return EMessageReturn::Normal; }
void Draw() const override {} void Draw() override {}
}; };
} // namespace urde } // namespace urde

2
Runtime/GuiSys/CConsoleOutputWindow.cpp
View File

@ -9,7 +9,7 @@ CIOWin::EMessageReturn CConsoleOutputWindow::OnMessage(const CArchitectureMessag
return EMessageReturn::Normal; return EMessageReturn::Normal;
} }
void CConsoleOutputWindow::Draw() const { void CConsoleOutputWindow::Draw() {
//SCOPED_GRAPHICS_DEBUG_GROUP("CConsoleOutputWindow::Draw", zeus::skGreen); //SCOPED_GRAPHICS_DEBUG_GROUP("CConsoleOutputWindow::Draw", zeus::skGreen);
} }

2
Runtime/GuiSys/CConsoleOutputWindow.hpp
View File

@ -8,7 +8,7 @@ class CConsoleOutputWindow : public CIOWin {
public: public:
CConsoleOutputWindow(int, float, float); CConsoleOutputWindow(int, float, float);
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
void Draw() const override; void Draw() override;
}; };
} // namespace urde } // namespace urde

2
Runtime/GuiSys/CErrorOutputWindow.cpp
View File

@ -15,7 +15,7 @@ CIOWin::EMessageReturn CErrorOutputWindow::OnMessage(const CArchitectureMessage&
return EMessageReturn::Normal; return EMessageReturn::Normal;
} }
void CErrorOutputWindow::Draw() const { void CErrorOutputWindow::Draw() {
//SCOPED_GRAPHICS_DEBUG_GROUP("CErrorOutputWindow::Draw", zeus::skGreen); //SCOPED_GRAPHICS_DEBUG_GROUP("CErrorOutputWindow::Draw", zeus::skGreen);
} }

2
Runtime/GuiSys/CErrorOutputWindow.hpp
View File

@ -27,7 +27,7 @@ public:
explicit CErrorOutputWindow(bool); explicit CErrorOutputWindow(bool);
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override { return int(x14_state) < 2; } bool GetIsContinueDraw() const override { return int(x14_state) < 2; }
void Draw() const override; void Draw() override;
}; };
} // namespace urde } // namespace urde

15
Runtime/GuiSys/CSplashScreen.cpp
View File

@ -48,19 +48,22 @@ CIOWin::EMessageReturn CSplashScreen::OnMessage(const CArchitectureMessage& msg,
return EMessageReturn::Exit; return EMessageReturn::Exit;
} }
void CSplashScreen::Draw() const { void CSplashScreen::Draw() {
if (!x25_textureLoaded) if (!x25_textureLoaded) {
return; return;
}
SCOPED_GRAPHICS_DEBUG_GROUP("CSplashScreen::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CSplashScreen::Draw", zeus::skGreen);
zeus::CColor color; zeus::CColor color;
if (x14_which == ESplashScreen::Nintendo) if (x14_which == ESplashScreen::Nintendo) {
color = zeus::CColor{0.86f, 0.f, 0.f, 1.f}; color = zeus::CColor{0.86f, 0.f, 0.f, 1.f};
}
if (x18_splashTimeout > 1.5f) if (x18_splashTimeout > 1.5f) {
color.a() = 1.f - (x18_splashTimeout - 1.5f) * 2.f; color.a() = 1.f - (x18_splashTimeout - 1.5f) * 2.f;
else if (x18_splashTimeout < 0.5f) } else if (x18_splashTimeout < 0.5f) {
color.a() = x18_splashTimeout * 2.f; color.a() = x18_splashTimeout * 2.f;
}
zeus::CRectangle rect; zeus::CRectangle rect;
rect.size.x() = m_quad.GetTex()->GetWidth() / (480.f * g_Viewport.aspect); rect.size.x() = m_quad.GetTex()->GetWidth() / (480.f * g_Viewport.aspect);
@ -68,7 +71,7 @@ void CSplashScreen::Draw() const {
rect.position.x() = 0.5f - rect.size.x() / 2.f; rect.position.x() = 0.5f - rect.size.x() / 2.f;
rect.position.y() = 0.5f - rect.size.y() / 2.f; rect.position.y() = 0.5f - rect.size.y() / 2.f;
const_cast<CTexturedQuadFilterAlpha&>(m_quad).draw(color, 1.f, rect); m_quad.draw(color, 1.f, rect);
} }
} // namespace urde } // namespace urde

2
Runtime/GuiSys/CSplashScreen.hpp
View File

@ -24,7 +24,7 @@ private:
public: public:
explicit CSplashScreen(ESplashScreen); explicit CSplashScreen(ESplashScreen);
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
void Draw() const override; void Draw() override;
}; };
} // namespace urde } // namespace urde

2
Runtime/MP1/CCredits.cpp
View File

@ -10,7 +10,7 @@ CIOWin::EMessageReturn CCredits::OnMessage(const CArchitectureMessage& msg, CArc
return EMessageReturn::Normal; return EMessageReturn::Normal;
} }
void CCredits::Draw() const { void CCredits::Draw() {
SCOPED_GRAPHICS_DEBUG_GROUP("CCredits::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CCredits::Draw", zeus::skGreen);
} }

2
Runtime/MP1/CCredits.hpp
View File

@ -9,7 +9,7 @@ public:
CCredits(); CCredits();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override { return false; } bool GetIsContinueDraw() const override { return false; }
void Draw() const override; void Draw() override;
}; };
} // namespace urde::MP1 } // namespace urde::MP1

5
Runtime/MP1/CFrontEndUI.cpp
View File

@ -1906,9 +1906,10 @@ void CFrontEndUI::CompleteStateTransition() {
void CFrontEndUI::HandleDebugMenuReturnValue(CGameDebug::EReturnValue val, CArchitectureQueue& queue) {} void CFrontEndUI::HandleDebugMenuReturnValue(CGameDebug::EReturnValue val, CArchitectureQueue& queue) {}
void CFrontEndUI::Draw() const { void CFrontEndUI::Draw() {
if (x14_phase < EPhase::DisplayFrontEnd) if (x14_phase < EPhase::DisplayFrontEnd) {
return; return;
}
SCOPED_GRAPHICS_DEBUG_GROUP("CFrontEndUI::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CFrontEndUI::Draw", zeus::skGreen);
if (xec_emuFrme) { if (xec_emuFrme) {

2
Runtime/MP1/CFrontEndUI.hpp
View File

@ -385,7 +385,7 @@ public:
void StartStateTransition(EScreen screen); void StartStateTransition(EScreen screen);
void CompleteStateTransition(); void CompleteStateTransition();
void HandleDebugMenuReturnValue(CGameDebug::EReturnValue val, CArchitectureQueue& queue); void HandleDebugMenuReturnValue(CGameDebug::EReturnValue val, CArchitectureQueue& queue);
void Draw() const override; void Draw() override;
void UpdateMovies(float dt); void UpdateMovies(float dt);
bool PumpMovieLoad(); bool PumpMovieLoad();
void ProcessUserInput(const CFinalInput& input, CArchitectureQueue& queue); void ProcessUserInput(const CFinalInput& input, CArchitectureQueue& queue);

11
Runtime/MP1/CMFGame.cpp
View File

@ -193,9 +193,10 @@ void CMFGame::Touch() {
player.GetMorphBall()->TouchModel(*x14_stateManager); player.GetMorphBall()->TouchModel(*x14_stateManager);
} }
void CMFGame::Draw() const { void CMFGame::Draw() {
if (!x2a_24_initialized) if (!x2a_24_initialized) {
return; return;
}
SCOPED_GRAPHICS_DEBUG_GROUP("CMFGame::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CMFGame::Draw", zeus::skGreen);
const_cast<CMFGame&>(*this).Touch(); const_cast<CMFGame&>(*this).Touch();
@ -210,8 +211,8 @@ void CMFGame::Draw() const {
x18_guiManager->Draw(*x14_stateManager); x18_guiManager->Draw(*x14_stateManager);
if (x1c_flowState == EGameFlowState::CinematicSkip) { if (x1c_flowState == EGameFlowState::CinematicSkip) {
float c = std::min(1.f, 1.f - x20_cineSkipTime); const float c = std::min(1.f, 1.f - x20_cineSkipTime);
const_cast<CColoredQuadFilter&>(m_fadeToBlack).draw(zeus::CColor{c, c, c, c}); m_fadeToBlack.draw(zeus::CColor{c, c, c, c});
} }
} }
@ -364,7 +365,7 @@ CIOWin::EMessageReturn CMFGameLoader::OnMessage(const CArchitectureMessage& msg,
return EMessageReturn::Exit; return EMessageReturn::Exit;
} }
void CMFGameLoader::Draw() const { void CMFGameLoader::Draw() {
SCOPED_GRAPHICS_DEBUG_GROUP("CMFGameLoader::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CMFGameLoader::Draw", zeus::skGreen);
g_GameState->GetWorldTransitionManager()->Draw(); g_GameState->GetWorldTransitionManager()->Draw();
} }

4
Runtime/MP1/CMFGame.hpp
View File

@ -43,7 +43,7 @@ public:
~CMFGame() override; ~CMFGame() override;
CIOWin::EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override; CIOWin::EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override;
void Touch(); void Touch();
void Draw() const override; void Draw() override;
void PlayerDied(); void PlayerDied();
void UnpauseGame(); void UnpauseGame();
void EnterMessageScreen(float time); void EnterMessageScreen(float time);
@ -72,7 +72,7 @@ public:
CMFGameLoader(); CMFGameLoader();
~CMFGameLoader() override; ~CMFGameLoader() override;
EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override; EMessageReturn OnMessage(const CArchitectureMessage& msg, CArchitectureQueue& queue) override;
void Draw() const override; void Draw() override;
}; };
} // namespace MP1 } // namespace MP1

2
Runtime/MP1/CMainFlow.hpp
View File

@ -14,7 +14,7 @@ public:
void AdvanceGameState(CArchitectureQueue& queue) override; void AdvanceGameState(CArchitectureQueue& queue) override;
void SetGameState(EClientFlowStates state, CArchitectureQueue& queue) override; void SetGameState(EClientFlowStates state, CArchitectureQueue& queue) override;
bool GetIsContinueDraw() const override { return false; } bool GetIsContinueDraw() const override { return false; }
void Draw() const override {} void Draw() override {}
}; };
} // namespace MP1 } // namespace MP1

13
Runtime/MP1/CSlideShow.cpp
View File

@ -124,18 +124,19 @@ CIOWin::EMessageReturn CSlideShow::OnMessage(const CArchitectureMessage& msg, CA
return EMessageReturn::Exit; return EMessageReturn::Exit;
} }
void CSlideShow::SSlideData::Draw() const { void CSlideShow::SSlideData::Draw() {
if (!IsLoaded()) if (!IsLoaded()) {
return; return;
}
zeus::CRectangle rect; const zeus::CRectangle rect;
const_cast<CTexturedQuadFilterAlpha&>(*m_texQuad).draw(x30_mulColor, 1.f, rect); m_texQuad->draw(x30_mulColor, 1.f, rect);
zeus::CVector2f centeredOffset((x28_canvasSize.x() - m_texQuad->GetTex()->GetWidth()) * 0.5f, const zeus::CVector2f centeredOffset((x28_canvasSize.x() - m_texQuad->GetTex()->GetWidth()) * 0.5f,
(x28_canvasSize.y() - m_texQuad->GetTex()->GetHeight()) * 0.5f); (x28_canvasSize.y() - m_texQuad->GetTex()->GetHeight()) * 0.5f);
} }
void CSlideShow::Draw() const { void CSlideShow::Draw() {
SCOPED_GRAPHICS_DEBUG_GROUP("CSlideShow::Draw", zeus::skGreen); SCOPED_GRAPHICS_DEBUG_GROUP("CSlideShow::Draw", zeus::skGreen);
if (x14_phase == Phase::Five) { if (x14_phase == Phase::Five) {
x5c_slideA.Draw(); x5c_slideA.Draw();

4
Runtime/MP1/CSlideShow.hpp
View File

@ -37,7 +37,7 @@ public:
void SetTexture(const TLockedToken<CTexture>& tex) { m_texQuad.emplace(EFilterType::Blend, tex); } void SetTexture(const TLockedToken<CTexture>& tex) { m_texQuad.emplace(EFilterType::Blend, tex); }
bool IsLoaded() const { return m_texQuad && m_texQuad->GetTex().IsLoaded(); } bool IsLoaded() const { return m_texQuad && m_texQuad->GetTex().IsLoaded(); }
void Draw() const; void Draw();
}; };
private: private:
@ -110,7 +110,7 @@ public:
CSlideShow(); CSlideShow();
EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override; EMessageReturn OnMessage(const CArchitectureMessage&, CArchitectureQueue&) override;
bool GetIsContinueDraw() const override { return false; } bool GetIsContinueDraw() const override { return false; }
void Draw() const override; void Draw() override;
static u32 SlideShowGalleryFlags(); static u32 SlideShowGalleryFlags();
}; };