From 9b98011714110f70b6ce454594b793cd929fd27b Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 24 Nov 2012 20:19:14 -0800
Subject: BulletSim: update OpenSimDefaults.ini with current default values for
 friction and collision margin. Remove some of the BulletSim parameters that
 are very esoteric and dangerous. Most of the remaining parameters are
 features one can 'see'.

---
 bin/OpenSimDefaults.ini | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 8a451ec..e9bdabc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -221,10 +221,10 @@
     ; to false if you have compatibility problems.
     ;CacheSculptMaps = true
     
-    ; Choose one of the physics engines below
-    ; OpenDynamicsEngine is by some distance the most developed physics engine
-    ; basicphysics effectively does not model physics at all, making all objects phantom
-
+    ; Choose one of the physics engines below.
+    ; OpenDynamicsEngine is by some distance the most developed physics engine.
+    ; BulletSim is a high performance, up-and-coming physics engine.
+    ; basicphysics effectively does not model physics at all, making all objects phantom.
     physics = OpenDynamicsEngine
     ;physics = basicphysics
     ;physics = POS
@@ -908,15 +908,18 @@
 
 [BulletSim]
     ; World parameters
-    DefaultFriction = 0.50
+    DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
     Gravity = -9.80665
 
-    TerrainFriction = 0.50
-    TerrainHitFriction = 0.8
+    TerrainFriction = 0.30
+    TerrainHitFraction = 0.8
     TerrainRestitution = 0
+    TerrainCollisionMargin = 0.04
+
     AvatarFriction = 0.2
+    AvatarStandingFriction = 0.99
     AvatarRestitution = 0.0
     AvatarDensity = 60.0
     AvatarCapsuleWidth = 0.6
@@ -930,27 +933,15 @@
     LinearDamping = 0.0
     AngularDamping = 0.0
     DeactivationTime = 0.2
-    LinearSleepingThreshold = 0.8
-    AngularSleepingThreshold = 1.0
-    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 = False
-    ShouldForceUpdateAllAabbs = False
-    ShouldRandomizeSolverOrder = True
-    ShouldSplitSimulationIslands = True
-    ShouldEnableFrictionCaching = False
-    NumberOfSolverIterations = 0   
+    CollisionMargin = 0.04
 
     ; Linkset constraint parameters
+    LinkImplementation = 1      ; 0=constraint, 1=compound
     LinkConstraintUseFrameOffset = False
     LinkConstraintEnableTransMotor = True
     LinkConstraintTransMotorMaxVel = 5.0
     LinkConstraintTransMotorMaxForce = 0.1
 
-
     ; Whether to mesh sculpties
     MeshSculptedPrim = true
 
-- 
cgit v1.1


From bd635e264a594eafc60b15d2996957f4c228a7c9 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sat, 24 Nov 2012 20:25:54 -0800
Subject: BulletSim: update DLLs and SOs with new collision margin setting
 function.

---
 bin/lib32/BulletSim.dll   | Bin 551424 -> 551424 bytes
 bin/lib32/libBulletSim.so | Bin 1707321 -> 1707625 bytes
 bin/lib64/BulletSim.dll   | Bin 699904 -> 699904 bytes
 bin/lib64/libBulletSim.so | Bin 1844228 -> 1844588 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

(limited to 'bin')

diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 2ae1c75..38b11cd 100755
Binary files a/bin/lib32/BulletSim.dll and b/bin/lib32/BulletSim.dll differ
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so
index d4852a5..f59ec97 100755
Binary files a/bin/lib32/libBulletSim.so and b/bin/lib32/libBulletSim.so differ
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll
index 77cf7e3..1861d6d 100755
Binary files a/bin/lib64/BulletSim.dll and b/bin/lib64/BulletSim.dll differ
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so
index 4ec62b2..e9b8845 100755
Binary files a/bin/lib64/libBulletSim.so and b/bin/lib64/libBulletSim.so differ
-- 
cgit v1.1