Utility/Mesh: Replace scale by transform matrix

Former-commit-id: 28cf57d1fe300b78e60c5f9301678a25533df29f [formerly d7b8edd11e99de396d40cf09c58cb94c5e03015c] Former-commit-id: e5915c2a5795900077bdb5229638962fade7f352
2016-06-09 08:46:44 +02:00
parent 48a7ba0114
commit b0c4bcff67
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);