From 2c517d792f0440c2705458e01a5067628b6b2c7c Mon Sep 17 00:00:00 2001
From: teravus
Date: Sun, 20 Jan 2013 08:18:16 -0500
Subject: This updates prebuild to remove BulletSimN, implements the BulletSim
 API in BulletSPlugin using the BulletXNA Bullet physics engine.  It also
 updates the BulletXNA library to be compatible with the changes.  
 OpenSimDefaults has been updated to describe how to switch engines and
 terrain implementations.

---
 bin/BulletXNA.dll       | Bin 614400 -> 614400 bytes
 bin/BulletXNA.pdb       | Bin 1875456 -> 1969664 bytes
 bin/OpenSimDefaults.ini |  14 ++++++++++++++
 3 files changed, 14 insertions(+)

(limited to 'bin')

diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll
index 1e3f042..5e69b2e 100644
Binary files a/bin/BulletXNA.dll and b/bin/BulletXNA.dll differ
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb
index 4b83b83..3d4906f 100644
Binary files a/bin/BulletXNA.pdb and b/bin/BulletXNA.pdb differ
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 54b88b4..889865b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -908,6 +908,19 @@
 
 [BulletSim]
     ; World parameters
+
+    ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll
+    ; bulletxna is a managed C# dll.  They have comparible functionality..   the c++ is much faster.
+
+    BulletEngine = "bulletunmanaged"
+    ; BulletEngine = "bulletxna"
+
+    ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain.  If you're using the bulletxna engine, 
+    ;  you will want to switch to the heightfield option
+
+    TerrainImplementation = 1
+    ; TerrainImplementation = 0
+
     DefaultFriction = 0.20
     DefaultDensity = 10.000006836
     DefaultRestitution = 0.0
@@ -959,6 +972,7 @@
     PhysicsLoggingEnabled = False
     PhysicsLoggingDir = "."
     VehicleLoggingEnabled = False
+    
 
 [RemoteAdmin]
     enabled = false
-- 
cgit v1.1