From 49a8edef05a99f8ebec021c09a127cb57c8099d6 Mon Sep 17 00:00:00 2001 From: diiigle Date: Tue, 28 Jan 2014 21:17:39 +0100 Subject: [PATCH] #Fix -Y direction of LDraw Convert into ASSIMPs coordinate system --- code/LDrawImporter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/LDrawImporter.cpp b/code/LDrawImporter.cpp index 058924c4f..afc99619f 100644 --- a/code/LDrawImporter.cpp +++ b/code/LDrawImporter.cpp @@ -267,7 +267,7 @@ void LDrawImporter::ProcessNode(std::string file, LDrawNode* current, ColorIndex } aiMatrix4x4 *mat = new aiMatrix4x4( params[4], params[5], params[6], params[1], - params[7], params[8], params[9], params[2], + params[7], params[8], params[9], -params[2], params[10], params[11], params[12], params[3], 0.0f, 0.0f, 0.0f, 1.0f ); @@ -307,8 +307,8 @@ void LDrawImporter::ProcessNode(std::string file, LDrawNode* current, ColorIndex unsigned int index = vertices->size(); - vertices->push_back(aiVector3D(params[1], params[2], params[3])); - vertices->push_back(aiVector3D(params[4], params[5], params[6])); + vertices->push_back(aiVector3D(params[1], -params[2], params[3])); + vertices->push_back(aiVector3D(params[4], -params[5], params[6])); aiFace f = aiFace(); f.mNumIndices = command; @@ -317,7 +317,7 @@ void LDrawImporter::ProcessNode(std::string file, LDrawNode* current, ColorIndex f.mIndices[1] = index + 1; if (command == 3 || command == 4){ - vertices->push_back(aiVector3D(params[7], params[8], params[9])); + vertices->push_back(aiVector3D(params[7], -params[8], params[9])); f.mIndices[2] = index + 2; if (command == 3){ @@ -326,7 +326,7 @@ void LDrawImporter::ProcessNode(std::string file, LDrawNode* current, ColorIndex } else if (command == 4){ //it's a quad - vertices->push_back(aiVector3D(params[10], params[11], params[12])); + vertices->push_back(aiVector3D(params[10], -params[11], params[12])); f.mIndices[3] = index + 3; mesh->primitivesType = mesh->primitivesType | aiPrimitiveType_POLYGON; }