TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-24 14:49:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

afxEffectWrapper membervar cleanup

Browse source
This commit is contained in:
Azaezel 2018-03-29 17:46:57 -05:00
parent 0df2cf1b9d
commit b6076c55dd
36 changed files with 531 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Engine/source/afx/ea/afxEA_CollisionEvent.cpp
View file

@ -107,16 +107,16 @@ bool afxEA_CollisionEvent::ea_update(F32 dt)
afxConstraint* pos_constraint = getPosConstraint();
set_shape((pos_constraint) ? dynamic_cast<ShapeBase*>(pos_constraint->getSceneObject()) : 0);
if (choreographer && trigger_mask != 0)
if (mChoreographer && trigger_mask != 0)
{
if (triggered)
{
choreographer->setTriggerMask(trigger_mask | choreographer->getTriggerMask());
mChoreographer->setTriggerMask(trigger_mask | mChoreographer->getTriggerMask());
triggered = false;
}
else
{
choreographer->setTriggerMask(~trigger_mask & choreographer->getTriggerMask());
mChoreographer->setTriggerMask(~trigger_mask & mChoreographer->getTriggerMask());
}
}
@ -136,7 +136,7 @@ void afxEA_CollisionEvent::do_runtime_substitutions()
// clone the datablock and perform substitutions
afxCollisionEventData* orig_db = script_data;
script_data = new afxCollisionEventData(*orig_db, true);
orig_db->performSubstitutions(script_data, choreographer, group_index);
orig_db->performSubstitutions(script_data, mChoreographer, mGroup_index);
}
}
@ -162,7 +162,7 @@ void afxEA_CollisionEvent::set_shape(ShapeBase* new_shape)
void afxEA_CollisionEvent::collisionNotify(SceneObject* obj0, SceneObject* obj1, const VectorF& vel)
{
if (obj0 != shape || !choreographer || !choreographer->getDataBlock())
if (obj0 != shape || !mChoreographer || !mChoreographer->getDataBlock())
return;
if (script_data->method_name != ST_NULLSTRING)
@ -171,8 +171,8 @@ void afxEA_CollisionEvent::collisionNotify(SceneObject* obj0, SceneObject* obj1,
dSprintf(arg_buf, 256, "%g %g %g", vel.x, vel.y, vel.z);
// CALL SCRIPT afxChoreographerData::method(%spell, %obj0, %obj1, %velocity)
Con::executef(choreographer->getDataBlock(), script_data->method_name,
choreographer->getIdString(),
Con::executef(mChoreographer->getDataBlock(), script_data->method_name,
mChoreographer->getIdString(),
(obj0) ? obj0->getIdString() : "",
(obj1) ? obj1->getIdString() : "",
arg_buf,