ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Discard ThreeDAnimation with no IPO

Browse Source
This commit is contained in:
Benau 2018-10-12 01:20:57 +08:00
parent 359c468604
commit 3725013135
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/animations/animation_base.cpp
View File

@ -41,9 +41,10 @@ AnimationBase::AnimationBase(const XMLNode &node)
m_playing = true; m_playing = true;
m_anim_type = ATT_CYCLIC; m_anim_type = ATT_CYCLIC;
if (m_all_ipos.size() == 0) // this will happen for some separate but non-animated objects if (m_all_ipos.size() == 0)
{ {
m_playing = false; // Throw to avoid construction completely
throw std::runtime_error("Empty IPO, discard.");
} }
reset(); reset();
calculateAnimationDuration(); calculateAnimationDuration();

7
src/tracks/track_object.cpp
View File

@ -370,9 +370,16 @@ void TrackObject::init(const XMLNode &xml_node, scene::ISceneNode* parent,
if (type == "animation" || xml_node.hasChildNamed("curve")) if (type == "animation" || xml_node.hasChildNamed("curve"))
{
try
{ {
m_animator = new ThreeDAnimation(xml_node, this); m_animator = new ThreeDAnimation(xml_node, this);
} }
catch (std::exception& e)
{
Log::debug("TrackObject", e.what());
}
}
reset(); reset();