TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

afx mooring membervar cleanups

Browse source
This commit is contained in:
Azaezel 2018-03-30 02:50:12 -05:00
parent e0b79d4dc8
commit 4375e5f145
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Engine/source/afx/ea/afxEA_Mooring.cpp
View file

@ -37,8 +37,8 @@ class afxEA_Mooring : public afxEffectWrapper
{ {
typedef afxEffectWrapper Parent; typedef afxEffectWrapper Parent;
afxMooringData* mooring_data; afxMooringData* mMooring_data;
afxMooring* obj; afxMooring* mObj;
void do_runtime_substitutions(); void do_runtime_substitutions();
@ -57,27 +57,27 @@ public:
afxEA_Mooring::afxEA_Mooring() afxEA_Mooring::afxEA_Mooring()
{ {
mooring_data = 0; mMooring_data = 0;
obj = 0; mObj = 0;
} }
afxEA_Mooring::~afxEA_Mooring() afxEA_Mooring::~afxEA_Mooring()
{ {
if (obj) if (mObj)
obj->deleteObject(); mObj->deleteObject();
if (mooring_data && mooring_data->isTempClone()) if (mMooring_data && mMooring_data->isTempClone())
delete mooring_data; delete mMooring_data;
mooring_data = 0; mMooring_data = 0;
} }
void afxEA_Mooring::ea_set_datablock(SimDataBlock* db) void afxEA_Mooring::ea_set_datablock(SimDataBlock* db)
{ {
mooring_data = dynamic_cast<afxMooringData*>(db); mMooring_data = dynamic_cast<afxMooringData*>(db);
} }
bool afxEA_Mooring::ea_start() bool afxEA_Mooring::ea_start()
{ {
if (!mooring_data) if (!mMooring_data)
{ {
Con::errorf("afxEA_Mooring::ea_start() -- missing or incompatible datablock."); Con::errorf("afxEA_Mooring::ea_start() -- missing or incompatible datablock.");
return false; return false;
@ -90,33 +90,33 @@ bool afxEA_Mooring::ea_start()
bool afxEA_Mooring::ea_update(F32 dt) bool afxEA_Mooring::ea_update(F32 dt)
{ {
if (!obj) if (!mObj)
{ {
if (mDatablock->use_ghost_as_cons_obj && mDatablock->effect_name != ST_NULLSTRING) if (mDatablock->use_ghost_as_cons_obj && mDatablock->effect_name != ST_NULLSTRING)
{ {
obj = new afxMooring(mooring_data->networking, mObj = new afxMooring(mMooring_data->networking,
mChoreographer->getChoreographerId(), mChoreographer->getChoreographerId(),
mDatablock->effect_name); mDatablock->effect_name);
} }
else else
{ {
obj = new afxMooring(mooring_data->networking, 0, ST_NULLSTRING); mObj = new afxMooring(mMooring_data->networking, 0, ST_NULLSTRING);
} }
obj->onNewDataBlock(mooring_data, false); mObj->onNewDataBlock(mMooring_data, false);
if (!obj->registerObject()) if (!mObj->registerObject())
{ {
delete obj; delete mObj;
obj = 0; mObj = 0;
Con::errorf("afxEA_Mooring::ea_update() -- effect failed to register."); Con::errorf("afxEA_Mooring::ea_update() -- effect failed to register.");
return false; return false;
} }
deleteNotify(obj); deleteNotify(mObj);
} }
if (obj) if (mObj)
{ {
obj->setTransform(mUpdated_xfm); mObj->setTransform(mUpdated_xfm);
} }
return true; return true;
@ -128,7 +128,7 @@ void afxEA_Mooring::ea_finish(bool was_stopped)
void afxEA_Mooring::onDeleteNotify(SimObject* obj) void afxEA_Mooring::onDeleteNotify(SimObject* obj)
{ {
if (this->obj == obj) if (mObj == obj)
obj = 0; obj = 0;
Parent::onDeleteNotify(obj); Parent::onDeleteNotify(obj);
@ -137,12 +137,12 @@ void afxEA_Mooring::onDeleteNotify(SimObject* obj)
void afxEA_Mooring::do_runtime_substitutions() void afxEA_Mooring::do_runtime_substitutions()
{ {
// only clone the datablock if there are substitutions // only clone the datablock if there are substitutions
if (mooring_data->getSubstitutionCount() > 0) if (mMooring_data->getSubstitutionCount() > 0)
{ {
// clone the datablock and perform substitutions // clone the datablock and perform substitutions
afxMooringData* orig_db = mooring_data; afxMooringData* orig_db = mMooring_data;
mooring_data = new afxMooringData(*orig_db, true); mMooring_data = new afxMooringData(*orig_db, true);
orig_db->performSubstitutions(mooring_data, mChoreographer, mGroup_index); orig_db->performSubstitutions(mMooring_data, mChoreographer, mGroup_index);
} }
} }