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