From 6ecdadb32999aed776df29e53541326958daf836 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Mar 2012 17:13:06 -0700
Subject: BulletSim: set buoyancy in only one place

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 0cab5d1..e816b61 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -260,11 +260,8 @@ public class BSCharacter : PhysicsActor
         get { return _flying; } 
         set {
             _flying = value;
-            _scene.TaintedObject(delegate()
-            {
-                // simulate flying by changing the effect of gravity
-                BulletSimAPI.SetObjectBuoyancy(_scene.WorldID, LocalID, _flying ? 1f : 0f);
-            });
+            // simulate flying by changing the effect of gravity
+            this.Buoyancy(_flying ? 1f : 0f);
         } 
     }
     public override bool 
@@ -299,6 +296,7 @@ public class BSCharacter : PhysicsActor
         get { return _kinematic; } 
         set { _kinematic = value; } 
     }
+    // neg=fall quickly, 0=1g, 1=0g, pos=float up
     public override float Buoyancy { 
         get { return _buoyancy; } 
         set { _buoyancy = value; 
-- 
cgit v1.1


From de24feb275ddd1c7e7c0b04900718a9000b8d49b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 18 Mar 2012 11:53:53 -0700
Subject: BulletSim: Add AvatarRestitution parameter. Centralize computation of
 buoyancy for flying. Tweek avatar default friction and resititution

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index e816b61..1a61431 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -94,7 +94,7 @@ public class BSCharacter : PhysicsActor
         _flying = isFlying;
         _orientation = Quaternion.Identity;
         _velocity = Vector3.Zero;
-        _buoyancy = isFlying ? 1f : 0f;
+        _buoyancy = ComputeBuoyancyFromFlying(isFlying);
         _scale = new Vector3(1f, 1f, 1f);
         _density = _scene.Params.avatarDensity;
         ComputeAvatarVolumeAndMass();   // set _avatarVolume and _mass based on capsule size, _density and _scale
@@ -110,7 +110,7 @@ public class BSCharacter : PhysicsActor
         shapeData.Buoyancy = _buoyancy;
         shapeData.Static = ShapeData.numericFalse;
         shapeData.Friction = _scene.Params.avatarFriction;
-        shapeData.Restitution = _scene.Params.defaultRestitution;
+        shapeData.Restitution = _scene.Params.avatarRestitution;
 
         // do actual create at taint time
         _scene.TaintedObject(delegate()
@@ -261,9 +261,12 @@ public class BSCharacter : PhysicsActor
         set {
             _flying = value;
             // simulate flying by changing the effect of gravity
-            this.Buoyancy(_flying ? 1f : 0f);
+            this.Buoyancy(ComputeBuoyancyFromFlying(_flying));
         } 
     }
+    private float ComputeBuoyancyFromFlying(bool ifFlying) {
+        return ifFlying ? 1f : 0f;
+    }
     public override bool 
         SetAlwaysRun { 
         get { return _setAlwaysRun; } 
-- 
cgit v1.1


From 1a738caecab74c5b9f6b6bac69a3ea9ccdc80b24 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Wed, 21 Mar 2012 07:07:44 -0700
Subject: BulletSim: update TODO list. Rearrange code for readability. Add per
 object friction and restitution runtime settable parameters.

---
 OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 1a61431..20708d9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -261,7 +261,7 @@ public class BSCharacter : PhysicsActor
         set {
             _flying = value;
             // simulate flying by changing the effect of gravity
-            this.Buoyancy(ComputeBuoyancyFromFlying(_flying));
+            this.Buoyancy = ComputeBuoyancyFromFlying(_flying);
         } 
     }
     private float ComputeBuoyancyFromFlying(bool ifFlying) {
@@ -356,7 +356,7 @@ public class BSCharacter : PhysicsActor
         }
         else
         {
-            m_log.WarnFormat("{0}: Got a NaN force applied to a Character", LogHeader);
+            m_log.ErrorFormat("{0}: Got a NaN force applied to a Character", LogHeader);
         }
         //m_lastUpdateSent = false;
     }
-- 
cgit v1.1