diff options
| author | Robert Adams | 2013-01-23 16:14:15 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-01-23 16:20:44 -0800 |
| commit | 1c3d84fe03811aad3896031a6391bd37e140f80c (patch) | |
| tree | 6f9051e4e38fb9bf739724aa5ade21fc976a1880 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-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.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 1 |
1 files changed, 1 insertions, 0 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)] |
| 135 | public struct EntityProperties | 136 | public struct EntityProperties |