aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
diff options
context:
space:
mode:
authorRobert Adams2012-10-01 11:54:35 -0700
committerRobert Adams2012-10-02 11:13:32 -0700
commit33617e09a185be68ceeaaba0fe9b7b2e6068124d (patch)
treeea34c6e9a6090ba9c4ae93fcd308f0a9e3df518f /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
parentCorrect my name in CONTRIBUTORS.txt (diff)
downloadopensim-SC-33617e09a185be68ceeaaba0fe9b7b2e6068124d.zip
opensim-SC-33617e09a185be68ceeaaba0fe9b7b2e6068124d.tar.gz
opensim-SC-33617e09a185be68ceeaaba0fe9b7b2e6068124d.tar.bz2
opensim-SC-33617e09a185be68ceeaaba0fe9b7b2e6068124d.tar.xz
BulletSim: impliment FloatOnWater OS function.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs8
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index 1125d7e..d49e5f3 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -344,10 +344,7 @@ public enum CollisionFlags : uint
344 CF_DISABLE_SPU_COLLISION_PROCESS = 1 << 6, 344 CF_DISABLE_SPU_COLLISION_PROCESS = 1 << 6,
345 // Following used by BulletSim to control collisions 345 // Following used by BulletSim to control collisions
346 BS_SUBSCRIBE_COLLISION_EVENTS = 1 << 10, 346 BS_SUBSCRIBE_COLLISION_EVENTS = 1 << 10,
347 // BS_VOLUME_DETECT_OBJECT = 1 << 11, 347 BS_FLOATS_ON_WATER = 1 << 11,
348 // BS_PHANTOM_OBJECT = 1 << 12,
349 // BS_PHYSICAL_OBJECT = 1 << 13,
350 // BS_TERRAIN_OBJECT = 1 << 14,
351 BS_NONE = 0, 348 BS_NONE = 0,
352 BS_ALL = 0xFFFFFFFF, 349 BS_ALL = 0xFFFFFFFF,
353 350
@@ -356,9 +353,6 @@ public enum CollisionFlags : uint
356 BS_ACTIVE = CF_STATIC_OBJECT 353 BS_ACTIVE = CF_STATIC_OBJECT
357 | CF_KINEMATIC_OBJECT 354 | CF_KINEMATIC_OBJECT
358 | CF_NO_CONTACT_RESPONSE 355 | CF_NO_CONTACT_RESPONSE
359 // | BS_VOLUME_DETECT_OBJECT
360 // | BS_PHANTOM_OBJECT
361 // | BS_PHYSICAL_OBJECT,
362}; 356};
363 357
364// Values for collisions groups and masks 358// Values for collisions groups and masks