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

Update conditional to handle 'other unowned' case

Browse source
This commit is contained in:
Zach Fox 2017-05-25 09:28:11 -07:00
parent b86b07c08f
commit f2fab57187
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -1108,7 +1108,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
assert(!bothEntitiesStatic); assert(!bothEntitiesStatic);
#endif #endif
if ((myNodeID == entityASimulatorID && entityAIsDynamic) || (myNodeID == entityBSimulatorID && !entityAIsDynamic)) { if ((myNodeID == entityASimulatorID && entityAIsDynamic) || (myNodeID == entityBSimulatorID && (!entityAIsDynamic || entityASimulatorID.isNull()))) {
playEntityCollisionSound(entityA, collision); playEntityCollisionSound(entityA, collision);
emit collisionWithEntity(idA, idB, collision); emit collisionWithEntity(idA, idB, collision);
if (_entitiesScriptEngine) { if (_entitiesScriptEngine) {
@ -1116,7 +1116,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
} }
} }
if ((myNodeID == entityBSimulatorID && entityBIsDynamic) || (myNodeID == entityASimulatorID && !entityBIsDynamic)) { if ((myNodeID == entityBSimulatorID && entityBIsDynamic) || (myNodeID == entityASimulatorID && (!entityBIsDynamic || entityBSimulatorID.isNull()))) {
playEntityCollisionSound(entityB, collision); playEntityCollisionSound(entityB, collision);
// since we're swapping A and B we need to send the inverted collision // since we're swapping A and B we need to send the inverted collision
Collision invertedCollision(collision); Collision invertedCollision(collision);