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

Fixed last commit 

Thanks to Raakz for his patience


Former-commit-id: 4b423f3d271fcbdc3e33937e8170843681a3b096
This commit is contained in:
Lynix 2014-03-01 12:55:43 +01:00
parent 4cd0ece11e
commit edaac1ded4
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Graphics/Loaders/Mesh/Loader.cpp
View File

@ -66,8 +66,6 @@ namespace
if (material->LoadFromFile(mat, parameters.material)) if (material->LoadFromFile(mat, parameters.material))
{ {
material->SetShader(parameters.shaderName);
model->SetMaterial(i, material.get()); model->SetMaterial(i, material.get());
material.release(); material.release();
} }

2
src/Nazara/Graphics/Loaders/OBJ/Loader.cpp
View File

@ -212,7 +212,7 @@ namespace
std::unique_ptr<NzMaterial> material(new NzMaterial); std::unique_ptr<NzMaterial> material(new NzMaterial);
material->SetPersistent(false); material->SetPersistent(false);
material->SetShader(parameters.shaderName); material->SetShader(parameters.material.shaderName);
nzUInt8 alphaValue = static_cast<nzUInt8>(mtlMat->alpha*255.f); nzUInt8 alphaValue = static_cast<nzUInt8>(mtlMat->alpha*255.f);

4
src/Nazara/Graphics/Model.cpp
View File

@ -6,7 +6,6 @@
#include <Nazara/Graphics/AbstractRenderQueue.hpp> #include <Nazara/Graphics/AbstractRenderQueue.hpp>
#include <Nazara/Graphics/Camera.hpp> #include <Nazara/Graphics/Camera.hpp>
#include <Nazara/Graphics/Config.hpp> #include <Nazara/Graphics/Config.hpp>
#include <Nazara/Renderer/UberShaderLibrary.hpp>
#include <Nazara/Utility/SkeletalMesh.hpp> #include <Nazara/Utility/SkeletalMesh.hpp>
#include <Nazara/Utility/StaticMesh.hpp> #include <Nazara/Utility/StaticMesh.hpp>
#include <memory> #include <memory>
@ -25,9 +24,6 @@ bool NzModelParameters::IsValid() const
if (loadMaterials && !material.IsValid()) if (loadMaterials && !material.IsValid())
return false; return false;
if (!NzUberShaderLibrary::Has(shaderName))
return false;
return mesh.IsValid(); return mesh.IsValid();
} }