aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
authorRobert Adams2012-12-27 22:04:12 -0800
committerRobert Adams2012-12-27 22:12:28 -0800
commit1f6aaad0b587f1589afd7a7ca6feb8d2bbba8641 (patch)
tree1edae51295588cc0805ecc11d0866c68a39f8a7c /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
parentBulletSim: fix physical object not interacting with static objects. (diff)
downloadopensim-SC_OLD-1f6aaad0b587f1589afd7a7ca6feb8d2bbba8641.zip
opensim-SC_OLD-1f6aaad0b587f1589afd7a7ca6feb8d2bbba8641.tar.gz
opensim-SC_OLD-1f6aaad0b587f1589afd7a7ca6feb8d2bbba8641.tar.bz2
opensim-SC_OLD-1f6aaad0b587f1589afd7a7ca6feb8d2bbba8641.tar.xz
BulletSim: correct collision mask definition for linkset children.
Remove unused code. Add comments and TODOs.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index afe5bca..eb4d039 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -250,20 +250,20 @@ public enum CollisionFilterGroups : uint
250 // filter/mask definition below. This way collision interactions 250 // filter/mask definition below. This way collision interactions
251 // are more easily found and debugged. 251 // are more easily found and debugged.
252 BNoneGroup = 0, 252 BNoneGroup = 0,
253 BDefaultGroup = 1 << 0, 253 BDefaultGroup = 1 << 0, // 0001
254 BStaticGroup = 1 << 1, 254 BStaticGroup = 1 << 1, // 0002
255 BKinematicGroup = 1 << 2, 255 BKinematicGroup = 1 << 2, // 0004
256 BDebrisGroup = 1 << 3, 256 BDebrisGroup = 1 << 3, // 0008
257 BSensorTrigger = 1 << 4, 257 BSensorTrigger = 1 << 4, // 0010
258 BCharacterGroup = 1 << 5, 258 BCharacterGroup = 1 << 5, // 0020
259 BAllGroup = 0xFFFFFFFF, 259 BAllGroup = 0x000FFFFF,
260 // Filter groups defined by BulletSim 260 // Filter groups defined by BulletSim
261 BGroundPlaneGroup = 1 << 10, 261 BGroundPlaneGroup = 1 << 10, // 0400
262 BTerrainGroup = 1 << 11, 262 BTerrainGroup = 1 << 11, // 0800
263 BRaycastGroup = 1 << 12, 263 BRaycastGroup = 1 << 12, // 1000
264 BSolidGroup = 1 << 13, 264 BSolidGroup = 1 << 13, // 2000
265 // BLinksetGroup = xx // a linkset proper is either static or dynamic 265 // BLinksetGroup = xx // a linkset proper is either static or dynamic
266 BLinksetChildGroup = 1 << 14, 266 BLinksetChildGroup = 1 << 14, // 4000
267}; 267};
268 268
269// CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0 269// CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0