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

Revert recent style cleanup changes.

Browse source
This commit is contained in:
Daniel Buckmaster 2015-03-04 11:55:30 +11:00
parent a73850a4bb
commit 84e8cbb4ee
62 changed files with 3380 additions and 3380 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,31 +94,31 @@ protected:
};
public:
static const F32 smDefaultTime;
static const F64 smMinFrameRate;
static const F64 smMaxFrameRate;
static const F64 smAppGroundFrameRate;
static const F32 DefaultTime;
static const F64 MinFrameRate;
static const F64 MaxFrameRate;
static const F64 AppGroundFrameRate;
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 smShapePath;
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 smShapePath; }
static const Torque::Path& getShapePath() { return shapePath; }
static void zapScale(MatrixF& mat);