Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sync

Browse source
This commit is contained in:
Seth Alves 2015-04-24 14:21:59 -07:00
parent fea8d84618
commit 6b53fefebe
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/physics/src/PhysicsEngine.cpp
View file

@ -391,6 +391,7 @@ void PhysicsEngine::doOwnershipInfection(const btCollisionObject* objectA, const
(a && a->getShouldClaimSimulationOwnership()) || (a && a->getShouldClaimSimulationOwnership()) ||
(objectA == characterCollisionObject)) { (objectA == characterCollisionObject)) {
if (bIsDynamic) { if (bIsDynamic) {
qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection";
b->setShouldClaimSimulationOwnership(true); b->setShouldClaimSimulationOwnership(true);
} }
} }
@ -398,6 +399,7 @@ void PhysicsEngine::doOwnershipInfection(const btCollisionObject* objectA, const
(b && b->getShouldClaimSimulationOwnership()) || (b && b->getShouldClaimSimulationOwnership()) ||
(objectB == characterCollisionObject)) { (objectB == characterCollisionObject)) {
if (aIsDynamic) { if (aIsDynamic) {
qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection";
a->setShouldClaimSimulationOwnership(true); a->setShouldClaimSimulationOwnership(true);
} }
} }
@ -576,12 +578,14 @@ void PhysicsEngine::bump(EntityItem* bumpEntity) {
EntityItem* entityB = entityMotionStateB ? entityMotionStateB->getEntity() : NULL; EntityItem* entityB = entityMotionStateB ? entityMotionStateB->getEntity() : NULL;
if (entityA && entityB) { if (entityA && entityB) {
if (entityA == bumpEntity) { if (entityA == bumpEntity) {
qDebug() << "setShouldClaimSimulationOwnership(true) in bump";
entityMotionStateB->setShouldClaimSimulationOwnership(true); entityMotionStateB->setShouldClaimSimulationOwnership(true);
if (!objectB->isActive()) { if (!objectB->isActive()) {
objectB->setActivationState(ACTIVE_TAG); objectB->setActivationState(ACTIVE_TAG);
} }
} }
if (entityB == bumpEntity) { if (entityB == bumpEntity) {
qDebug() << "setShouldClaimSimulationOwnership(true) in bump";
entityMotionStateA->setShouldClaimSimulationOwnership(true); entityMotionStateA->setShouldClaimSimulationOwnership(true);
if (!objectA->isActive()) { if (!objectA->isActive()) {
objectA->setActivationState(ACTIVE_TAG); objectA->setActivationState(ACTIVE_TAG);