TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +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

16
Engine/source/forest/ts/tsForestItemData.cpp
View file

@ -154,7 +154,7 @@ TSShapeInstance* TSForestItemData::_getShapeInstance() const
void TSForestItemData::_checkLastDetail()
{
const S32 dl = mShape->mSmallestVisibleDL;
const TSDetail *detail = &mShape->mDetails[dl];
const TSDetail *detail = &mShape->details[dl];
// TODO: Expose some real parameters to the datablock maybe?
if ( detail->subShapeNum != -1 )
@ -162,8 +162,8 @@ void TSForestItemData::_checkLastDetail()
mShape->addImposter( mShapeFile, 10, 4, 0, 0, 256, 0, 0 );
// HACK: If i don't do this it crashes!
while ( mShape->mDetailCollisionAccelerators.size() < mShape->mDetails.size() )
mShape->mDetailCollisionAccelerators.push_back( NULL );
while ( mShape->detailCollisionAccelerators.size() < mShape->details.size() )
mShape->detailCollisionAccelerators.push_back( NULL );
}
}
@ -174,12 +174,12 @@ TSLastDetail* TSForestItemData::getLastDetail() const
return NULL;
const S32 dl = mShape->mSmallestVisibleDL;
const TSDetail* detail = &mShape->mDetails[dl];
const TSDetail* detail = &mShape->details[dl];
if ( detail->subShapeNum >= 0 ||
mShape->mBillboardDetails.size() <= dl )
mShape->billboardDetails.size() <= dl )
return NULL;
return mShape->mBillboardDetails[dl];
return mShape->billboardDetails[dl];
}
ForestCellBatch* TSForestItemData::allocateBatch() const
@ -207,8 +207,8 @@ bool TSForestItemData::canBillboard( const SceneRenderState *state, const Forest
if ( dl < 0 )
return true;
const TSDetail *detail = &mShape->mDetails[dl];
if ( detail->subShapeNum < 0 && dl < mShape->mBillboardDetails.size() )
const TSDetail *detail = &mShape->details[dl];
if ( detail->subShapeNum < 0 && dl < mShape->billboardDetails.size() )
return true;
return false;