diff options
| author | Robert Adams | 2012-10-29 14:28:24 -0700 |
|---|---|---|
| committer | Robert Adams | 2012-11-03 21:14:16 -0700 |
| commit | 4cfa3be4efbca49e4670b92ec2c110f65f658b8e (patch) | |
| tree | 9715a0a1ac70df6212af360b563698414cf5b639 /OpenSim/Region | |
| parent | BulletSim: code rearrangement (diff) | |
| download | opensim-SC-4cfa3be4efbca49e4670b92ec2c110f65f658b8e.zip opensim-SC-4cfa3be4efbca49e4670b92ec2c110f65f658b8e.tar.gz opensim-SC-4cfa3be4efbca49e4670b92ec2c110f65f658b8e.tar.bz2 opensim-SC-4cfa3be4efbca49e4670b92ec2c110f65f658b8e.tar.xz | |
BulletSim: add definitions for linkset collision mask
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index be3a5ad..9b7ba03 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -378,6 +378,7 @@ public enum CollisionFilterGroups : uint | |||
| 378 | BTerrainFilter = 1 << 11, | 378 | BTerrainFilter = 1 << 11, |
| 379 | BRaycastFilter = 1 << 12, | 379 | BRaycastFilter = 1 << 12, |
| 380 | BSolidFilter = 1 << 13, | 380 | BSolidFilter = 1 << 13, |
| 381 | BLinksetFilter = 1 << 14, | ||
| 381 | 382 | ||
| 382 | // The collsion filters and masked are defined in one place -- don't want them scattered | 383 | // The collsion filters and masked are defined in one place -- don't want them scattered |
| 383 | AvatarFilter = BCharacterFilter, | 384 | AvatarFilter = BCharacterFilter, |
| @@ -386,6 +387,8 @@ public enum CollisionFilterGroups : uint | |||
| 386 | ObjectMask = BAllFilter, | 387 | ObjectMask = BAllFilter, |
| 387 | StaticObjectFilter = BStaticFilter, | 388 | StaticObjectFilter = BStaticFilter, |
| 388 | StaticObjectMask = BAllFilter, | 389 | StaticObjectMask = BAllFilter, |
| 390 | LinksetFilter = BLinksetFilter, | ||
| 391 | LinksetMask = BAllFilter & ~BLinksetFilter, | ||
| 389 | VolumeDetectFilter = BSensorTrigger, | 392 | VolumeDetectFilter = BSensorTrigger, |
| 390 | VolumeDetectMask = ~BSensorTrigger, | 393 | VolumeDetectMask = ~BSensorTrigger, |
| 391 | TerrainFilter = BTerrainFilter, | 394 | TerrainFilter = BTerrainFilter, |