Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 19:56:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

if something is a child of the local avatar, never let it collide with MY_AVATAR

Browse source
This commit is contained in:
Seth Alves 2017-01-09 16:40:28 -08:00
parent 01ff3f14b6
commit 45a26d599f
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/entities/src/EntityItem.cpp
View file

@ -1780,7 +1780,6 @@ void EntityItem::updateCreated(uint64_t value) {
} }
void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask) const { void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask) const {
// TODO: detect attachment status and adopt group of wearer
if (_collisionless) { if (_collisionless) {
group = BULLET_COLLISION_GROUP_COLLISIONLESS; group = BULLET_COLLISION_GROUP_COLLISIONLESS;
mask = 0; mask = 0;
@ -1794,10 +1793,14 @@ void EntityItem::computeCollisionGroupAndFinalMask(int16_t& group, int16_t& mask
} }
uint8_t userMask = getCollisionMask(); uint8_t userMask = getCollisionMask();
if (hasAncestorOfType(NestableType::Avatar)) {
userMask &= ~USER_COLLISION_GROUP_MY_AVATAR;
}
if ((bool)(userMask & USER_COLLISION_GROUP_MY_AVATAR) != if ((bool)(userMask & USER_COLLISION_GROUP_MY_AVATAR) !=
(bool)(userMask & USER_COLLISION_GROUP_OTHER_AVATAR)) { (bool)(userMask & USER_COLLISION_GROUP_OTHER_AVATAR)) {
// asymmetric avatar collision mask bits // asymmetric avatar collision mask bits
if (!getSimulatorID().isNull() && (!getSimulatorID().isNull()) && getSimulatorID() != Physics::getSessionUUID()) { if (!getSimulatorID().isNull() && getSimulatorID() != Physics::getSessionUUID()) {
// someone else owns the simulation, so we toggle the avatar bits (swap interpretation) // someone else owns the simulation, so we toggle the avatar bits (swap interpretation)
userMask ^= USER_COLLISION_MASK_AVATARS | ~userMask; userMask ^= USER_COLLISION_MASK_AVATARS | ~userMask;
} }

2
libraries/shared/src/SpatiallyNestable.cpp
View file

@ -1015,7 +1015,7 @@ AACube SpatiallyNestable::getQueryAACube() const {
return result; return result;
} }
bool SpatiallyNestable::hasAncestorOfType(NestableType nestableType) { bool SpatiallyNestable::hasAncestorOfType(NestableType nestableType) const {
bool success; bool success;
SpatiallyNestablePointer parent = getParentPointer(success); SpatiallyNestablePointer parent = getParentPointer(success);
if (!success || !parent) { if (!success || !parent) {

2
libraries/shared/src/SpatiallyNestable.h
View file

@ -163,7 +163,7 @@ public:
bool isParentIDValid() const { bool success = false; getParentPointer(success); return success; } bool isParentIDValid() const { bool success = false; getParentPointer(success); return success; }
virtual SpatialParentTree* getParentTree() const { return nullptr; } virtual SpatialParentTree* getParentTree() const { return nullptr; }
bool hasAncestorOfType(NestableType nestableType); bool hasAncestorOfType(NestableType nestableType) const;
SpatiallyNestablePointer getParentPointer(bool& success) const; SpatiallyNestablePointer getParentPointer(bool& success) const;
static SpatiallyNestablePointer findByID(QUuid id, bool& success); static SpatiallyNestablePointer findByID(QUuid id, bool& success);