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

Utility/Mesh: Replace scale by transform matrix

Browse Source 
Former-commit-id: 5f1d121a44a86fac59e32b993a015c4e0d464618 [formerly 2ba88d2c6c0a6913fee3d8945ab5870b163d654a]
Former-commit-id: 84b306c8bf7abaee0161eb4a8e4e2d46da7698ac
This commit is contained in:
Lynix
2016-06-09 08:46:44 +02:00
parent fc5be0d70b
commit 33dbf6ffa0
7 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Assimp/Plugin.cpp
View File

@@ -209,7 +209,7 @@ bool Load(Mesh* mesh, Stream& stream, const MeshParams& parameters)
aiVector3D tangent = (iMesh->HasTangentsAndBitangents()) ? iMesh->mTangents[j] : aiVector3D(0.f, 1.f, 0.f);
aiVector3D uv = (iMesh->HasTextureCoords(0)) ? iMesh->mTextureCoords[0][j] : aiVector3D(0.f);
vertex->position = parameters.scale * Vector3f(position.x, position.y, position.z);
vertex->position = parameters.matrix * Vector3f(position.x, position.y, position.z);
vertex->normal.Set(normal.x, normal.y, normal.z);
vertex->tangent.Set(tangent.x, tangent.y, tangent.z);
vertex->uv.Set(uv.x, uv.y);