aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-02-08 16:27:44 -0800
committerRobert Adams2013-02-08 16:29:52 -0800
commit4808b8ee380d32c1b63654f9c0170a5f07b46bd0 (patch)
tree2a101cbae42c5aa36487873330dabbb6348ccc92
parentBulletSim: Change BSCharacter to use new base Density and Friction (diff)
downloadopensim-SC_OLD-4808b8ee380d32c1b63654f9c0170a5f07b46bd0.zip
opensim-SC_OLD-4808b8ee380d32c1b63654f9c0170a5f07b46bd0.tar.gz
opensim-SC_OLD-4808b8ee380d32c1b63654f9c0170a5f07b46bd0.tar.bz2
opensim-SC_OLD-4808b8ee380d32c1b63654f9c0170a5f07b46bd0.tar.xz
BulletSim: add parameter to set global contact breaking threshold. Update DLLs and SOs for setting same.
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs1
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSParam.cs6
-rwxr-xr-xbin/lib32/BulletSim.dllbin546304 -> 546816 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1695269 -> 1695699 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin694272 -> 694272 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1841657 -> 1842163 bytes
6 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 5e06c1e..7ab86d2 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -183,6 +183,7 @@ public struct ConfigurationParameters
183 public float shouldEnableFrictionCaching; 183 public float shouldEnableFrictionCaching;
184 public float numberOfSolverIterations; 184 public float numberOfSolverIterations;
185 public float useSingleSidedMeshes; 185 public float useSingleSidedMeshes;
186 public float globalContactBreakingThreshold;
186 187
187 public float physicsLoggingFrames; 188 public float physicsLoggingFrames;
188 189
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 6cb7434..3e0b4bc 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -87,6 +87,7 @@ public static class BSParam
87 public static float NumberOfSolverIterations; 87 public static float NumberOfSolverIterations;
88 public static bool UseSingleSidedMeshes { get { return UseSingleSidedMeshesF != ConfigurationParameters.numericFalse; } } 88 public static bool UseSingleSidedMeshes { get { return UseSingleSidedMeshesF != ConfigurationParameters.numericFalse; } }
89 public static float UseSingleSidedMeshesF; 89 public static float UseSingleSidedMeshesF;
90 public static float GlobalContactBreakingThreshold;
90 91
91 // Avatar parameters 92 // Avatar parameters
92 public static float AvatarFriction { get; private set; } 93 public static float AvatarFriction { get; private set; }
@@ -570,6 +571,11 @@ public static class BSParam
570 (s,cf,p,v) => { UseSingleSidedMeshesF = BSParam.NumericBool(cf.GetBoolean(p, BSParam.BoolNumeric(v))); }, 571 (s,cf,p,v) => { UseSingleSidedMeshesF = BSParam.NumericBool(cf.GetBoolean(p, BSParam.BoolNumeric(v))); },
571 (s) => { return UseSingleSidedMeshesF; }, 572 (s) => { return UseSingleSidedMeshesF; },
572 (s,p,l,v) => { UseSingleSidedMeshesF = v; s.UnmanagedParams[0].useSingleSidedMeshes = v; } ), 573 (s,p,l,v) => { UseSingleSidedMeshesF = v; s.UnmanagedParams[0].useSingleSidedMeshes = v; } ),
574 new ParameterDefn("GlobalContactBreakingThreshold", "Amount of shape radius before breaking a collision contact (0 says Bullet default (0.2))",
575 0f,
576 (s,cf,p,v) => { GlobalContactBreakingThreshold = cf.GetFloat(p, v); },
577 (s) => { return GlobalContactBreakingThreshold; },
578 (s,p,l,v) => { GlobalContactBreakingThreshold = v; s.UnmanagedParams[0].globalContactBreakingThreshold = v; } ),
573 579
574 new ParameterDefn("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)", 580 new ParameterDefn("LinksetImplementation", "Type of linkset implementation (0=Constraint, 1=Compound, 2=Manual)",
575 (float)BSLinkset.LinksetImplementation.Compound, 581 (float)BSLinkset.LinksetImplementation.Compound,
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index de4f95a..4dd2f38 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 674a08a..cb8742a 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 1c55b19..c9f5814 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 e2fc8bd..19fc7bf 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ