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

Merge pull request #2056 from Bloodknight/afx_merge_main

Browse source 
Afx merge main
This commit is contained in:
Areloch 2017-10-11 08:47:47 -05:00 • committed by GitHub
commit 35d649b57e
301 changed files with 59625 additions and 1480 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/ts/tsShapeInstance.h
View file

@ -20,6 +20,11 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
// Arcane-FX for MIT Licensed Open Source version of Torque 3D from GarageGames
// Copyright (C) 2015 Faust Logic, Inc.
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//
#ifndef _TSSHAPEINSTANCE_H_
#define _TSSHAPEINSTANCE_H_
@ -690,6 +695,8 @@ protected:
//-------------------------------------------------------------------------------------
bool hasAccumulation();
// provides access to full mTriggerStates mask.
U32 getTriggerStateMask() const { return mTriggerStates; }
};