Merge pull request #1806 from Azaezel/byeByeVarVar2

more unused variable cleanups

Engine/source/T3D/convexShape.cpp

@@ -1102,8 +1102,6 @@ void ConvexShape::_updateGeometry( bool updateCollision )
 		const Vector< ConvexShape::Triangle > &triangles = face.triangles;
 		const ColorI &faceColor = sgConvexFaceColors[ i % sgConvexFaceColorCount ];
 
-		const Point3F binormal = mCross( face.normal, face.tangent );
-
 		for ( S32 j = 0; j < triangles.size(); j++ )
 		{
 			for ( S32 k = 0; k < 3; k++ )

Engine/source/T3D/debris.cpp

@@ -43,9 +43,6 @@
 
 const U32 csmStaticCollisionMask = TerrainObjectType | StaticShapeObjectType | StaticObjectType;
 
-const U32 csmDynamicCollisionMask = StaticShapeObjectType;
-
-
 IMPLEMENT_CO_DATABLOCK_V1(DebrisData);
 
 ConsoleDocClass( DebrisData,

Engine/source/T3D/fps/guiShapeNameHud.cpp

@@ -110,9 +110,6 @@ ConsoleDocClass( GuiShapeNameHud,
    "@ingroup GuiGame\n"
 );
 
-/// Default distance for object's information to be displayed.
-static const F32 cDefaultVisibleDistance = 500.0f;
-
 GuiShapeNameHud::GuiShapeNameHud()
 {
    mFillColor.set( 0.25f, 0.25f, 0.25f, 0.25f );

Engine/source/T3D/fx/fxFoliageReplicator.cpp

@@ -132,7 +132,6 @@ ConsoleDocClass( fxFoliageReplicator,
 // Trig Table Lookups.
 //
 //------------------------------------------------------------------------------
-const F32 PeriodLen = (F32) 2.0f * (F32) M_PI;
 const F32 PeriodLenMinus = (F32) (2.0f * M_PI) - 0.01f;
 
 //------------------------------------------------------------------------------

Engine/source/T3D/player.cpp

@@ -109,8 +109,6 @@ static S32 sMaxPredictionTicks = 30;   // Number of ticks to predict
 
 S32 Player::smExtendedMoveHeadPosRotIndex = 0;  // The ExtendedMove position/rotation index used for head movements
 
-// Anchor point compression
-const F32 sAnchorMaxDistance = 32.0f;
 
 //
 static U32 sCollisionMoveMask =  TerrainObjectType       |

Engine/source/T3D/rigidShape.cpp

@@ -187,8 +187,6 @@ IMPLEMENT_CALLBACK( RigidShape, onLeaveLiquid, void, ( const char* objId, const
 
 namespace {
 
-   const U32 sMoveRetryCount = 3;
-
    // Client prediction
    const S32 sMaxWarpTicks = 3;           // Max warp duration in ticks
    const S32 sMaxPredictionTicks = 30;    // Number of ticks to predict

Engine/source/T3D/turret/turretShape.cpp

@@ -36,15 +36,6 @@
 //----------------------------------------------------------------------------
 
 // Client prediction
-static F32 sMinWarpTicks = 0.5 ;        // Fraction of tick at which instant warp occures
-static S32 sMaxWarpTicks = 3;           // Max warp duration in ticks
-
-const U32 sClientCollisionMask = (TerrainObjectType     |
-                                  StaticShapeObjectType |
-                                  VehicleObjectType);
-
-const U32 sServerCollisionMask = (sClientCollisionMask);
-
 // Trigger objects that are not normally collided with.
 static U32 sTriggerMask = ItemObjectType     |
                           TriggerObjectType  |

Engine/source/T3D/vehicles/hoverVehicle.cpp

@@ -69,8 +69,6 @@ ConsoleDocClass( HoverVehicle,
 );
 
 namespace {
-
-const U32 sIntergrationsPerTick = 1;
 const F32 sHoverVehicleGravity  = -20;
 
 const U32 sCollisionMoveMask = (TerrainObjectType     | PlayerObjectType  | 

Engine/source/T3D/vehicles/vehicle.cpp

@@ -63,8 +63,6 @@ static F32 sWorkingQueryBoxSizeMultiplier = 2.0f;  // How much larger should the
                                                    // will be updated due to motion, but any non-static shape
                                                    // that moves into the query box will not be noticed.
 
-const U32 sMoveRetryCount = 3;
-
 // Client prediction
 const S32 sMaxWarpTicks = 3;           // Max warp duration in ticks
 const S32 sMaxPredictionTicks = 30;    // Number of ticks to predict

Engine/source/console/consoleInternal.cpp

@@ -1413,7 +1413,6 @@ ConsoleValueRef Namespace::Entry::execute(S32 argc, ConsoleValueRef *argv, ExprE
       return ConsoleValueRef();
    }
 
-   static char returnBuffer[32];
    switch(mType)
    {
       case StringCallbackType:

Engine/source/core/tagDictionary.cpp

@@ -25,13 +25,7 @@
 #include "core/stream/stream.h"
 
 namespace {
-
-const char TAG_ASCII_ID[] = "[TAG]";
-const char TAG_ASCII_END[] = "[END]";
 const char TAG_ASCII_HEADER[] = "// Auto-Generated by TagDictionary class";
-
-const S32 sg_tagDictAsciiUser   = 1;
-
 } // namespace
 
 TagDictionary tagDictionary;

Engine/source/environment/decalRoad.cpp

@@ -1580,8 +1580,6 @@ void DecalRoad::_captureVerts()
          box.intersect( batch.bounds );               
    }
 
-   Point3F pos = getPosition();
-
    mWorldBox = box;
    resetObjectBox();
 

Engine/source/environment/meshRoad.cpp

@@ -1713,8 +1713,6 @@ void MeshRoad::_generateSlices()
       }
    }
 
-   Point3F pos = getPosition();
-
    mWorldBox = box;
    resetObjectBox();
 

Engine/source/environment/river.cpp

@@ -1592,8 +1592,6 @@ void River::_generateSlices()
       }
    }
 
-   Point3F pos = getPosition();
-
    mWorldBox = box;
    //mObjBox.minExtents -= pos;
    //mObjBox.maxExtents -= pos;

Engine/source/environment/waterBlock.cpp

@@ -189,7 +189,6 @@ void WaterBlock::setupVBIB()
 //-----------------------------------------------------------------------------
 void WaterBlock::setupVertexBlock( U32 width, U32 height, U32 rowOffset )
 {
-   Point3F pos = getPosition();
    RayInfo rInfo;
    VectorF sunVector(-0.61f, 0.354f, 0.707f);
 
@@ -592,9 +591,6 @@ void WaterBlock::setTransform( const MatrixF &mat )
    // If our transform changes we need to recalculate the 
    // per vertex depth/shadow info.  Would be nice if this could
    // be done independently of generating the whole VBIB...   
-   
-   MatrixF oldMat = mObjToWorld;
-
    Parent::setTransform( mat );
 
    // We don't need to regen our vb anymore since we aren't calculating

Engine/source/forest/forestWindAccumulator.cpp

@@ -77,8 +77,6 @@ void ForestWindAccumulator::updateWind( const VectorF &windForce, F32 timeDelta
    // an infinite mass.
    mParticles[0].position = target;
 
-   Point2F relVel = target * timeDelta;
-
    Point2F diff( 0, 0 );
    Point2F springForce( 0, 0 );
 

Engine/source/gui/buttons/guiSwatchButtonCtrl.cpp

@@ -93,7 +93,6 @@ void GuiSwatchButtonCtrl::onRender( Point2I offset, const RectI &updateRect )
 {
    bool highlight = mMouseOver;
 
-   ColorI backColor   = mSwatchColor;
    ColorI borderColor = mActive ? ( highlight ? mProfile->mBorderColorHL : mProfile->mBorderColor ) : mProfile->mBorderColorNA;
 
    RectI renderRect( offset, getExtent() );

Engine/source/gui/containers/guiContainer.cpp

@@ -381,7 +381,7 @@ bool GuiContainer::anchorControl( GuiControl *control, const Point2I &deltaParen
 
    Point2I minExtent = control->getMinExtent();
    // Only resize if our minExtent is satisfied with it.
-   if( !( newRect.extent.x >= control->getMinExtent().x && newRect.extent.y >= control->getMinExtent().y ) )
+   if( !( newRect.extent.x >= minExtent.x && newRect.extent.y >= minExtent.y ) )
       return false;
 
    if( newRect.point == oldRect.point && newRect.extent == oldRect.extent )

Engine/source/gui/containers/guiFormCtrl.cpp

@@ -384,8 +384,6 @@ void GuiFormCtrl::onMouseUp(const GuiEvent &event)
    mouseUnlock();
    setUpdate();
 
-   Point2I localClick = globalToLocalCoord(event.mousePoint);
-
    // If we're clicking in the header then resize
    //if(localClick.y < mThumbSize.y && mDepressed)
    //   setCollapsed(!mCollapsed);

Engine/source/gui/controls/guiGradientCtrl.cpp

@@ -101,7 +101,6 @@ void GuiGradientSwatchCtrl::onRender( Point2I offset, const RectI &updateRect )
 {
    bool highlight = mMouseOver;
 
-   ColorI backColor   = mSwatchColor;
    ColorI borderColor = mActive ? ( highlight ? mProfile->mBorderColorHL : mProfile->mBorderColor ) : mProfile->mBorderColorNA;
    RectI renderRect( offset, getExtent() );
 

Engine/source/gui/editor/guiMenuBar.cpp

@@ -1953,7 +1953,6 @@ void GuiMenuBar::closeSubmenu()
 //  Find if the mouse pointer is within a menu item
 GuiMenuBar::MenuItem *GuiMenuBar::findHitMenuItem(Point2I mousePoint)
 {
-   Point2I pos = globalToLocalCoord(mousePoint);
 
 //   for(Menu *walk = menuList; walk; walk = walk->nextMenu)
 //      if(walk->visible && walk->bounds.pointInRect(pos))

Engine/source/gui/editor/guiParticleGraphCtrl.cpp

@@ -748,7 +748,6 @@ void GuiParticleGraphCtrl::onMouseDown(const GuiEvent &event)
 	  if(event.mouseClickCount == 2)
 	  {
         Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
-		  Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
         S32 point = removePlotPoint(hitNut.x, hitNut.y);
 
         // Argument Buffer.
@@ -885,8 +884,6 @@ void GuiParticleGraphCtrl::onRightMouseDown(const GuiEvent &event)
    if( hitNut != Point2I(-1,-1) )
    {
       Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
-
-      Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
       S32 point = removePlotPoint(hitNut.x, hitNut.y);
 
       // Argument Buffer.
@@ -913,8 +910,6 @@ void GuiParticleGraphCtrl::onRightMouseDragged(const GuiEvent &event)
    if( hitNut != Point2I(-1,-1) )
    {
       Point2F plotPoint = getPlotPoint(hitNut.x, hitNut.y);
-
-      Point2F mousePos = convertToGraphCoord(mSelectedPlot, event.mousePoint);
       S32 point = removePlotPoint(hitNut.x, hitNut.y);
 
 	   // Argument Buffer.

Engine/source/gui/worldEditor/gizmo.cpp

@@ -811,8 +811,6 @@ void Gizmo::on3DMouseDown( const Gui3DMouseEvent & event )
          camPos = event.pos;
       else
          camPos = mCameraPos;
-         
-      Point3F end = camPos + event.vec * smProjectDistance;
 
       if ( 0 <= mSelectionIdx && mSelectionIdx <= 2 )
       {       

Engine/source/gui/worldEditor/guiDecalEditorCtrl.cpp

@@ -494,8 +494,6 @@ void GuiDecalEditorCtrl::renderScene(const RectI & updateRect)
    PROFILE_SCOPE( GuiDecalEditorCtrl_renderScene );
 
    GFXTransformSaver saver;
-
-   RectI bounds = getBounds();
    
    ColorI hlColor(0,255,0,255);
    ColorI regColor(255,0,0,255);

Engine/source/gui/worldEditor/terrainActions.cpp

@@ -282,7 +282,6 @@ void RaiseHeightAction::process( Selection *sel, const Gui3DMouseEvent &evt, boo
       return;
 
    Point2I brushPos = brush->getPosition();
-   Point2I brushSize = brush->getSize();
    GridPoint brushGridPoint = brush->getGridPoint();
 
    Vector<GridInfo> cur; // the height at the brush position
@@ -327,7 +326,6 @@ void LowerHeightAction::process(Selection * sel, const Gui3DMouseEvent &, bool s
       return;
 
    Point2I brushPos = brush->getPosition();
-   Point2I brushSize = brush->getSize();
    GridPoint brushGridPoint = brush->getGridPoint();
 
    Vector<GridInfo> cur; // the height at the brush position

Engine/source/lighting/basic/blTerrainSystem.cpp

@@ -525,9 +525,6 @@ void blTerrainProxy::lightVector(LightInfo * light)
    F32 lmTerrRatio = (F32)mTerrainBlockSize / (F32) mLightMapSize;
    lmTerrRatio *= terrain->getSquareSize();
 
-   // Get the terrain position
-   Point3F terrPos( terrain->getTransform().getPosition() );
-
    U32 i = 0;
    for (U32 y = 0; y < mLightMapSize; y++)
    {

Engine/source/navigation/guiNavEditorCtrl.cpp

@@ -465,7 +465,6 @@ void GuiNavEditorCtrl::on3DMouseDragged(const Gui3DMouseEvent & event)
    mGizmo->on3DMouseDragged(event);
    if(mGizmo->isDirty())
    {
-      Point3F pos = mGizmo->getPosition();
       Point3F scale = mGizmo->getScale();
       const MatrixF &mat = mGizmo->getTransform();
       VectorF normal;

Engine/source/platformSDL/sdlInput.cpp

@@ -99,14 +99,12 @@ void Input::init()
 //------------------------------------------------------------------------------
 ConsoleFunction( isJoystickDetected, bool, 1, 1, "isJoystickDetected()" )
 {
-   argc; argv;
    return( SDL_NumJoysticks() > 0 );
 }
 
 //------------------------------------------------------------------------------
 ConsoleFunction( getJoystickAxes, const char*, 2, 2, "getJoystickAxes( instance )" )
 {
-   argc;
    // TODO SDL
    return( "" );
 }

Engine/source/scene/culling/sceneCullingState.cpp

@@ -385,11 +385,6 @@ bool SceneCullingState::createCullingVolume( const Point3F* vertices, U32 numVer
          if( cosAngle > 0.1f )
             continue;
 
-         //TODO
-
-         const Point3F addNormals = currentPlane + lastPlane;
-         const Point3F crossNormals = mCross( currentPlane, lastPlane );
-
          Point3F newNormal = currentPlane + lastPlane;//addNormals - mDot( addNormals, crossNormals ) * crossNormals;
 
          //

Engine/source/sfx/sfxEnvironment.cpp

@@ -32,7 +32,7 @@ IMPLEMENT_CO_DATABLOCK_V1( SFXEnvironment );
 // Reverb flags.
 static const U32 sReverbFlagDecayTimeScale         = 0x001;
 static const U32 sReverbFlagReflectionsScale       = 0x002;
-static const U32 sReverbFlagReflectionsDelayScale  = 0x004;
+//static const U32 sReverbFlagReflectionsDelayScale  = 0x004; unused, but kept for doc purposes -BJR
 static const U32 sReverbFlagReverbScale            = 0x008;
 static const U32 sReverbFlagReverbDelayScale       = 0x010;
 static const U32 sReverbFlagDecayHFLimit           = 0x020;

Engine/source/sfx/sfxSystem.cpp

@@ -182,7 +182,6 @@ static const U32 sDeviceInfoProvider = 0;
 static const U32 sDeviceInfoName = 1;
 static const U32 sDeviceInfoUseHardware = 2;
 static const U32 sDeviceInfoMaxBuffers = 3;
-static const U32 sDeviceInfoCaps = 4;
 
 
 //-----------------------------------------------------------------------------