From 35b74164370e138cde1e3b7b5d62048f795ec278 Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Tue, 29 Sep 2009 10:39:17 +0000 Subject: [PATCH] FIX: gcc's complaints about OgreImporter. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@486 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/OgreImporter.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/OgreImporter.cpp b/code/OgreImporter.cpp index 3161a9140..a1dddb822 100644 --- a/code/OgreImporter.cpp +++ b/code/OgreImporter.cpp @@ -874,17 +874,18 @@ aiNode* OgreImporter::CreateAiNodeFromBone(int BoneId, const std::vector & void Bone::CalculateWorldToBoneSpaceMatrix(vector &Bones) { //Calculate the matrix for this bone: + aiMatrix4x4 t0,t1; if(-1==ParentId) { - WorldToBoneSpace= aiMatrix4x4::Translation(Position, aiMatrix4x4()) - * aiMatrix4x4::Rotation(RotationAngle, RotationAxis, aiMatrix4x4()) + WorldToBoneSpace= aiMatrix4x4::Translation(Position, t0) + * aiMatrix4x4::Rotation(RotationAngle, RotationAxis, t1) ; } else { WorldToBoneSpace= Bones[ParentId].WorldToBoneSpace - * aiMatrix4x4::Translation(Position, aiMatrix4x4()) - * aiMatrix4x4::Rotation(RotationAngle, RotationAxis, aiMatrix4x4()) + * aiMatrix4x4::Translation(Position, t0) + * aiMatrix4x4::Rotation(RotationAngle, RotationAxis, t1) ; }