diff options
| author | Vegaslon | 2013-05-06 21:19:48 -0400 |
|---|---|---|
| committer | Robert Adams | 2013-05-07 07:14:10 -0700 |
| commit | ac6dcd35fb77f118fc6c3d72cb029591306c7e99 (patch) | |
| tree | 420b579f918e1cc2e85977af3d210d9dfbbd89ed /OpenSim/Region | |
| parent | BulletSim: Another way to create vehicle framed friction. (diff) | |
| download | opensim-SC-ac6dcd35fb77f118fc6c3d72cb029591306c7e99.zip opensim-SC-ac6dcd35fb77f118fc6c3d72cb029591306c7e99.tar.gz opensim-SC-ac6dcd35fb77f118fc6c3d72cb029591306c7e99.tar.bz2 opensim-SC-ac6dcd35fb77f118fc6c3d72cb029591306c7e99.tar.xz | |
Bulletsim: and the rotational friction.
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs index e93dbd7..c16b7d3 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs | |||
| @@ -1339,11 +1339,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin | |||
| 1339 | // angularMotorContributionV.Y = 0f; | 1339 | // angularMotorContributionV.Y = 0f; |
| 1340 | // } | 1340 | // } |
| 1341 | 1341 | ||
| 1342 | // Reduce any velocity by friction. | ||
| 1343 | Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep); | ||
| 1344 | angularMotorContributionV -= (currentAngularV * frictionFactorW); | ||
| 1345 | |||
| 1342 | VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation; | 1346 | VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation; |
| 1343 | 1347 | ||
| 1344 | // Reduce any velocity by friction. | 1348 | |
| 1345 | Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep) * VehicleOrientation; | ||
| 1346 | VehicleRotationalVelocity -= (VehicleRotationalVelocity * frictionFactorW); | ||
| 1347 | 1349 | ||
| 1348 | VDetailLog("{0}, MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV); | 1350 | VDetailLog("{0}, MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV); |
| 1349 | } | 1351 | } |