aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
diff options
context:
space:
mode:
authorRobert Adams2012-12-13 23:08:01 -0800
committerRobert Adams2012-12-13 23:08:01 -0800
commit664dad53dded9537e75893ca9fc6a42c93a95ded (patch)
treeb6a3f3b2f7e6f19ab781a9c2ebaabc963bc19779 /OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
parentReturn the last set targetVelocity rather than the current velocity as the de... (diff)
downloadopensim-SC-664dad53dded9537e75893ca9fc6a42c93a95ded.zip
opensim-SC-664dad53dded9537e75893ca9fc6a42c93a95ded.tar.gz
opensim-SC-664dad53dded9537e75893ca9fc6a42c93a95ded.tar.bz2
opensim-SC-664dad53dded9537e75893ca9fc6a42c93a95ded.tar.xz
BulletSim: Add more to the TODO list. Clean up and improve some comments.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs12
1 files changed, 4 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
index 524a1d0..662177f 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimData.cs
@@ -98,18 +98,14 @@ public struct BulletBody
98 98
99public struct BulletShape 99public struct BulletShape
100{ 100{
101 public BulletShape(IntPtr xx) 101 public BulletShape(IntPtr xx) : this(xx, BSPhysicsShapeType.SHAPE_UNKNOWN)
102 { 102 {
103 ptr = xx;
104 type=BSPhysicsShapeType.SHAPE_UNKNOWN;
105 shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
106 isNativeShape = false;
107 } 103 }
108 public BulletShape(IntPtr xx, BSPhysicsShapeType typ) 104 public BulletShape(IntPtr xx, BSPhysicsShapeType typ)
109 { 105 {
110 ptr = xx; 106 ptr = xx;
111 type = typ; 107 type = typ;
112 shapeKey = 0; 108 shapeKey = (System.UInt64)FixedShapeKey.KEY_NONE;
113 isNativeShape = false; 109 isNativeShape = false;
114 } 110 }
115 public IntPtr ptr; 111 public IntPtr ptr;
@@ -192,7 +188,7 @@ public enum CollisionType
192 Static, 188 Static,
193 Dynamic, 189 Dynamic,
194 VolumeDetect, 190 VolumeDetect,
195 // Linkset, // A linkset proper should be either Static or Dynamic 191 // Linkset, // A linkset should be either Static or Dynamic
196 LinksetChild, 192 LinksetChild,
197 Unknown 193 Unknown
198}; 194};
@@ -211,7 +207,7 @@ public struct CollisionTypeFilterGroup
211 public uint mask; 207 public uint mask;
212}; 208};
213 209
214 /* 210 /* NOTE: old definitions kept for reference. Delete when things are working.
215 // The collsion filters and masked are defined in one place -- don't want them scattered 211 // The collsion filters and masked are defined in one place -- don't want them scattered
216 AvatarGroup = BCharacterGroup, 212 AvatarGroup = BCharacterGroup,
217 AvatarMask = BAllGroup, 213 AvatarMask = BAllGroup,