aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-05-26 17:35:12 -0700
committerRobert Adams2013-05-26 17:35:12 -0700
commit0c35d28933ddb2cae7b4f095b35ed4e386a1b71b (patch)
tree4a3515b5f974af89e69f038a57933a42c54b78f1
parentUpdate the money framework to allow sending the new style linden "serverside ... (diff)
downloadopensim-SC_OLD-0c35d28933ddb2cae7b4f095b35ed4e386a1b71b.zip
opensim-SC_OLD-0c35d28933ddb2cae7b4f095b35ed4e386a1b71b.tar.gz
opensim-SC_OLD-0c35d28933ddb2cae7b4f095b35ed4e386a1b71b.tar.bz2
opensim-SC_OLD-0c35d28933ddb2cae7b4f095b35ed4e386a1b71b.tar.xz
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
which recompute GImpact shape bounding box after creation as Bullet doesn't do that itself (something it does for nearly every other shape). Now, physical prims without cuts become single mesh convex meshes. Physical prims with cuts become GImpact meshes. Meshes become a set of convex hulls approximated from the mesh unless the hulls are specified in the mesh asset data. The use of GImpact shapes should make some mechanical physics more stable.
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs2
-rwxr-xr-xbin/lib32/BulletSim.dllbin982528 -> 982528 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2271520 -> 2271724 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin1222656 -> 1222656 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2454504 -> 2454796 bytes
5 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index e98a7fb..0f0a494 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -373,7 +373,7 @@ public static class BSParam
373 new ParameterDefn<bool>("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims", 373 new ParameterDefn<bool>("ShouldUseSingleConvexHullForPrims", "If true, use a single convex hull shape for physical prims",
374 true ), 374 true ),
375 new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists", 375 new ParameterDefn<bool>("ShouldUseGImpactShapeForPrims", "If true, use a GImpact shape for prims with cuts and twists",
376 false ), 376 true ),
377 new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info", 377 new ParameterDefn<bool>("ShouldUseAssetHulls", "If true, use hull if specified in the mesh asset info",
378 false ), 378 false ),
379 379
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index d63ee1d..bc0e222 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 03de631..e09dd27 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 e155f0e..5fc09f6 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 ac64a40..925269d 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ