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

CModel: Mark CModelFlag instances as constexpr where applicable

Browse Source 
Allows more runtime initializes to potentially be elided.
This commit is contained in:
Lioncash
2020-04-11 16:53:59 -04:00
parent 7055b6983f
commit 75c07677ed
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/Weapon/CGunWeapon.cpp
View File

@@ -271,17 +271,17 @@ void CGunWeapon::Draw(bool drawSuitArm, const CStateManager& mgr, const zeus::CT
if (mgr.GetThermalDrawFlag() == EThermalDrawFlag::Hot && x200_beamId != CPlayerState::EBeamId::Ice) {
/* Hot Draw */
zeus::CColor mulColor(flags.x4_color.a(), flags.x4_color.a());
zeus::CColor addColor(0.25f, 0.25f);
const zeus::CColor mulColor(flags.x4_color.a(), flags.x4_color.a());
constexpr zeus::CColor addColor(0.25f, 0.25f);
if (x218_29_drawHologram) {
DrawHologram(mgr, xf, flags);
} else {
CModelFlags useFlags(0, 0, 3, zeus::skWhite);
constexpr CModelFlags useFlags(0, 0, 3, zeus::skWhite);
x10_solidModelData->RenderThermal(xf, mulColor, addColor, useFlags);
}
if (drawSuitArm && xb0_suitArmModelData) {
CModelFlags useFlags(0, 0, 3, zeus::skWhite);
constexpr CModelFlags useFlags(0, 0, 3, zeus::skWhite);
xb0_suitArmModelData->RenderThermal(xf, mulColor, addColor, useFlags);
}
} else {