TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 05:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "collada/ts chain shadowvar and member var clenaups"

Browse source 
This reverts commit 3ce15b33eb.
This commit is contained in:
Azaezel 2018-04-01 23:16:13 -05:00
parent 43c3f75b14
commit c84bd23e17
6 changed files with 264 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Engine/source/ts/loader/tsShapeLoader.h
View file

@ -101,24 +101,24 @@ public:
protected:
// Variables used during loading that must be held until the shape is deleted
TSShape* mShape;
Vector<AppMesh*> mAppMeshes;
TSShape* shape;
Vector<AppMesh*> appMeshes;
// Variables used during loading, but that can be discarded afterwards
static Torque::Path mShapePath;
static Torque::Path shapePath;
AppNode* mBoundsNode;
Vector<AppNode*> mAppNodes; ///< Nodes in the loaded shape
Vector<AppSequence*> mAppSequences;
AppNode* boundsNode;
Vector<AppNode*> appNodes; ///< Nodes in the loaded shape
Vector<AppSequence*> appSequences;
Vector<Subshape*> mSubshapes;
Vector<Subshape*> subshapes;
Vector<QuatF*> mNodeRotCache;
Vector<Point3F*> mNodeTransCache;
Vector<QuatF*> mNodeScaleRotCache;
Vector<Point3F*> mNodeScaleCache;
Vector<QuatF*> nodeRotCache;
Vector<Point3F*> nodeTransCache;
Vector<QuatF*> nodeScaleRotCache;
Vector<Point3F*> nodeScaleCache;
Point3F mShapeOffset; ///< Offset used to translate the shape origin
Point3F shapeOffset; ///< Offset used to translate the shape origin
//--------------------------------------------------------------------------
@ -183,10 +183,10 @@ protected:
void install();
public:
TSShapeLoader() : mBoundsNode(0) { }
TSShapeLoader() : boundsNode(0) { }
virtual ~TSShapeLoader();
static const Torque::Path& getShapePath() { return mShapePath; }
static const Torque::Path& getShapePath() { return shapePath; }
static void zapScale(MatrixF& mat);