TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #215 from Azaezel/alpha40_trigger_tricks

Browse source 
fixes for trigger onenter/onleave
This commit is contained in:
Brian Roberts 2020-06-26 20:48:27 -05:00 committed by GitHub
parent 7a10c42c40 8ecb474a67
commit bac3146054
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/T3D/trigger.cpp
View file

@ -389,6 +389,20 @@ bool Trigger::setTickCmd(void *object, const char *index, const char *data)
return true; // to update the actual field
}
//------------------------------------------------------------------------------
void Trigger::testObjects()
{
Vector<SceneObject*> foundobjs;
gServerContainer.findObjectList(getWorldBox(), 0xFFFFFFFF, &foundobjs);
for (S32 i = 0; i < foundobjs.size(); ++i)
{
GameBase* so = dynamic_cast<GameBase*>(foundobjs[i]);
if (so)
potentialEnterObject(so);
}
}
//--------------------------------------------------------------------------
bool Trigger::onAdd()
@ -405,7 +419,9 @@ bool Trigger::onAdd()
if (isServerObject())
scriptOnAdd();
testObjects();
return true;
}
@ -441,7 +457,7 @@ void Trigger::onDeleteNotify( SimObject *obj )
{
mObjects.erase(i);
if (mDataBlock)
mDataBlock->onLeaveTrigger_callback( this, pScene );
mDataBlock->onLeaveTrigger_callback( this, NULL );
break;
}
}
@ -517,6 +533,8 @@ void Trigger::setTransform(const MatrixF & mat)
setMaskBits(TransformMask | ScaleMask);
}
testObjects();
}
void Trigger::prepRenderImage( SceneRenderState *state )

1
Engine/source/T3D/trigger.h
View file

@ -123,6 +123,7 @@ class Trigger : public GameBase
static void consoleInit();
static void initPersistFields();
void testObjects();
bool onAdd();
void onRemove();
void onDeleteNotify(SimObject*);