TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 08:04:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #682 from Azaezel/extended_onendSequence

Browse source 
Extended onend sequence
This commit is contained in:
Daniel Buckmaster 2014-09-16 10:25:25 +10:00
commit d08e594316
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/T3D/shapeBase.cpp
View file

@ -114,11 +114,12 @@ IMPLEMENT_CALLBACK( ShapeBaseData, onTrigger, void, ( ShapeBase* obj, S32 index,
"@param index Index of the trigger that changed\n" "@param index Index of the trigger that changed\n"
"@param state New state of the trigger\n" ); "@param state New state of the trigger\n" );
IMPLEMENT_CALLBACK( ShapeBaseData, onEndSequence, void, ( ShapeBase* obj, S32 slot ), ( obj, slot ), IMPLEMENT_CALLBACK(ShapeBaseData, onEndSequence, void, (ShapeBase* obj, S32 slot, const char* name), (obj, slot, name),
"@brief Called when a thread playing a non-cyclic sequence reaches the end of the " "@brief Called when a thread playing a non-cyclic sequence reaches the end of the "
"sequence.\n\n" "sequence.\n\n"
"@param obj The ShapeBase object\n" "@param obj The ShapeBase object\n"
"@param slot Thread slot that finished playing\n" ); "@param slot Thread slot that finished playing\n"
"@param name Thread name that finished playing\n");
IMPLEMENT_CALLBACK( ShapeBaseData, onForceUncloak, void, ( ShapeBase* obj, const char* reason ), ( obj, reason ), IMPLEMENT_CALLBACK( ShapeBaseData, onForceUncloak, void, ( ShapeBase* obj, const char* reason ), ( obj, reason ),
"@brief Called when the object is forced to uncloak.\n\n" "@brief Called when the object is forced to uncloak.\n\n"
@ -2324,7 +2325,7 @@ void ShapeBase::advanceThreads(F32 dt)
st.atEnd = true; st.atEnd = true;
updateThread(st); updateThread(st);
if (!isGhost()) { if (!isGhost()) {
mDataBlock->onEndSequence_callback( this, i ); mDataBlock->onEndSequence_callback(this, i, this->getThreadSequenceName(i));
} }
} }

2
Engine/source/T3D/shapeBase.h
View file

@ -648,7 +648,7 @@ public:
DECLARE_CALLBACK( void, onCollision, ( ShapeBase* obj, SceneObject* collObj, VectorF vec, F32 len ) ); DECLARE_CALLBACK( void, onCollision, ( ShapeBase* obj, SceneObject* collObj, VectorF vec, F32 len ) );
DECLARE_CALLBACK( void, onDamage, ( ShapeBase* obj, F32 delta ) ); DECLARE_CALLBACK( void, onDamage, ( ShapeBase* obj, F32 delta ) );
DECLARE_CALLBACK( void, onTrigger, ( ShapeBase* obj, S32 index, bool state ) ); DECLARE_CALLBACK( void, onTrigger, ( ShapeBase* obj, S32 index, bool state ) );
DECLARE_CALLBACK( void, onEndSequence, ( ShapeBase* obj, S32 slot ) ); DECLARE_CALLBACK(void, onEndSequence, (ShapeBase* obj, S32 slot, const char* name));
DECLARE_CALLBACK( void, onForceUncloak, ( ShapeBase* obj, const char* reason ) ); DECLARE_CALLBACK( void, onForceUncloak, ( ShapeBase* obj, const char* reason ) );
/// @} /// @}
}; };