From 28a8949b9f315e9257a6c51d8872cd99d00fe556 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 29 Dec 2012 10:19:47 -0800
Subject: BulletSim: remove check for small motor movement because, while it
 did the right thing for stopping (speed reducing to zero), it prevented
 movement from starting (speed increasing from zero). Will revisit when the
 generalize PID motor is debugged.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs  | 7 +++++--
 OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index e19b5b3..3b77e49 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -217,6 +217,7 @@ public sealed class BSCharacter : BSPhysObject
             // 'stepVelocity' is now the speed we'd like the avatar to move in. Turn that into an instantanous force.
             OMV.Vector3 moveForce = (stepVelocity - _velocity) * Mass / PhysicsScene.LastTimeStep;
 
+            /*
             // If moveForce is very small, zero things so we don't keep sending microscopic updates to the user
             float moveForceMagnitudeSquared = moveForce.LengthSquared();
             if (moveForceMagnitudeSquared < 0.0001)
@@ -227,10 +228,12 @@ public sealed class BSCharacter : BSPhysObject
             }
             else
             {
-                DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}",
-                                        LocalID, stepVelocity, _velocity, Mass, moveForce);
                 AddForce(moveForce, false, true);
             }
+            */
+            DetailLog("{0},BSCharacter.MoveMotor,move,stepVel={1},vel={2},mass={3},moveForce={4}",
+                                    LocalID, stepVelocity, _velocity, Mass, moveForce);
+            AddForce(moveForce, false, true);
         });
     }
 
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index b909b38..b361498 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -80,7 +80,7 @@ public enum FixedShapeKey : ulong
     KEY_SPHERE      = 2,
     KEY_CONE        = 3,
     KEY_CYLINDER    = 4,
-    KEY_CAPSULE     = 5,
+    KEY_CAPSULE     = 5,
     KEY_AVATAR      = 6,
 }
 
-- 
cgit v1.1