AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 00:17:13 +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

6
Runtime/Weapon/CPlayerGun.cpp
View File

@@ -109,15 +109,15 @@ constexpr std::array chargeShakeTbl{
constexpr CMaterialFilter sAimFilter =
CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::ProjectilePassthrough});
const std::array<CModelFlags, 4> kThermalFlags{{
constexpr std::array<CModelFlags, 4> kThermalFlags{{
{0, 0, 3, zeus::skWhite},
{5, 0, 3, zeus::CColor(0.f, 0.5f)},
{0, 0, 3, zeus::skWhite},
{0, 0, 3, zeus::skWhite},
}};
const CModelFlags kHandThermalFlag = {7, 0, 3, zeus::skWhite};
const CModelFlags kHandHoloFlag = {1, 0, 3, zeus::CColor(0.75f, 0.5f, 0.f, 1.f)};
constexpr CModelFlags kHandThermalFlag{7, 0, 3, zeus::skWhite};
constexpr CModelFlags kHandHoloFlag{1, 0, 3, zeus::CColor(0.75f, 0.5f, 0.f, 1.f)};
} // Anonymous namespace
float CPlayerGun::CMotionState::gGunExtendDistance = 0.125f;