diff options
| author | Justin Clark-Casey (justincc) | 2013-10-28 23:48:43 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-10-28 23:48:43 +0000 |
| commit | 26c2d9e62708a0fe83df61a71bfb27d611a5762c (patch) | |
| tree | e6d8cf6ac871ebb4dc12c4bb1abd1f4d438dab53 /OpenSim/Region | |
| parent | Remove legacy sqlite lines added internally by OpenSimulator to the [Startup]... (diff) | |
| parent | BulletSim: restore collision flags when clear collision cache. (diff) | |
| download | opensim-SC_OLD-26c2d9e62708a0fe83df61a71bfb27d611a5762c.zip opensim-SC_OLD-26c2d9e62708a0fe83df61a71bfb27d611a5762c.tar.gz opensim-SC_OLD-26c2d9e62708a0fe83df61a71bfb27d611a5762c.tar.bz2 opensim-SC_OLD-26c2d9e62708a0fe83df61a71bfb27d611a5762c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index f7dd158..be6f152 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
| @@ -249,7 +249,7 @@ public enum CollisionFlags : uint | |||
| 249 | BS_VEHICLE_COLLISIONS = 1 << 12, // return collisions for vehicle ground checking | 249 | BS_VEHICLE_COLLISIONS = 1 << 12, // return collisions for vehicle ground checking |
| 250 | BS_RETURN_ROOT_COMPOUND_SHAPE = 1 << 13, // return the pos/rot of the root shape in a compound shape | 250 | BS_RETURN_ROOT_COMPOUND_SHAPE = 1 << 13, // return the pos/rot of the root shape in a compound shape |
| 251 | BS_NONE = 0, | 251 | BS_NONE = 0, |
| 252 | BS_ALL = 0xFFFFFFFF | 252 | BS_ALL = 0x7FFF // collision flags are a signed short |
| 253 | }; | 253 | }; |
| 254 | 254 | ||
| 255 | // Values f collisions groups and masks | 255 | // Values f collisions groups and masks |
| @@ -265,14 +265,14 @@ public enum CollisionFilterGroups : uint | |||
| 265 | BDebrisGroup = 1 << 3, // 0008 | 265 | BDebrisGroup = 1 << 3, // 0008 |
| 266 | BSensorTrigger = 1 << 4, // 0010 | 266 | BSensorTrigger = 1 << 4, // 0010 |
| 267 | BCharacterGroup = 1 << 5, // 0020 | 267 | BCharacterGroup = 1 << 5, // 0020 |
| 268 | BAllGroup = 0x000FFFFF, | 268 | BAllGroup = 0x0007FFF, // collision flags are a signed short |
| 269 | // Filter groups defined by BulletSim | 269 | // Filter groups defined by BulletSim |
| 270 | BGroundPlaneGroup = 1 << 10, // 0400 | 270 | BGroundPlaneGroup = 1 << 8, // 0400 |
| 271 | BTerrainGroup = 1 << 11, // 0800 | 271 | BTerrainGroup = 1 << 9, // 0800 |
| 272 | BRaycastGroup = 1 << 12, // 1000 | 272 | BRaycastGroup = 1 << 10, // 1000 |
| 273 | BSolidGroup = 1 << 13, // 2000 | 273 | BSolidGroup = 1 << 11, // 2000 |
| 274 | // BLinksetGroup = xx // a linkset proper is either static or dynamic | 274 | // BLinksetGroup = xx // a linkset proper is either static or dynamic |
| 275 | BLinksetChildGroup = 1 << 14, // 4000 | 275 | BLinksetChildGroup = 1 << 12, // 4000 |
| 276 | }; | 276 | }; |
| 277 | 277 | ||
| 278 | // CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0 | 278 | // CFM controls the 'hardness' of the constraint. 0=fixed, 0..1=violatable. Default=0 |