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

CHudRadarInterface: Remove mutable specifiers from class members 

We can just drop the const qualifiers on the relevant member functions
to make these unnecessary.
This commit is contained in:
Lioncash 2020-04-09 21:23:47 -04:00
parent 27813e5fc3
commit 35ca901784
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/GuiSys/CHudRadarInterface.cpp
View File

@ -28,8 +28,7 @@ CHudRadarInterface::CHudRadarInterface(CGuiFrame& baseHud, CStateManager& stateM
x40_BaseWidget_RadarStuff->SetColor(g_tweakGuiColors->GetRadarStuffColor()); x40_BaseWidget_RadarStuff->SetColor(g_tweakGuiColors->GetRadarStuffColor());
} }
void CHudRadarInterface::DoDrawRadarPaint(const zeus::CVector3f& translate, float radius, void CHudRadarInterface::DoDrawRadarPaint(const zeus::CVector3f& translate, float radius, const zeus::CColor& color) {
const zeus::CColor& color) const {
radius *= 4.f; radius *= 4.f;
CRadarPaintShader::Instance& inst = m_paintInsts.emplace_back(); CRadarPaintShader::Instance& inst = m_paintInsts.emplace_back();
@ -45,7 +44,7 @@ void CHudRadarInterface::DoDrawRadarPaint(const zeus::CVector3f& translate, floa
} }
void CHudRadarInterface::DrawRadarPaint(const zeus::CVector3f& enemyPos, float radius, float alpha, void CHudRadarInterface::DrawRadarPaint(const zeus::CVector3f& enemyPos, float radius, float alpha,
const SRadarPaintDrawParms& parms) const { const SRadarPaintDrawParms& parms) {
zeus::CVector2f playerToEnemy = enemyPos.toVec2f() - parms.x0_playerPos.toVec2f(); zeus::CVector2f playerToEnemy = enemyPos.toVec2f() - parms.x0_playerPos.toVec2f();
float zDelta = std::fabs(enemyPos.z() - parms.x0_playerPos.z()); float zDelta = std::fabs(enemyPos.z() - parms.x0_playerPos.z());
@ -81,7 +80,7 @@ void CHudRadarInterface::Update(float dt, const CStateManager& mgr) {
} }
} }
void CHudRadarInterface::Draw(const CStateManager& mgr, float alpha) const { void CHudRadarInterface::Draw(const CStateManager& mgr, float alpha) {
alpha *= g_GameState->GameOptions().GetHUDAlpha() / 255.f; alpha *= g_GameState->GameOptions().GetHUDAlpha() / 255.f;
if (g_tweakGui->GetHudVisMode() == ITweakGui::EHudVisMode::Zero || !x3c_24_visibleGame || !x0_txtrRadarPaint || if (g_tweakGui->GetHudVisMode() == ITweakGui::EHudVisMode::Zero || !x3c_24_visibleGame || !x0_txtrRadarPaint ||
!x0_txtrRadarPaint.IsLoaded()) !x0_txtrRadarPaint.IsLoaded())

11
Runtime/GuiSys/CHudRadarInterface.hpp
View File

@ -33,17 +33,16 @@ class CHudRadarInterface {
bool x3c_25_visibleDebug : 1; bool x3c_25_visibleDebug : 1;
CGuiWidget* x40_BaseWidget_RadarStuff; CGuiWidget* x40_BaseWidget_RadarStuff;
CGuiCamera* x44_camera; CGuiCamera* x44_camera;
mutable CRadarPaintShader m_paintShader; CRadarPaintShader m_paintShader;
mutable std::vector<CRadarPaintShader::Instance> m_paintInsts; std::vector<CRadarPaintShader::Instance> m_paintInsts;
void DoDrawRadarPaint(const zeus::CVector3f& translate, float radius, const zeus::CColor& color) const; void DoDrawRadarPaint(const zeus::CVector3f& translate, float radius, const zeus::CColor& color);
void DrawRadarPaint(const zeus::CVector3f& enemyPos, float radius, float alpha, void DrawRadarPaint(const zeus::CVector3f& enemyPos, float radius, float alpha, const SRadarPaintDrawParms& parms);
const SRadarPaintDrawParms& parms) const;
public: public:
CHudRadarInterface(CGuiFrame& baseHud, CStateManager& stateMgr); CHudRadarInterface(CGuiFrame& baseHud, CStateManager& stateMgr);
void SetIsVisibleGame(bool v); void SetIsVisibleGame(bool v);
void Update(float dt, const CStateManager& mgr); void Update(float dt, const CStateManager& mgr);
void Draw(const CStateManager& mgr, float alpha) const; void Draw(const CStateManager& mgr, float alpha);
}; };
} // namespace urde } // namespace urde