aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
authorRobert Adams2012-11-20 20:36:49 -0800
committerRobert Adams2012-11-21 16:43:21 -0800
commit34cbc738a84b7946a87e8bfd3bb04869519b3dee (patch)
tree1e0c0891022162f4aac9793ef5937c254bbaa2fa /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
parentBulletSim: pull heightmap implementation out of the terrain manager so a mesh... (diff)
downloadopensim-SC_OLD-34cbc738a84b7946a87e8bfd3bb04869519b3dee.zip
opensim-SC_OLD-34cbc738a84b7946a87e8bfd3bb04869519b3dee.tar.gz
opensim-SC_OLD-34cbc738a84b7946a87e8bfd3bb04869519b3dee.tar.bz2
opensim-SC_OLD-34cbc738a84b7946a87e8bfd3bb04869519b3dee.tar.xz
BulletSim: enablement and debugging of mesh terrain.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index bab3b3d..a2271a9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -391,13 +391,13 @@ public enum CollisionFilterGroups : uint
391 ObjectFilter = BSolidFilter, 391 ObjectFilter = BSolidFilter,
392 ObjectMask = BAllFilter, 392 ObjectMask = BAllFilter,
393 StaticObjectFilter = BStaticFilter, 393 StaticObjectFilter = BStaticFilter,
394 StaticObjectMask = BAllFilter, 394 StaticObjectMask = BAllFilter & ~BStaticFilter, // static objects don't collide with each other
395 LinksetFilter = BLinksetFilter, 395 LinksetFilter = BLinksetFilter,
396 LinksetMask = BAllFilter & ~BLinksetFilter, 396 LinksetMask = BAllFilter & ~BLinksetFilter, // linkset objects don't collide with each other
397 VolumeDetectFilter = BSensorTrigger, 397 VolumeDetectFilter = BSensorTrigger,
398 VolumeDetectMask = ~BSensorTrigger, 398 VolumeDetectMask = ~BSensorTrigger,
399 TerrainFilter = BTerrainFilter, 399 TerrainFilter = BTerrainFilter,
400 TerrainMask = BAllFilter & ~BStaticFilter, 400 TerrainMask = BAllFilter & ~BStaticFilter, // static objects on the ground don't collide
401 GroundPlaneFilter = BGroundPlaneFilter, 401 GroundPlaneFilter = BGroundPlaneFilter,
402 GroundPlaneMask = BAllFilter 402 GroundPlaneMask = BAllFilter
403 403