diff --git a/Engine/source/T3D/guiMaterialPreview.cpp b/Engine/source/T3D/guiMaterialPreview.cpp index 1fa053a12..05d42b87f 100644 --- a/Engine/source/T3D/guiMaterialPreview.cpp +++ b/Engine/source/T3D/guiMaterialPreview.cpp @@ -269,7 +269,7 @@ void GuiMaterialPreview::setObjectModel(const char* modelName) // Initialize camera values: mOrbitPos = mModel->getShape()->center; - mMinOrbitDist = mModel->getShape()->radius; + mMinOrbitDist = mModel->getShape()->mRadius; lastRenderTime = Platform::getVirtualMilliseconds(); } diff --git a/Engine/source/T3D/guiObjectView.cpp b/Engine/source/T3D/guiObjectView.cpp index 13c46380c..5330a1ee6 100644 --- a/Engine/source/T3D/guiObjectView.cpp +++ b/Engine/source/T3D/guiObjectView.cpp @@ -367,7 +367,7 @@ void GuiObjectView::setObjectModel( const String& modelName ) // Initialize camera values. mOrbitPos = mModel->getShape()->center; - mMinOrbitDist = mModel->getShape()->radius; + mMinOrbitDist = mModel->getShape()->mRadius; // Initialize animation. diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp index 05524867a..455dee9f5 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp +++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp @@ -400,7 +400,7 @@ bool WheeledVehicleData::preload(bool server, String &errorStr) MatrixF imat(1); SphereF sphere; sphere.center = mShape->center; - sphere.radius = mShape->radius; + sphere.radius = mShape->mRadius; PlaneExtractorPolyList polyList; polyList.mPlaneList = &rigidBody.mPlaneList; polyList.setTransform(&imat, Point3F(1,1,1)); diff --git a/Engine/source/environment/VolumetricFog.cpp b/Engine/source/environment/VolumetricFog.cpp index ba655ffa9..e0b1c6227 100644 --- a/Engine/source/environment/VolumetricFog.cpp +++ b/Engine/source/environment/VolumetricFog.cpp @@ -348,7 +348,7 @@ bool VolumetricFog::LoadShape() } mObjBox = mShape->mBounds; - mRadius = mShape->radius; + mRadius = mShape->mRadius; resetWorldBox(); if (!isClientObject()) @@ -561,7 +561,7 @@ U32 VolumetricFog::packUpdate(NetConnection *con, U32 mask, BitStream *stream) if (bool(mShape) == false) return retMask; mObjBox = mShape->mBounds; - mRadius = mShape->radius; + mRadius = mShape->mRadius; resetWorldBox(); mObjSize = mWorldBox.getGreatestDiagonalLength(); mObjScale = getScale(); diff --git a/Engine/source/gui/editor/guiShapeEdPreview.cpp b/Engine/source/gui/editor/guiShapeEdPreview.cpp index 300b6e95e..bb83d85d7 100644 --- a/Engine/source/gui/editor/guiShapeEdPreview.cpp +++ b/Engine/source/gui/editor/guiShapeEdPreview.cpp @@ -366,8 +366,8 @@ bool GuiShapeEdPreview::setObjectModel(const char* modelName) mOrbitPos = shape->center; // Set camera move and zoom speed according to model size - mMoveSpeed = shape->radius / sMoveScaler; - mZoomSpeed = shape->radius / sZoomScaler; + mMoveSpeed = shape->mRadius / sMoveScaler; + mZoomSpeed = shape->mRadius / sZoomScaler; // Reset node selection mHoverNode = -1; diff --git a/Engine/source/lighting/common/blobShadow.cpp b/Engine/source/lighting/common/blobShadow.cpp index 3db211762..f0d87be28 100644 --- a/Engine/source/lighting/common/blobShadow.cpp +++ b/Engine/source/lighting/common/blobShadow.cpp @@ -95,7 +95,7 @@ bool BlobShadow::shouldRender(F32 camDist) if (mShapeBase && mShapeBase->getFadeVal() < TSMesh::VISIBILITY_EPSILON) return false; - F32 shadowLen = 10.0f * mShapeInstance->getShape()->radius; + F32 shadowLen = 10.0f * mShapeInstance->getShape()->mRadius; Point3F pos = mShapeInstance->getShape()->center; // this is a bit of a hack...move generic shadows towards feet/base of shape diff --git a/Engine/source/ts/loader/tsShapeLoader.cpp b/Engine/source/ts/loader/tsShapeLoader.cpp index 5fa76d0fc..11779eb6b 100644 --- a/Engine/source/ts/loader/tsShapeLoader.cpp +++ b/Engine/source/ts/loader/tsShapeLoader.cpp @@ -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(); diff --git a/Engine/source/ts/tsLastDetail.cpp b/Engine/source/ts/tsLastDetail.cpp index 842b28a0e..19fd7e140 100644 --- a/Engine/source/ts/tsLastDetail.cpp +++ b/Engine/source/ts/tsLastDetail.cpp @@ -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; diff --git a/Engine/source/ts/tsShape.cpp b/Engine/source/ts/tsShape.cpp index f1f77d91a..681388d6d 100644 --- a/Engine/source/ts/tsShape.cpp +++ b/Engine/source/ts/tsShape.cpp @@ -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*)¢er,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*)¢er,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); diff --git a/Engine/source/ts/tsShape.h b/Engine/source/ts/tsShape.h index d6196c986..164e378a9 100644 --- a/Engine/source/ts/tsShape.h +++ b/Engine/source/ts/tsShape.h @@ -354,7 +354,7 @@ class TSShape /// @name Bounding /// @{ - F32 radius; + F32 mRadius; F32 tubeRadius; Point3F center; Box3F mBounds; diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp index 50b500828..24fb85726 100644 --- a/Engine/source/ts/tsShapeConstruct.cpp +++ b/Engine/source/ts/tsShapeConstruct.cpp @@ -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; diff --git a/Engine/source/ts/tsShapeInstance.cpp b/Engine/source/ts/tsShapeInstance.cpp index 98d6b39ea..f9a74e446 100644 --- a/Engine/source/ts/tsShapeInstance.cpp +++ b/Engine/source/ts/tsShapeInstance.cpp @@ -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 ) {