sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading of MD5 

Former-commit-id: 169cc42b3cd41e62ccdd4095acc8383f15df2de9
This commit is contained in:
Gawaboumga 2016-05-30 14:26:32 +02:00
parent 36c1ef1b97
commit c3d3ad20ac
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Nazara/Utility/Animation.cpp
View File

@ -37,6 +37,8 @@ namespace Nz
Animation::~Animation() Animation::~Animation()
{ {
OnAnimationRelease(this); OnAnimationRelease(this);
Destroy();
} }
bool Animation::AddSequence(const Sequence& sequence) bool Animation::AddSequence(const Sequence& sequence)

6
src/Nazara/Utility/Formats/MD5AnimParser.cpp
View File

@ -285,7 +285,8 @@ namespace Nz
if (!Advance()) if (!Advance())
return false; return false;
if (std::sscanf(&m_currentLine[0], "( %f %f %f ) ( %f %f %f )", &m_joints[i].bindPos.x, &m_joints[i].bindPos.y, &m_joints[i].bindPos.z, // Space is important for the buffer of \n
if (std::sscanf(&m_currentLine[0], " ( %f %f %f ) ( %f %f %f )", &m_joints[i].bindPos.x, &m_joints[i].bindPos.y, &m_joints[i].bindPos.z,
&m_joints[i].bindOrient.x, &m_joints[i].bindOrient.y, &m_joints[i].bindOrient.z) != 6) &m_joints[i].bindOrient.x, &m_joints[i].bindOrient.y, &m_joints[i].bindOrient.z) != 6)
{ {
UnrecognizedLine(true); UnrecognizedLine(true);
@ -324,7 +325,8 @@ namespace Nz
return false; return false;
Vector3f min, max; Vector3f min, max;
if (std::sscanf(&m_currentLine[0], "( %f %f %f ) ( %f %f %f )", &min.x, &min.y, &min.z, &max.x, &max.y, &max.z) != 6) // Space is important for the buffer of \n
if (std::sscanf(&m_currentLine[0], " ( %f %f %f ) ( %f %f %f )", &min.x, &min.y, &min.z, &max.x, &max.y, &max.z) != 6)
{ {
UnrecognizedLine(true); UnrecognizedLine(true);
return false; return false;