diff options
author | Robert Adams | 2012-07-31 11:32:26 -0700 |
---|---|---|
committer | Robert Adams | 2012-07-31 16:23:48 -0700 |
commit | e38d26a2dc35ce7bf904c58200912a65c05aa39d (patch) | |
tree | 558c81cd622dffb233595d3115dbc5d2f176f998 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | Change exception log messages in XInventoryService connector to error rather ... (diff) | |
download | opensim-SC_OLD-e38d26a2dc35ce7bf904c58200912a65c05aa39d.zip opensim-SC_OLD-e38d26a2dc35ce7bf904c58200912a65c05aa39d.tar.gz opensim-SC_OLD-e38d26a2dc35ce7bf904c58200912a65c05aa39d.tar.bz2 opensim-SC_OLD-e38d26a2dc35ce7bf904c58200912a65c05aa39d.tar.xz |
BulletSim: change boolean parameters in the shape data from int's to float's to be consistant with parameter data structure
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-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 |