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

afx effect-vector and phrase membervar cleanups

Browse source
This commit is contained in:
Azaezel 2018-03-30 02:54:48 -05:00
parent b0c48bbfce
commit d2e8536a29
5 changed files with 169 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Engine/source/afx/afxEffectVector.h
View file

@ -37,14 +37,14 @@ class afxChoreographer;
class afxEffectVector
{
Vector<afxEffectWrapper*>* fx_v;
Vector<afxEffectWrapper*>* fx_v2;
Vector<afxEffectWrapper*>* mFX_v;
Vector<afxEffectWrapper*>* mFX_v2;
bool active;
bool on_server;
F32 phrase_dur;
F32 total_fx_dur;
F32 after_life;
bool mActive;
bool mOn_server;
F32 mPhrase_dur;
F32 mTotal_fx_dur;
F32 mAfter_life;
void swap_vecs();
void filter_client_server();
@ -64,21 +64,21 @@ public:
void update(F32 dt);
void stop(bool force_cleanup=false);
void interrupt();
bool empty() { return (!fx_v || fx_v->empty()); }
bool isActive() { return active; }
S32 count() { return (fx_v) ? fx_v->size() : 0; }
bool empty() { return (!mFX_v || mFX_v->empty()); }
bool isActive() { return mActive; }
S32 count() { return (mFX_v) ? mFX_v->size() : 0; }
F32 getTotalDur() { return total_fx_dur; }
F32 getAfterLife() { return after_life; }
F32 getTotalDur() { return mTotal_fx_dur; }
F32 getAfterLife() { return mAfter_life; }
Vector<afxEffectWrapper*>* getFX() { return fx_v; }
Vector<afxEffectWrapper*>* getFX() { return mFX_v; }
};
inline void afxEffectVector::swap_vecs()
{
Vector<afxEffectWrapper*>* tmp = fx_v;
fx_v = fx_v2;
fx_v2 = tmp;
Vector<afxEffectWrapper*>* tmp = mFX_v;
mFX_v = mFX_v2;
mFX_v2 = tmp;
}
//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~//