sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Make Color constexpr

Browse Source
This commit is contained in:
SirLynix
2022-12-29 12:13:00 +01:00
parent 3d88746060
commit 9a553e5e9d
38 changed files with 227 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Graphics/PredefinedMaterials.cpp
View File

@@ -13,7 +13,7 @@ namespace Nz
{
void PredefinedMaterials::AddBasicSettings(MaterialSettings& settings)
{
settings.AddValueProperty<Color>("BaseColor", Color::White);
settings.AddValueProperty<Color>("BaseColor", Color::White());
settings.AddValueProperty<bool>("AlphaTest", false);
settings.AddValueProperty<float>("AlphaTestThreshold", 0.2f);
settings.AddTextureProperty("BaseColorMap", ImageType::E2D);
@@ -43,8 +43,8 @@ namespace Nz
void PredefinedMaterials::AddPhongSettings(MaterialSettings& settings)
{
settings.AddValueProperty<Color>("AmbientColor", Color::Black);
settings.AddValueProperty<Color>("SpecularColor", Color::White);
settings.AddValueProperty<Color>("AmbientColor", Color::Black());
settings.AddValueProperty<Color>("SpecularColor", Color::White());
settings.AddValueProperty<float>("Shininess", 2.f);
settings.AddTextureProperty("EmissiveMap", ImageType::E2D);
settings.AddTextureProperty("HeightMap", ImageType::E2D);