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

Rename all member variables to follow the style guidelines (prefixed with the 'm') - class TSShapeLoader

Browse source
This commit is contained in:
bank 2014-05-13 12:15:47 +04:00
parent 9aeb4389f3
commit 1778a8d7f2
7 changed files with 284 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/ts/loader/appMesh.cpp
View file

@ -47,7 +47,7 @@ void AppMesh::computeBounds(Box3F& bounds)
boneTransforms.setSize( mNodeIndex.size() );
for (S32 iBone = 0; iBone < boneTransforms.size(); iBone++)
{
MatrixF nodeMat = mBones[iBone]->getNodeTransform( TSShapeLoader::DefaultTime );
MatrixF nodeMat = mBones[iBone]->getNodeTransform( TSShapeLoader::smDefaultTime );
TSShapeLoader::zapScale(nodeMat);
boneTransforms[iBone].mul( nodeMat, mInitialTransforms[iBone] );
}
@ -74,7 +74,7 @@ void AppMesh::computeBounds(Box3F& bounds)
}
else
{
MatrixF transform = getMeshTransform(TSShapeLoader::DefaultTime);
MatrixF transform = getMeshTransform(TSShapeLoader::smDefaultTime);
TSShapeLoader::zapScale(transform);
for (S32 iVert = 0; iVert < mPoints.size(); iVert++)

496
Engine/source/ts/loader/tsShapeLoader.cpp
View file

File diff suppressed because it is too large Load diff

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

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