Utility/Mesh: Replace scale by transform matrix

Former-commit-id: 5f1d121a44a86fac59e32b993a015c4e0d464618 [formerly 2ba88d2c6c0a6913fee3d8945ab5870b163d654a] Former-commit-id: 84b306c8bf7abaee0161eb4a8e4e2d46da7698ac
2016-06-09 08:46:44 +02:00
parent fc5be0d70b
commit 33dbf6ffa0
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);