sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE Animations: Making the play modes for the Acton Actuator behave more like they have in the past. The only one that still needs work now is Flipper. Property, Loop End, Loop Stop, Play, and Ping Pong should all now be behaving as they used to.

Browse Source
This commit is contained in:
Mitchell Stokes 2011-06-23 22:00:54 +00:00
parent 545bf50e1d
commit 0fbca841ef
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
source/gameengine/Converter/BL_ActionActuator.cpp
View File

@ -189,17 +189,28 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
obj->SetActionFrame(m_layer, m_localtime);
}
else if (m_is_going && bNegativeEvent)
{
m_is_going = false;
if (!m_end_reset)
{
if (m_playtype == ACT_ACTION_LOOP_STOP)
{
obj->StopAction(m_layer);
return false;
}
if (!m_end_reset)
{
obj->StopAction(m_layer);
return false;
}
m_localtime = obj->GetActionFrame(m_layer);
obj->StopAction(m_layer); // Stop the action after getting the frame
m_localtime = obj->GetActionFrame(m_layer);
obj->StopAction(m_layer); // Stop the action after getting the frame
}
else if (m_playtype == ACT_ACTION_LOOP_END)
{
// Convert into a play and let it finish
obj->PlayAction(m_action->id.name+2, start, end, m_layer, 0, BL_Action::ACT_MODE_PLAY, 0, m_ipo_flags);
obj->SetActionFrame(m_layer, m_localtime);
return true;
}
m_is_going = false;
}
// Handle a frame property if it's defined
@ -214,13 +225,11 @@ bool BL_ActionActuator::Update(double curtime, bool frame)
newval->Release();
}
if (m_playtype == ACT_ACTION_FROM_PROP)
{
return true;
}
// Handle a finished animation
else if (m_is_going && obj->IsActionDone(m_layer))
if (m_is_going && obj->IsActionDone(m_layer))
{
m_is_going = false;
obj->StopAction(m_layer);
return false;
}