TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +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

50
Engine/source/T3D/tsStatic.cpp
View file

@ -334,7 +334,7 @@ bool TSStatic::_createShape()
NetConnection::filesWereDownloaded() )
return false;
mObjBox = mShape->mBounds;
mObjBox = mShape->bounds;
resetWorldBox();
mShapeInstance = new TSShapeInstance( mShape, isClientObject() );
@ -391,7 +391,7 @@ void TSStatic::_updatePhysics()
if ( mCollisionType == Bounds )
{
MatrixF offset( true );
offset.setPosition( mShape->mCenter );
offset.setPosition( mShape->center );
colShape = PHYSICSMGR->createCollision();
colShape->addBox( getObjBox().getExtents() * 0.5f * mObjScale, offset );
}
@ -960,31 +960,31 @@ void TSStatic::buildConvex(const Box3F& box, Convex* convex)
SceneObject* TSStaticPolysoupConvex::smCurObject = NULL;
TSStaticPolysoupConvex::TSStaticPolysoupConvex()
: mBox( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ),
mNormal( 0.0f, 0.0f, 0.0f, 0.0f ),
mIdx( 0 ),
mMesh( NULL )
: box( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f ),
normal( 0.0f, 0.0f, 0.0f, 0.0f ),
idx( 0 ),
mesh( NULL )
{
mType = TSPolysoupConvexType;
for ( U32 i = 0; i < 4; ++i )
{
mVerts[i].set( 0.0f, 0.0f, 0.0f );
verts[i].set( 0.0f, 0.0f, 0.0f );
}
}
Point3F TSStaticPolysoupConvex::support(const VectorF& vec) const
{
F32 bestDot = mDot( mVerts[0], vec );
F32 bestDot = mDot( verts[0], vec );
const Point3F *bestP = &mVerts[0];
const Point3F *bestP = &verts[0];
for(S32 i=1; i<4; i++)
{
F32 newD = mDot(mVerts[i], vec);
F32 newD = mDot(verts[i], vec);
if(newD > bestDot)
{
bestDot = newD;
bestP = &mVerts[i];
bestP = &verts[i];
}
}
@ -993,7 +993,7 @@ Point3F TSStaticPolysoupConvex::support(const VectorF& vec) const
Box3F TSStaticPolysoupConvex::getBoundingBox() const
{
Box3F wbox = mBox;
Box3F wbox = box;
wbox.minExtents.convolve( mObject->getScale() );
wbox.maxExtents.convolve( mObject->getScale() );
mObject->getTransform().mul(wbox);
@ -1003,7 +1003,7 @@ Box3F TSStaticPolysoupConvex::getBoundingBox() const
Box3F TSStaticPolysoupConvex::getBoundingBox(const MatrixF& mat, const Point3F& scale) const
{
AssertISV(false, "TSStaticPolysoupConvex::getBoundingBox(m,p) - Not implemented. -- XEA");
return mBox;
return box;
}
void TSStaticPolysoupConvex::getPolyList(AbstractPolyList *list)
@ -1015,11 +1015,11 @@ void TSStaticPolysoupConvex::getPolyList(AbstractPolyList *list)
list->setObject(mObject);
// Add only the original collision triangle
S32 base = list->addPoint(mVerts[0]);
list->addPoint(mVerts[2]);
list->addPoint(mVerts[1]);
S32 base = list->addPoint(verts[0]);
list->addPoint(verts[2]);
list->addPoint(verts[1]);
list->begin(0, (U32)mIdx ^ (uintptr_t)mMesh);
list->begin(0, (U32)idx ^ (uintptr_t)mesh);
list->vertex(base + 2);
list->vertex(base + 1);
list->vertex(base + 0);
@ -1035,10 +1035,10 @@ void TSStaticPolysoupConvex::getFeatures(const MatrixF& mat,const VectorF& n, Co
// For a tetrahedron this is pretty easy... first
// convert everything into world space.
Point3F tverts[4];
mat.mulP(mVerts[0], &tverts[0]);
mat.mulP(mVerts[1], &tverts[1]);
mat.mulP(mVerts[2], &tverts[2]);
mat.mulP(mVerts[3], &tverts[3]);
mat.mulP(verts[0], &tverts[0]);
mat.mulP(verts[1], &tverts[1]);
mat.mulP(verts[2], &tverts[2]);
mat.mulP(verts[3], &tverts[3]);
// points...
S32 firstVert = cf->mVertexList.size();
@ -1172,7 +1172,7 @@ DefineEngineMethod( TSStatic, changeMaterial, void, ( const char* mapTo, Materia
}
// Check the mapTo name exists for this shape
S32 matIndex = object->getShape()->mMaterialList->getMaterialNameList().find_next(String(mapTo));
S32 matIndex = object->getShape()->materialList->getMaterialNameList().find_next(String(mapTo));
if (matIndex < 0)
{
Con::errorf("TSShape::changeMaterial failed: Invalid mapTo name '%s'", mapTo);
@ -1190,13 +1190,13 @@ DefineEngineMethod( TSStatic, changeMaterial, void, ( const char* mapTo, Materia
// Replace instances with the new material being traded in. Lets make sure that we only
// target the specific targets per inst, this is actually doing more than we thought
delete object->getShape()->mMaterialList->mMatInstList[matIndex];
object->getShape()->mMaterialList->mMatInstList[matIndex] = newMat->createMatInstance();
delete object->getShape()->materialList->mMatInstList[matIndex];
object->getShape()->materialList->mMatInstList[matIndex] = newMat->createMatInstance();
// Finish up preparing the material instances for rendering
const GFXVertexFormat *flags = getGFXVertexFormat<GFXVertexPNTTB>();
FeatureSet features = MATMGR->getDefaultFeatures();
object->getShape()->mMaterialList->getMaterialInst(matIndex)->init( features, flags );
object->getShape()->materialList->getMaterialInst(matIndex)->init( features, flags );
}
DefineEngineMethod( TSStatic, getModelFile, const char *, (),,