aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2012-07-31 16:22:50 -0700
committerRobert Adams2012-07-31 16:23:52 -0700
commitc51ef38e2d867d63d2d32b1a7d284033e60d9952 (patch)
tree7a02b93e48b0cde9d46780ddff54b3cc0587703a
parentBulletSim: change boolean parameters in the shape data from int's to float's ... (diff)
downloadopensim-SC_OLD-c51ef38e2d867d63d2d32b1a7d284033e60d9952.zip
opensim-SC_OLD-c51ef38e2d867d63d2d32b1a7d284033e60d9952.tar.gz
opensim-SC_OLD-c51ef38e2d867d63d2d32b1a7d284033e60d9952.tar.bz2
opensim-SC_OLD-c51ef38e2d867d63d2d32b1a7d284033e60d9952.tar.xz
BulletSim: fix problem where resizing a primary shape (cube or sphere) would not rebuild the physics mesh. Update the DLLs and SOs to latest version.
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs2
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs6
-rwxr-xr-xbin/lib32/BulletSim.dllbin541696 -> 532480 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin2469830 -> 2321137 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin696832 -> 683008 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin2678661 -> 2516576 bytes
6 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
index 07f5a21..ea3093a 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSConstraint.cs
@@ -86,7 +86,7 @@ public class BSConstraint : IDisposable
86 86
87 public bool SetCFMAndERP(float cfm, float erp) 87 public bool SetCFMAndERP(float cfm, float erp)
88 { 88 {
89 bool ret = false; 89 bool ret = true;
90 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_CFM, cfm, ConstraintParamAxis.AXIS_ALL); 90 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_CFM, cfm, ConstraintParamAxis.AXIS_ALL);
91 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_ERP, erp, ConstraintParamAxis.AXIS_ALL); 91 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_STOP_ERP, erp, ConstraintParamAxis.AXIS_ALL);
92 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_CFM, cfm, ConstraintParamAxis.AXIS_ALL); 92 BulletSimAPI.SetConstraintParam2(m_constraint.Ptr, ConstraintParams.BT_CONSTRAINT_CFM, cfm, ConstraintParamAxis.AXIS_ALL);
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 758acdc..a4ab702 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -973,7 +973,7 @@ public sealed class BSPrim : PhysicsActor
973 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z) 973 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z)
974 { 974 {
975 // m_log.DebugFormat("{0}: CreateGeom: Defaulting to sphere of size {1}", LogHeader, _size); 975 // m_log.DebugFormat("{0}: CreateGeom: Defaulting to sphere of size {1}", LogHeader, _size);
976 if (_shapeType != ShapeData.PhysicsShapeType.SHAPE_SPHERE) 976 if (forceRebuild || (_shapeType != ShapeData.PhysicsShapeType.SHAPE_SPHERE))
977 { 977 {
978 DetailLog("{0},CreateGeom,sphere", LocalID); 978 DetailLog("{0},CreateGeom,sphere", LocalID);
979 _shapeType = ShapeData.PhysicsShapeType.SHAPE_SPHERE; 979 _shapeType = ShapeData.PhysicsShapeType.SHAPE_SPHERE;
@@ -987,7 +987,7 @@ public sealed class BSPrim : PhysicsActor
987 else 987 else
988 { 988 {
989 // m_log.DebugFormat("{0}: CreateGeom: Defaulting to box. lid={1}, type={2}, size={3}", LogHeader, LocalID, _shapeType, _size); 989 // m_log.DebugFormat("{0}: CreateGeom: Defaulting to box. lid={1}, type={2}, size={3}", LogHeader, LocalID, _shapeType, _size);
990 if (_shapeType != ShapeData.PhysicsShapeType.SHAPE_BOX) 990 if (forceRebuild || (_shapeType != ShapeData.PhysicsShapeType.SHAPE_BOX))
991 { 991 {
992 DetailLog("{0},CreateGeom,box", LocalID); 992 DetailLog("{0},CreateGeom,box", LocalID);
993 _shapeType = ShapeData.PhysicsShapeType.SHAPE_BOX; 993 _shapeType = ShapeData.PhysicsShapeType.SHAPE_BOX;
@@ -1331,7 +1331,6 @@ public sealed class BSPrim : PhysicsActor
1331 1331
1332 base.RequestPhysicsterseUpdate(); 1332 base.RequestPhysicsterseUpdate();
1333 } 1333 }
1334 /*
1335 else 1334 else
1336 { 1335 {
1337 // For debugging, we can also report the movement of children 1336 // For debugging, we can also report the movement of children
@@ -1339,7 +1338,6 @@ public sealed class BSPrim : PhysicsActor
1339 LocalID, entprop.Position, entprop.Rotation, entprop.Velocity, 1338 LocalID, entprop.Position, entprop.Rotation, entprop.Velocity,
1340 entprop.Acceleration, entprop.RotationalVelocity); 1339 entprop.Acceleration, entprop.RotationalVelocity);
1341 } 1340 }
1342 */
1343 } 1341 }
1344 1342
1345 // I've collided with something 1343 // I've collided with something
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 06a3cf1..fd8f39a 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 ce187b0..72847e7 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 f51c978..300e4be 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 2476865..1acc0dd 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ