From 4cd0ece11e119d3de3e21ce6a320799a146b0035 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 1 Mar 2014 12:25:11 +0100 Subject: [PATCH] ModelParameters no longer contains shaderName field Instead it will now set the shaderName field of the material field to PhongLighting Former-commit-id: 55b7f5500c7dc2c147f32a7c214a8e75ea434ff1 --- include/Nazara/Graphics/Model.hpp | 3 ++- src/Nazara/Graphics/Model.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/Nazara/Graphics/Model.hpp b/include/Nazara/Graphics/Model.hpp index a7794a808..1db0e98e4 100644 --- a/include/Nazara/Graphics/Model.hpp +++ b/include/Nazara/Graphics/Model.hpp @@ -17,12 +17,13 @@ struct NAZARA_API NzModelParameters { + NzModelParameters(); + bool loadAnimation = true; bool loadMaterials = true; NzAnimationParams animation; NzMaterialParams material; NzMeshParams mesh; - NzString shaderName = "PhongLighting"; bool IsValid() const; }; diff --git a/src/Nazara/Graphics/Model.cpp b/src/Nazara/Graphics/Model.cpp index 13ebb23f4..23cd89b5e 100644 --- a/src/Nazara/Graphics/Model.cpp +++ b/src/Nazara/Graphics/Model.cpp @@ -12,6 +12,11 @@ #include #include +NzModelParameters::NzModelParameters() +{ + material.shaderName = "PhongLighting"; +} + bool NzModelParameters::IsValid() const { if (loadAnimation && !animation.IsValid())