浏览代码

Merge pull request #522 from DavidWyand-GG/Updates

Revert Player Buoyancy Change
David Wyand 12 年之前
父节点
当前提交
81627c7103
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      Engine/source/T3D/player.cpp

+ 3 - 0
Engine/source/T3D/player.cpp

@@ -3098,6 +3098,8 @@ void Player::updateMove(const Move* move)
    }
    }
 
 
    // Container buoyancy & drag
    // Container buoyancy & drag
+/* Commented out until the buoyancy calculation can be reworked so that a container and
+** player with the same density will result in neutral buoyancy.
    if (mBuoyancy != 0)
    if (mBuoyancy != 0)
    {     
    {     
       // Applying buoyancy when standing still causing some jitters-
       // Applying buoyancy when standing still causing some jitters-
@@ -3117,6 +3119,7 @@ void Player::updateMove(const Move* move)
          mVelocity.z -= buoyancyForce;
          mVelocity.z -= buoyancyForce;
       }
       }
    }
    }
+*/
 
 
    // Apply drag
    // Apply drag
    if ( mSwimming )
    if ( mSwimming )