aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRobert Adams2013-01-23 16:14:15 -0800
committerRobert Adams2013-01-23 16:20:44 -0800
commit1c3d84fe03811aad3896031a6391bd37e140f80c (patch)
tree6f9051e4e38fb9bf739724aa5ade21fc976a1880
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-1c3d84fe03811aad3896031a6391bd37e140f80c.zip
opensim-SC_OLD-1c3d84fe03811aad3896031a6391bd37e140f80c.tar.gz
opensim-SC_OLD-1c3d84fe03811aad3896031a6391bd37e140f80c.tar.bz2
opensim-SC_OLD-1c3d84fe03811aad3896031a6391bd37e140f80c.tar.xz
BulletSim: pass up and report the real collision penetration.
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs1
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSScene.cs5
-rwxr-xr-xbin/lib32/BulletSim.dllbin551424 -> 551424 bytes
-rwxr-xr-xbin/lib32/libBulletSim.sobin1720142 -> 1720231 bytes
-rwxr-xr-xbin/lib64/BulletSim.dllbin700416 -> 700416 bytes
-rwxr-xr-xbin/lib64/libBulletSim.sobin1858627 -> 1858716 bytes
6 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index 2828cab..f25b447 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -130,6 +130,7 @@ public struct CollisionDesc
130 public uint bID; 130 public uint bID;
131 public Vector3 point; 131 public Vector3 point;
132 public Vector3 normal; 132 public Vector3 normal;
133 public float penetration;
133} 134}
134[StructLayout(LayoutKind.Sequential)] 135[StructLayout(LayoutKind.Sequential)]
135public struct EntityProperties 136public struct EntityProperties
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 34fd2a0..35dba9b 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -557,8 +557,9 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
557 uint cB = m_collisionArray[ii].bID; 557 uint cB = m_collisionArray[ii].bID;
558 Vector3 point = m_collisionArray[ii].point; 558 Vector3 point = m_collisionArray[ii].point;
559 Vector3 normal = m_collisionArray[ii].normal; 559 Vector3 normal = m_collisionArray[ii].normal;
560 SendCollision(cA, cB, point, normal, 0.01f); 560 float penetration = m_collisionArray[ii].penetration;
561 SendCollision(cB, cA, point, -normal, 0.01f); 561 SendCollision(cA, cB, point, normal, penetration);
562 SendCollision(cB, cA, point, -normal, penetration);
562 } 563 }
563 } 564 }
564 565
diff --git a/bin/lib32/BulletSim.dll b/bin/lib32/BulletSim.dll
index 014eca4..b46837f 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 5e4d8cc..a2e6f3c 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 d00549e..0a1faf3 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 b94e264..36674f0 100755
--- a/bin/lib64/libBulletSim.so
+++ b/bin/lib64/libBulletSim.so
Binary files differ