From f57ef267bdaed6c1305118c878b7a331e67a25a8 Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Tue, 10 Mar 2009 18:57:54 +0000 Subject: [PATCH] Bugfix: Collada loader now produces correct UP direction again. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@362 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/ColladaLoader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index a892a7f68..23ef44339 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -132,18 +132,18 @@ void ColladaLoader::InternReadFile( const std::string& pFile, aiScene* pScene, I // ... then fill the materials with the now adjusted settings FillMaterials(parser, pScene); - // Convert to Z_UP, if different orientation + // Convert to Y_UP, if different orientation if( parser.mUpDirection == ColladaParser::UP_X) pScene->mRootNode->mTransformation *= aiMatrix4x4( 0, -1, 0, 0, - 0, 0, -1, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 1); - else if( parser.mUpDirection == ColladaParser::UP_Y) + else if( parser.mUpDirection == ColladaParser::UP_Z) pScene->mRootNode->mTransformation *= aiMatrix4x4( 1, 0, 0, 0, - 0, 0, -1, 0, - 0, 1, 0, 0, + 0, 0, 1, 0, + 0, -1, 0, 0, 0, 0, 0, 1); // store all meshes