From b22d0401693dad44790d4cbf58d85c0fe3870460 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 16 Mar 2012 16:37:21 -0700
Subject: BulletSim: add some new runtime setable parameters to match the dll.

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6986046..1216bce 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,7 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0
+    AvatarFriction = 0.5
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
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

---
 bin/OpenSimDefaults.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 1216bce..a31e6f4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -846,7 +846,8 @@
     TerrainFriction = 0.50
     TerrainHitFriction = 0.8
     TerrainRestitution = 0
-    AvatarFriction = 0.5
+    AvatarFriction = 0.2
+    AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
-- 
cgit v1.1


From 142de1d02f086c80888eb216cfd31b84ec27a79b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 10:59:40 -0700
Subject: BulletSim: add a bunch of internal Bullet configuration parameters to
 OpenSimDefaults.ini and the code.

---
 bin/OpenSimDefaults.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a31e6f4..34f70a2 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -851,6 +851,7 @@
     AvatarDensity = 60.0
     AvatarCapsuleRadius = 0.37
     AvatarCapsuleHeight = 1.5
+    AvatarContactProcessingThreshold = 0.1;
 
     MaxObjectMass = 10000.01
 
@@ -863,6 +864,14 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    MaxPersistantManifoldPoolSize = 0;
+    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldForceUpdateAllAabbs = False;
+    ShouldRandomizeSolverOrder = False;
+    ShouldSplitSimulationIslands = False;
+    ShouldEnableFrictionCaching = False;
+    NumberOfSolverIterations = 0;   
+
 
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
-- 
cgit v1.1


From ff54b3c3661a6bf9d5f0d9a24f8aeed5b42ce0ce Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Fri, 23 Mar 2012 15:50:32 -0700
Subject: BulletSim: change default of
 shouldDisableContactPoolDynamicAllocation from False to True. It seems that
 collisions don't happen well when it is False (things fall through terrain).

---
 bin/OpenSimDefaults.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 34f70a2..41be415 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -865,7 +865,7 @@
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = False;
+    ShouldDisableContactPoolDynamicAllocation = True;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
-- 
cgit v1.1


From 84c9bd52d3c2e01f1b385a6dd0fc4822a652867b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 26 Mar 2012 13:48:15 -0700
Subject: BulletSim: update BulletSim binaries and configuration fixing a crash
 which happens when there are more than a few hundred physical objects.

---
 bin/OpenSimDefaults.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 41be415..28c5587 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -864,8 +864,9 @@
     CcdMotionThreshold = 0.0
     CcdSweptSphereRadius = 0.0
     ContactProcessingThreshold = 0.1
+    ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc)
     MaxPersistantManifoldPoolSize = 0;
-    ShouldDisableContactPoolDynamicAllocation = True;
+    ShouldDisableContactPoolDynamicAllocation = False;
     ShouldForceUpdateAllAabbs = False;
     ShouldRandomizeSolverOrder = False;
     ShouldSplitSimulationIslands = False;
-- 
cgit v1.1