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

Exposes the SceneObjectTypeMasks as an enum type, allowing it to be utilized in inspectors.

Browse source 
Updated Trigger triggeredBy field to utilize new enum type for editing
Updated MaterialDefinition's animFlags field to utilize appropriate enum type for editing
Fixed image reference in bitmask inspectorField type to use correct image asset name
This commit is contained in:
Areloch 2024-05-04 09:56:04 -05:00
parent 67b052a192
commit b77911bdcd
5 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,6 @@
#include "T3D/physics/physicsBody.h"
#include "T3D/physics/physicsCollision.h"
bool Trigger::smRenderTriggers = false;
//-----------------------------------------------------------------------------
@ -381,7 +380,7 @@ void Trigger::initPersistFields()
addField("TripOnce", TypeBool, Offset(mTripOnce, Trigger),"Do we trigger callacks just the once?");
addField("TripCondition", TypeRealString, Offset(mTripCondition, Trigger),"evaluation condition to trip callbacks (true/false)");
addField("TrippedBy", TypeS32, Offset(mTrippedBy, Trigger), "typemask filter");
addField("TrippedBy", TypeGameTypeMasksType, Offset(mTrippedBy, Trigger), "typemask filter");
addProtectedField("enterCommand", TypeCommand, Offset(mEnterCommand, Trigger), &setEnterCmd, &defaultProtectedGetFn,
"The command to execute when an object enters this trigger. Object id stored in %%obj. Maximum 1023 characters." );
addProtectedField("leaveCommand", TypeCommand, Offset(mLeaveCommand, Trigger), &setLeaveCmd, &defaultProtectedGetFn,