diff options
| author | Melanie | 2012-08-01 23:03:03 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-01 23:03:03 +0100 |
| commit | ecffcf7f65151a45b6396354d66fec70a7f3bad8 (patch) | |
| tree | c2b98c522344cf713421b21ddb4452e537396f5a /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.zip opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.gz opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.bz2 opensim-SC-ecffcf7f65151a45b6396354d66fec70a7f3bad8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index fe705cc..0ffbc94 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -87,12 +87,12 @@ public struct ShapeData | |||
| 87 | public System.UInt64 MeshKey; | 87 | public System.UInt64 MeshKey; |
| 88 | public float Friction; | 88 | public float Friction; |
| 89 | public float Restitution; | 89 | public float Restitution; |
| 90 | public int Collidable; | 90 | public float Collidable; // true of things bump into this |
| 91 | public int Static; // true if a static object. Otherwise gravity, etc. | 91 | public float Static; // true if a static object. Otherwise gravity, etc. |
| 92 | 92 | ||
| 93 | // note that bools are passed as ints since bool size changes by language and architecture | 93 | // note that bools are passed as floats since bool size changes by language and architecture |
| 94 | public const int numericTrue = 1; | 94 | public const float numericTrue = 1f; |
| 95 | public const int numericFalse = 0; | 95 | public const float numericFalse = 0f; |
| 96 | } | 96 | } |
| 97 | [StructLayout(LayoutKind.Sequential)] | 97 | [StructLayout(LayoutKind.Sequential)] |
| 98 | public struct SweepHit | 98 | public struct SweepHit |