Procházet zdrojové kódy

cleaned up member::radius

Azaezel před 7 roky
rodič
revize
1c62080f7f

+ 1 - 1
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();
 }

+ 1 - 1
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.
    

+ 1 - 1
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));

+ 2 - 2
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();

+ 2 - 2
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;

+ 1 - 1
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

+ 2 - 2
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();

+ 1 - 1
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;

+ 3 - 3
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*)&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);

+ 1 - 1
Engine/source/ts/tsShape.h

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

+ 2 - 2
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;

+ 1 - 1
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 ) {