diff options
author | teravus | 2013-01-20 08:18:16 -0500 |
---|---|---|
committer | teravus | 2013-01-20 08:18:16 -0500 |
commit | 2c517d792f0440c2705458e01a5067628b6b2c7c (patch) | |
tree | e15a2fb08f80223138f19926c3d0f0cf20aff5c2 /bin | |
parent | * Dumping BulletSimNPlugin in favor of combining the API (diff) | |
download | opensim-SC_OLD-2c517d792f0440c2705458e01a5067628b6b2c7c.zip opensim-SC_OLD-2c517d792f0440c2705458e01a5067628b6b2c7c.tar.gz opensim-SC_OLD-2c517d792f0440c2705458e01a5067628b6b2c7c.tar.bz2 opensim-SC_OLD-2c517d792f0440c2705458e01a5067628b6b2c7c.tar.xz |
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.
Diffstat (limited to 'bin')
-rw-r--r-- | bin/BulletXNA.dll | bin | 614400 -> 614400 bytes | |||
-rw-r--r-- | bin/BulletXNA.pdb | bin | 1875456 -> 1969664 bytes | |||
-rw-r--r-- | bin/OpenSimDefaults.ini | 14 |
3 files changed, 14 insertions, 0 deletions
diff --git a/bin/BulletXNA.dll b/bin/BulletXNA.dll index 1e3f042..5e69b2e 100644 --- a/bin/BulletXNA.dll +++ b/bin/BulletXNA.dll | |||
Binary files differ | |||
diff --git a/bin/BulletXNA.pdb b/bin/BulletXNA.pdb index 4b83b83..3d4906f 100644 --- a/bin/BulletXNA.pdb +++ b/bin/BulletXNA.pdb | |||
Binary files 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 @@ | |||
908 | 908 | ||
909 | [BulletSim] | 909 | [BulletSim] |
910 | ; World parameters | 910 | ; World parameters |
911 | |||
912 | ; There are two bullet physics libraries, bulletunmanaged is the default and is a native c++ dll | ||
913 | ; bulletxna is a managed C# dll. They have comparible functionality.. the c++ is much faster. | ||
914 | |||
915 | BulletEngine = "bulletunmanaged" | ||
916 | ; BulletEngine = "bulletxna" | ||
917 | |||
918 | ; Terrain Implementation {1|0} 0 for HeightField, 1 for Mesh terrain. If you're using the bulletxna engine, | ||
919 | ; you will want to switch to the heightfield option | ||
920 | |||
921 | TerrainImplementation = 1 | ||
922 | ; TerrainImplementation = 0 | ||
923 | |||
911 | DefaultFriction = 0.20 | 924 | DefaultFriction = 0.20 |
912 | DefaultDensity = 10.000006836 | 925 | DefaultDensity = 10.000006836 |
913 | DefaultRestitution = 0.0 | 926 | DefaultRestitution = 0.0 |
@@ -959,6 +972,7 @@ | |||
959 | PhysicsLoggingEnabled = False | 972 | PhysicsLoggingEnabled = False |
960 | PhysicsLoggingDir = "." | 973 | PhysicsLoggingDir = "." |
961 | VehicleLoggingEnabled = False | 974 | VehicleLoggingEnabled = False |
975 | |||
962 | 976 | ||
963 | [RemoteAdmin] | 977 | [RemoteAdmin] |
964 | enabled = false | 978 | enabled = false |