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

CGraphics: Make skDefaultAmbientColor constexpr 

Same behavior, no runtime initializer.
This commit is contained in:
Lioncash 2020-06-12 16:19:57 -04:00
parent e8a20933de
commit bf9233779a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Render/CGraphics.cpp
View File

@ -22,7 +22,6 @@ CGraphics::SLightBlock CGraphics::sLightBlock;
CGraphics::ELightingMode CGraphics::sLightMode; CGraphics::ELightingMode CGraphics::sLightMode;
uint32 CGraphics::sNumLights; uint32 CGraphics::sNumLights;
const CColor CGraphics::skDefaultAmbientColor = CColor(0.5f, 0.5f, 0.5f, 0.0f);
CColor CGraphics::sAreaAmbientColor = CColor::skTransparentBlack; CColor CGraphics::sAreaAmbientColor = CColor::skTransparentBlack;
float CGraphics::sWorldLightMultiplier; float CGraphics::sWorldLightMultiplier;
CLight CGraphics::sDefaultDirectionalLights[3] = { CLight CGraphics::sDefaultDirectionalLights[3] = {

2
src/Core/Render/CGraphics.h
View File

@ -87,7 +87,7 @@ public:
enum class ELightingMode { None, Basic, World }; enum class ELightingMode { None, Basic, World };
static ELightingMode sLightMode; static ELightingMode sLightMode;
static uint32 sNumLights; static uint32 sNumLights;
static const CColor skDefaultAmbientColor; static constexpr CColor skDefaultAmbientColor{0.5f, 0.5f, 0.5f, 0.0f};
static CColor sAreaAmbientColor; static CColor sAreaAmbientColor;
static float sWorldLightMultiplier; static float sWorldLightMultiplier;
static CLight sDefaultDirectionalLights[3]; static CLight sDefaultDirectionalLights[3];