AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-10 15:47:43 +00:00
Code Issues Projects Releases Wiki Activity

CScanDisplay: Remove use of const_cast

Browse Source 
The draw function is essentially not fully const in behavior, so we can
remove the const qualifiers where necessary.
This commit is contained in:
Lioncash
2020-03-29 21:44:07 -04:00
parent 2d8e94911a
commit 0d3bab4c14
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Runtime/GuiSys/CScanDisplay.cpp
View File

@@ -35,20 +35,23 @@ void CScanDisplay::CDataDot::Update(float dt) {
}
}
void CScanDisplay::CDataDot::Draw(const zeus::CColor& col, float radius) const {
if (x24_alpha == 0.f)
void CScanDisplay::CDataDot::Draw(const zeus::CColor& col, float radius) {
if (x24_alpha == 0.f) {
return;
}
if (x0_dotState != EDotState::Hidden) {
zeus::CTransform xf = zeus::CTransform::Translate(xc_curPos.x(), 0.f, xc_curPos.y());
const zeus::CTransform xf = zeus::CTransform::Translate(xc_curPos.x(), 0.f, xc_curPos.y());
CGraphics::SetModelMatrix(xf);
zeus::CColor useColor = col;
useColor.a() *= x24_alpha;
CTexturedQuadFilter::Vert verts[4] = {{{-radius, 0.f, radius}, {0.f, 1.f}},
{{-radius, 0.f, -radius}, {0.f, 0.f}},
{{radius, 0.f, radius}, {1.f, 1.f}},
{{radius, 0.f, -radius}, {1.f, 0.f}}};
const_cast<CTexturedQuadFilter&>(m_quad).drawVerts(useColor, verts);
const CTexturedQuadFilter::Vert verts[4] = {
{{-radius, 0.f, radius}, {0.f, 1.f}},
{{-radius, 0.f, -radius}, {0.f, 0.f}},
{{radius, 0.f, radius}, {1.f, 1.f}},
{{radius, 0.f, -radius}, {1.f, 0.f}},
};
m_quad.drawVerts(useColor, verts);
}
}
@@ -418,16 +421,18 @@ void CScanDisplay::Update(float dt, float scanningTime) {
}
}
void CScanDisplay::Draw() const {
if (!x0_dataDot.IsLoaded())
void CScanDisplay::Draw() {
if (!x0_dataDot.IsLoaded()) {
return;
}
// No Z-test or write
g_Renderer->SetViewportOrtho(true, -4096.f, 4096.f);
// Additive alpha
float vpRatio = g_Viewport.xc_height / 480.f;
for (const CDataDot& dot : xbc_dataDots)
const float vpRatio = g_Viewport.xc_height / 480.f;
for (CDataDot& dot : xbc_dataDots) {
dot.Draw(g_tweakGuiColors->GetScanDataDotColor(), g_tweakGui->GetScanDataDotRadius() * vpRatio);
}
}
} // namespace urde