From 786a11fc786a96ceb1a062e2ace0e1424fe718d3 Mon Sep 17 00:00:00 2001 From: Lynix Date: Tue, 31 Oct 2017 00:14:50 +0100 Subject: [PATCH] Graphics/Material: Fix missing reflection initialization --- include/Nazara/Graphics/Material.hpp | 2 +- include/Nazara/Graphics/Material.inl | 2 +- src/Nazara/Graphics/Material.cpp | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/Nazara/Graphics/Material.hpp b/include/Nazara/Graphics/Material.hpp index b509be459..77b57c87e 100644 --- a/include/Nazara/Graphics/Material.hpp +++ b/include/Nazara/Graphics/Material.hpp @@ -212,7 +212,7 @@ namespace Nz bool m_shadowCastingEnabled; float m_alphaThreshold; float m_shininess; - unsigned int m_reflectionSize; + unsigned int m_reflectionSize; static std::array s_textureUnits; static MaterialLibrary::LibraryMap s_library; diff --git a/include/Nazara/Graphics/Material.inl b/include/Nazara/Graphics/Material.inl index 2893dee97..3831519a2 100644 --- a/include/Nazara/Graphics/Material.inl +++ b/include/Nazara/Graphics/Material.inl @@ -1258,7 +1258,7 @@ namespace Nz /*! * \brief Changes reflection mode of the material * - * When reflections are enable, the material will render reflections from the object environment according to the reflection mode. + * When reflections are enabled, the material will render reflections from the object environment according to the reflection mode. * This function does change the reflection mode used by the material. * * Skyboxes reflections are the cheapest but are static and thus can't reflect other objects. diff --git a/src/Nazara/Graphics/Material.cpp b/src/Nazara/Graphics/Material.cpp index b7f2aeabe..e88ad6100 100644 --- a/src/Nazara/Graphics/Material.cpp +++ b/src/Nazara/Graphics/Material.cpp @@ -387,6 +387,7 @@ namespace Nz m_ambientColor = Color(128, 128, 128); m_diffuseColor = Color::White; m_diffuseSampler = TextureSampler(); + m_reflectionMode = ReflectionMode_Skybox; m_shadowCastingEnabled = true; m_shininess = 50.f; m_specularColor = Color::White; @@ -394,6 +395,7 @@ namespace Nz m_pipelineInfo = MaterialPipelineInfo(); m_pipelineInfo.depthBuffer = true; m_pipelineInfo.faceCulling = true; + m_reflectionSize = 256; SetShader("Basic");