diff options
author | Melanie | 2012-12-28 08:32:34 +0000 |
---|---|---|
committer | Melanie | 2012-12-28 08:32:34 +0000 |
commit | 3ab1bd04031ca0bc1039e4e1d267ea19d0017430 (patch) | |
tree | 3f2417f3b96e151642158d29d1982dee2bd850a8 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | BulletSim: correct collision mask definition for linkset children. (diff) | |
download | opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.zip opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.gz opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.bz2 opensim-SC_OLD-3ab1bd04031ca0bc1039e4e1d267ea19d0017430.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 24 |
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 |