TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-21 07:33:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #947 from eightyeight/trigger-inheritance

Browse source 
Make Trigger friendlier towards inheritance
This commit is contained in:
Areloch 2015-10-29 22:06:59 -05:00
commit db7363df12
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,10 @@ class Trigger : public GameBase
String mLeaveCommand;
String mTickCommand;
static const U32 CMD_SIZE = 1024;
protected:
enum TriggerUpdateBits
{
TransformMask = Parent::NextFreeMask << 0,
@ -97,10 +101,6 @@ class Trigger : public GameBase
NextFreeMask = Parent::NextFreeMask << 5,
};
static const U32 CMD_SIZE = 1024;
protected:
static bool smRenderTriggers;
bool testObject(GameBase* enter);
void processTick(const Move *move);
@ -142,7 +142,7 @@ class Trigger : public GameBase
// Trigger
void setTriggerPolyhedron(const Polyhedron&);
void potentialEnterObject(GameBase*);
virtual void potentialEnterObject(GameBase*);
U32 getNumTriggeringObjects() const;
GameBase* getObject(const U32);
const Vector<GameBase*>& getObjects() const { return mObjects; }