TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 00:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned up member::radius

Browse source
This commit is contained in:
Azaezel 2018-03-13 15:31:00 -05:00
parent 4615bd6db8
commit 3ceaa0ed50
12 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1225,8 +1225,8 @@ void TSShapeLoader::install()
shape->mBounds = Box3F(1.0f);
shape->mBounds.getCenter(&shape->center);
shape->radius = (shape->mBounds.maxExtents - shape->center).len();
shape->tubeRadius = shape->radius;
shape->mRadius = (shape->mBounds.maxExtents - shape->center).len();
shape->tubeRadius = shape->mRadius;
shape->init();
shape->finalizeEditable();

2
Engine/source/ts/tsLastDetail.cpp
View file

@ -82,7 +82,7 @@ TSLastDetail::TSLastDetail( TSShape *shape,
mDl = dl;
mDim = getMax( dim, (S32)32 );
mRadius = mShape->radius;
mRadius = mShape->mRadius;
mCenter = mShape->center;
mCachePath = cachePath;

6
Engine/source/ts/tsShape.cpp
View file

@ -1195,7 +1195,7 @@ void TSShape::assembleShape()
tsalloc.checkGuard();
// get bounds...
tsalloc.get32((S32*)&radius,1);
tsalloc.get32((S32*)&mRadius,1);
tsalloc.get32((S32*)&tubeRadius,1);
tsalloc.get32((S32*)&center,3);
tsalloc.get32((S32*)&mBounds,6);
@ -1670,7 +1670,7 @@ void TSShape::disassembleShape()
tsalloc.setGuard();
// get bounds...
tsalloc.copyToBuffer32((S32*)&radius,1);
tsalloc.copyToBuffer32((S32*)&mRadius,1);
tsalloc.copyToBuffer32((S32*)&tubeRadius,1);
tsalloc.copyToBuffer32((S32*)&center,3);
tsalloc.copyToBuffer32((S32*)&mBounds,6);
@ -2060,7 +2060,7 @@ void TSShape::createEmptyShape()
names[1] = StringTable->insert("Mesh2");
names[2] = StringTable->insert("Mesh");
radius = 0.866025f;
mRadius = 0.866025f;
tubeRadius = 0.707107f;
center.set(0.0f, 0.5f, 0.0f);
mBounds.minExtents.set(-0.5f, 0.0f, -0.5f);

2
Engine/source/ts/tsShape.h
View file

@ -354,7 +354,7 @@ class TSShape
/// @name Bounding
/// @{
F32 radius;
F32 mRadius;
F32 tubeRadius;
Point3F center;
Box3F mBounds;

4
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -1459,8 +1459,8 @@ DefineTSShapeConstructorMethod( setBounds, bool, ( Box3F bbox ),,
shape->mBounds = bbox;
shape->mBounds.getCenter( &shape->center );
shape->radius = ( shape->mBounds.maxExtents - shape->center ).len();
shape->tubeRadius = shape->radius;
shape->mRadius = ( shape->mBounds.maxExtents - shape->center ).len();
shape->tubeRadius = shape->mRadius;
ADD_TO_CHANGE_SET();
return true;

2
Engine/source/ts/tsShapeInstance.cpp
View file

@ -662,7 +662,7 @@ S32 TSShapeInstance::setDetailFromDistance( const SceneRenderState *state, F32 s
// We're inlining SceneRenderState::projectRadius here to
// skip the unnessasary divide by zero protection.
F32 pixelRadius = ( mShape->radius / scaledDistance ) * state->getWorldToScreenScale().y * pixelScale;
F32 pixelRadius = ( mShape->mRadius / scaledDistance ) * state->getWorldToScreenScale().y * pixelScale;
F32 pixelSize = pixelRadius * smDetailAdjust;
if ( pixelSize < smSmallestVisiblePixelSize ) {