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

Utility/OBJSaver: Fix multiple materials saving 

Former-commit-id: 18d8c235a58fc627bcc4ecbbe5cfcd8fcdf00014 [formerly 358b88c21f73a36051baed60a943643c3ae9b03c]
Former-commit-id: c1f89cb0f375db6c68048f0bc8e857306b6ca034
This commit is contained in:
Lynix 2016-07-17 21:10:20 +02:00
parent c7355ad166
commit ef7759468a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Utility/Formats/MD2Loader.cpp
View File

@ -102,7 +102,7 @@ namespace Nz
stream.Read(skin, 68*sizeof(char));
ParameterList matData;
matData.SetParameter(MaterialData::CustomDefined, true);
matData.SetParameter(MaterialData::CustomDefined);
matData.SetParameter(MaterialData::DiffuseTexturePath, baseDir + skin);
mesh->SetMaterialData(i, std::move(matData));

5
src/Nazara/Utility/Formats/OBJSaver.cpp
View File

@ -122,7 +122,7 @@ namespace Nz
bool bValue;
String strVal;
if (matData.GetBooleanParameter(MaterialData::CustomDefined, &bValue) && bValue)
if (matData.HasParameter(MaterialData::CustomDefined))
{
Color colorVal;
float fValue;
@ -160,9 +160,10 @@ namespace Nz
const StaticMesh* staticMesh = static_cast<const StaticMesh*>(mesh.GetSubMesh(i));
std::size_t triangleCount = staticMesh->GetTriangleCount();
std::size_t vertexCount = staticMesh->GetVertexCount();
meshes[i].faces.resize(triangleCount);
meshes[i].material = staticMesh->GetMaterialIndex();
meshes[i].name = "mesh_" + String::Number(i);
meshes[i].vertices.resize(triangleCount * 3);
{