浏览代码

ditch _snapfloat entirely in favor of just using the shared mRoundF

AzaezelX 1 年之前
父节点
当前提交
39e72cf2b6

+ 4 - 9
Engine/source/gui/worldEditor/gizmo.cpp

@@ -1089,7 +1089,7 @@ void Gizmo::on3DMouseDragged( const Gui3DMouseEvent & event )
 
       //
       if((mProfile->forceSnapRotations && event.modifier | SI_SHIFT) || (mProfile->allowSnapRotations && event.modifier & SI_SHIFT ))
-         angle = mDegToRad( _snapFloat( mRadToDeg( angle ), mProfile->rotationSnap ) );
+         angle = mDegToRad( mRoundF( mRadToDeg( angle ), mProfile->rotationSnap ) );
 
       mDeltaAngle = angle - mLastAngle;
       mLastAngle = angle;         
@@ -1882,18 +1882,13 @@ Point3F Gizmo::_snapPoint( const Point3F &pnt ) const
       return pnt;
 
    Point3F snap;
-   snap.x = _snapFloat( pnt.x, mProfile->gridSize.x );
-   snap.y = _snapFloat( pnt.y, mProfile->gridSize.y );
-   snap.z = _snapFloat( pnt.z, mProfile->gridSize.z );
+   snap.x = mRoundF( pnt.x, mProfile->gridSize.x );
+   snap.y = mRoundF( pnt.y, mProfile->gridSize.y );
+   snap.z = mRoundF( pnt.z, mProfile->gridSize.z );
 
    return snap;
 }
 
-F32 Gizmo::_snapFloat( const F32 &val, const F32 &snap ) const
-{
-   return mRoundF(val, snap);
-}
-
 GizmoAlignment Gizmo::_filteredAlignment()
 {
    GizmoAlignment align = mProfile->alignment;

+ 0 - 1
Engine/source/gui/worldEditor/gizmo.h

@@ -313,7 +313,6 @@ protected:
    void _renderAxisText();   
    void _renderPlane();
    Point3F _snapPoint( const Point3F &pnt ) const;
-   F32 _snapFloat( const F32 &val, const F32 &snap ) const;
    GizmoAlignment _filteredAlignment();
    void _updateState( bool collideGizmo = true );
    void _updateEnabledAxices();

+ 3 - 9
Engine/source/gui/worldEditor/worldEditorSelection.cpp

@@ -306,9 +306,9 @@ void WorldEditorSelection::offset( const Point3F& offset, F32 gridSnap )
       
       if( gridSnap != 0.f )
       {
-         wPos.x = _snapFloat(wPos.x, gridSnap);
-         wPos.y = _snapFloat(wPos.y, gridSnap);
-         wPos.z = _snapFloat(wPos.z, gridSnap);
+         wPos.x = mRoundF(wPos.x, gridSnap);
+         wPos.y = mRoundF(wPos.y, gridSnap);
+         wPos.z = mRoundF(wPos.z, gridSnap);
       }
       
       mat.setColumn(3, wPos);
@@ -318,12 +318,6 @@ void WorldEditorSelection::offset( const Point3F& offset, F32 gridSnap )
    mCentroidValid = false;
 }
 
-F32 WorldEditorSelection::_snapFloat(const F32 &val, const F32 &snap) const
-{
-   return mRoundF(val, snap);
-}
-
-
 //-----------------------------------------------------------------------------
 
 void WorldEditorSelection::setPosition(const Point3F & pos)

+ 0 - 1
Engine/source/gui/worldEditor/worldEditorSelection.h

@@ -108,7 +108,6 @@ class WorldEditorSelection : public SimPersistSet
       //
       void offset(const Point3F& delta, F32 gridSnap = 0.f );
       void setPosition(const Point3F & pos);
-      F32 _snapFloat(const F32 &val, const F32 &snap) const;
       void setCentroidPosition(bool useBoxCenter, const Point3F & pos);
 
       void orient(const MatrixF &, const Point3F &);