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

Fixed mesh centering in a better way 

Former-commit-id: 859dfdad322da045fecf32ea7c551f7fb436f135
This commit is contained in:
Lynix 2015-01-25 23:57:28 +01:00
parent 1219a8053c
commit cabc4e40bc
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,9 +163,6 @@ namespace
subMesh->SetMaterialIndex(meshes[i].material); subMesh->SetMaterialIndex(meshes[i].material);
subMesh->SetPrimitiveMode(nzPrimitiveMode_TriangleList); subMesh->SetPrimitiveMode(nzPrimitiveMode_TriangleList);
if (parameters.mesh.center)
subMesh->Center();
// Ce que nous pouvons générer dépend des données à disposition (par exemple les tangentes nécessitent des coordonnées de texture) // Ce que nous pouvons générer dépend des données à disposition (par exemple les tangentes nécessitent des coordonnées de texture)
if (hasNormals && hasTexCoords) if (hasNormals && hasTexCoords)
subMesh->GenerateTangents(); subMesh->GenerateTangents();
@ -176,9 +173,11 @@ namespace
mesh->AddSubMesh(meshes[i].name + '_' + materials[meshes[i].material], subMesh); mesh->AddSubMesh(meshes[i].name + '_' + materials[meshes[i].material], subMesh);
} }
mesh->SetMaterialCount(parser.GetMaterialCount()); mesh->SetMaterialCount(parser.GetMaterialCount());
if (parameters.mesh.center)
mesh->Recenter();
model->SetMesh(mesh); model->SetMesh(mesh);
// On charge les matériaux si demandé // On charge les matériaux si demandé

6
src/Nazara/Utility/Loaders/MD2/Loader.cpp
View File

@ -225,11 +225,11 @@ namespace
subMesh->SetIndexBuffer(indexBuffer); subMesh->SetIndexBuffer(indexBuffer);
subMesh->SetMaterialIndex(0); subMesh->SetMaterialIndex(0);
if (parameters.center)
subMesh->Center();
mesh->AddSubMesh(subMesh); mesh->AddSubMesh(subMesh);
if (parameters.center)
mesh->Recenter();
return true; return true;
} }
} }

6
src/Nazara/Utility/Loaders/MD5Mesh/Loader.cpp
View File

@ -278,14 +278,14 @@ namespace
subMesh->GenerateNormalsAndTangents(); subMesh->GenerateNormalsAndTangents();
subMesh->SetMaterialIndex(i); subMesh->SetMaterialIndex(i);
if (parameters.center)
subMesh->Center();
mesh->AddSubMesh(subMesh); mesh->AddSubMesh(subMesh);
// Material // Material
mesh->SetMaterial(i, baseDir + md5Mesh.shader); mesh->SetMaterial(i, baseDir + md5Mesh.shader);
} }
if (parameters.center)
mesh->Recenter();
} }
return true; return true;