Utility/Mesh: Replace scale by transform matrix

Former-commit-id: b02de61fe0213f5fdd074dfa868db415e9c770c3 [formerly e185f2b410f2a3e04a0f11be28665cf6e8dcb617] Former-commit-id: d0c7e88fe2b5f8a4aa97640d050751def83f3783
2016-06-09 08:46:44 +02:00
parent f9d6cfcf07
commit 63ac80c7ff
7 changed files with 18 additions and 17 deletions
--- a/src/Nazara/Utility/Mesh.cpp
+++ b/src/Nazara/Utility/Mesh.cpp
@@ -39,9 +39,9 @@ namespace Nz
 			return false;
 		}

-		if (scale == Vector3f::Zero())
+		if (matrix == Matrix4f::Zero())
 		{
-			NazaraError("Invalid scale");
+			NazaraError("Invalid matrix");
 			return false;
 		}

@@ -111,7 +111,7 @@ namespace Nz
 		VertexBufferRef vertexBuffer;

 		Matrix4f matrix(primitive.matrix);
-		matrix.ApplyScale(params.scale);
+		matrix *= params.matrix;

 		VertexDeclaration* declaration = VertexDeclaration::Get(VertexLayout_XYZ_Normal_UV_Tangent);