mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 14:29:03 +02:00
collision logic
This commit is contained in:
parent
3f2aa56187
commit
2393db5e12
1 changed files with 5 additions and 7 deletions
|
@ -204,14 +204,12 @@ bool MyCharacterController::testRayShotgun(const glm::vec3& position, const glm:
|
||||||
|
|
||||||
int32_t MyCharacterController::computeCollisionMask() const {
|
int32_t MyCharacterController::computeCollisionMask() const {
|
||||||
int32_t collisionMask = BULLET_COLLISION_MASK_MY_AVATAR;
|
int32_t collisionMask = BULLET_COLLISION_MASK_MY_AVATAR;
|
||||||
if (_collisionlessAllowed) {
|
if (_collisionless && _collisionlessAllowed) {
|
||||||
if (_collisionless) {
|
collisionMask = BULLET_COLLISION_MASK_COLLISIONLESS;
|
||||||
collisionMask = BULLET_COLLISION_MASK_COLLISIONLESS;
|
} else if (!_collideWithOtherAvatars) {
|
||||||
} if (!_collideWithOtherAvatars) {
|
collisionMask &= ~BULLET_COLLISION_GROUP_OTHER_AVATAR;
|
||||||
collisionMask &= ~BULLET_COLLISION_GROUP_OTHER_AVATAR;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return collisionMask;
|
return collisionMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MyCharacterController::handleChangedCollisionMask() {
|
void MyCharacterController::handleChangedCollisionMask() {
|
||||||
|
|
Loading…
Reference in a new issue