zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make scale value optional in keyframes as well. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2830 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2009-11-10 14:46:03 +00:00
parent 1d23fa03a4
commit 98ef47c1c9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/COgreMeshFileLoader.cpp
View File

@ -23,6 +23,8 @@ namespace irr
namespace scene
{
namespace
{
enum OGRE_CHUNKS
{
// Main Chunks
@ -58,6 +60,7 @@ namespace scene
COGRE_GEOMETRY_VERTEX_BUFFER= 0x5200,
COGRE_GEOMETRY_VERTEX_BUFFER_DATA= 0x5210
};
}
//! Constructor
COgreMeshFileLoader::COgreMeshFileLoader(io::IFileSystem* fs, video::IVideoDriver* driver)
@ -1422,8 +1425,13 @@ bool COgreMeshFileLoader::loadSkeleton(io::IReadFile* meshFile, const core::stri
keyframe.Time+=animationTotal;
readVector(file, data, keyframe.Position);
readQuaternion(file, data, keyframe.Orientation);
readVector(file, data, keyframe.Scale);
keyframe.Scale *= 1.f;
if (data.read<data.header.length)
{
readVector(file, data, keyframe.Scale);
keyframe.Scale.X *= -1.f;
}
else
keyframe.Scale=core::vector3df(1,1,1);
keyframe.BoneID=bone;
#ifdef IRR_OGRE_LOADER_DEBUG
// os::Printer::log("Keyframe time", core::stringc(keyframe.Time));