diff options
Diffstat (limited to '')
-rw-r--r-- | bin/OpenSimDefaults.ini | 33 | ||||
-rwxr-xr-x | bin/lib32/BulletSim.dll | bin | 551424 -> 551424 bytes | |||
-rwxr-xr-x | bin/lib32/libBulletSim.so | bin | 1707321 -> 1707625 bytes | |||
-rwxr-xr-x | bin/lib64/BulletSim.dll | bin | 699904 -> 699904 bytes | |||
-rwxr-xr-x | bin/lib64/libBulletSim.so | bin | 1844228 -> 1844588 bytes |
5 files changed, 12 insertions, 21 deletions
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 @@ | |||
221 | ; to false if you have compatibility problems. | 221 | ; to false if you have compatibility problems. |
222 | ;CacheSculptMaps = true | 222 | ;CacheSculptMaps = true |
223 | 223 | ||
224 | ; Choose one of the physics engines below | 224 | ; Choose one of the physics engines below. |
225 | ; OpenDynamicsEngine is by some distance the most developed physics engine | 225 | ; OpenDynamicsEngine is by some distance the most developed physics engine. |
226 | ; basicphysics effectively does not model physics at all, making all objects phantom | 226 | ; BulletSim is a high performance, up-and-coming physics engine. |
227 | 227 | ; basicphysics effectively does not model physics at all, making all objects phantom. | |
228 | physics = OpenDynamicsEngine | 228 | physics = OpenDynamicsEngine |
229 | ;physics = basicphysics | 229 | ;physics = basicphysics |
230 | ;physics = POS | 230 | ;physics = POS |
@@ -908,15 +908,18 @@ | |||
908 | 908 | ||
909 | [BulletSim] | 909 | [BulletSim] |
910 | ; World parameters | 910 | ; World parameters |
911 | DefaultFriction = 0.50 | 911 | DefaultFriction = 0.20 |
912 | DefaultDensity = 10.000006836 | 912 | DefaultDensity = 10.000006836 |
913 | DefaultRestitution = 0.0 | 913 | DefaultRestitution = 0.0 |
914 | Gravity = -9.80665 | 914 | Gravity = -9.80665 |
915 | 915 | ||
916 | TerrainFriction = 0.50 | 916 | TerrainFriction = 0.30 |
917 | TerrainHitFriction = 0.8 | 917 | TerrainHitFraction = 0.8 |
918 | TerrainRestitution = 0 | 918 | TerrainRestitution = 0 |
919 | TerrainCollisionMargin = 0.04 | ||
920 | |||
919 | AvatarFriction = 0.2 | 921 | AvatarFriction = 0.2 |
922 | AvatarStandingFriction = 0.99 | ||
920 | AvatarRestitution = 0.0 | 923 | AvatarRestitution = 0.0 |
921 | AvatarDensity = 60.0 | 924 | AvatarDensity = 60.0 |
922 | AvatarCapsuleWidth = 0.6 | 925 | AvatarCapsuleWidth = 0.6 |
@@ -930,27 +933,15 @@ | |||
930 | LinearDamping = 0.0 | 933 | LinearDamping = 0.0 |
931 | AngularDamping = 0.0 | 934 | AngularDamping = 0.0 |
932 | DeactivationTime = 0.2 | 935 | DeactivationTime = 0.2 |
933 | LinearSleepingThreshold = 0.8 | 936 | CollisionMargin = 0.04 |
934 | AngularSleepingThreshold = 1.0 | ||
935 | CcdMotionThreshold = 0.0 | ||
936 | CcdSweptSphereRadius = 0.0 | ||
937 | ContactProcessingThreshold = 0.1 | ||
938 | ; If setting a pool size, also disable dynamic allocation (default pool size is 4096 with dynamic alloc) | ||
939 | MaxPersistantManifoldPoolSize = 0 | ||
940 | ShouldDisableContactPoolDynamicAllocation = False | ||
941 | ShouldForceUpdateAllAabbs = False | ||
942 | ShouldRandomizeSolverOrder = True | ||
943 | ShouldSplitSimulationIslands = True | ||
944 | ShouldEnableFrictionCaching = False | ||
945 | NumberOfSolverIterations = 0 | ||
946 | 937 | ||
947 | ; Linkset constraint parameters | 938 | ; Linkset constraint parameters |
939 | LinkImplementation = 1 ; 0=constraint, 1=compound | ||
948 | LinkConstraintUseFrameOffset = False | 940 | LinkConstraintUseFrameOffset = False |
949 | LinkConstraintEnableTransMotor = True | 941 | LinkConstraintEnableTransMotor = True |
950 | LinkConstraintTransMotorMaxVel = 5.0 | 942 | LinkConstraintTransMotorMaxVel = 5.0 |
951 | LinkConstraintTransMotorMaxForce = 0.1 | 943 | LinkConstraintTransMotorMaxForce = 0.1 |
952 | 944 | ||
953 | |||
954 | ; Whether to mesh sculpties | 945 | ; Whether to mesh sculpties |
955 | MeshSculptedPrim = true | 946 | MeshSculptedPrim = true |
956 | 947 | ||
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll index 2ae1c75..38b11cd 100755 --- a/bin/lib32/BulletSim.dll +++ b/bin/lib32/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib32/libBulletSim.so b/bin/lib32/libBulletSim.so index d4852a5..f59ec97 100755 --- a/bin/lib32/libBulletSim.so +++ b/bin/lib32/libBulletSim.so | |||
Binary files differ | |||
diff --git a/bin/lib64/BulletSim.dll b/bin/lib64/BulletSim.dll index 77cf7e3..1861d6d 100755 --- a/bin/lib64/BulletSim.dll +++ b/bin/lib64/BulletSim.dll | |||
Binary files differ | |||
diff --git a/bin/lib64/libBulletSim.so b/bin/lib64/libBulletSim.so index 4ec62b2..e9b8845 100755 --- a/bin/lib64/libBulletSim.so +++ b/bin/lib64/libBulletSim.so | |||
Binary files differ | |||