From 8523a96e2b26430dc728b3d1c52783766a9d1b78 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 5 May 2015 15:34:26 -0700 Subject: [PATCH 1/2] implement setShouldClaimSimulationOwnership() --- libraries/physics/src/EntityMotionState.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h index a1d4c6f2b6..7bd1aa7f8b 100644 --- a/libraries/physics/src/EntityMotionState.h +++ b/libraries/physics/src/EntityMotionState.h @@ -46,7 +46,7 @@ public: bool shouldSendUpdate(uint32_t simulationFrame); void sendUpdate(OctreeEditPacketSender* packetSender, uint32_t step); - void setShouldClaimSimulationOwnership(bool value) { } + void setShouldClaimSimulationOwnership(bool value) { _shouldClaimSimulationOwnership = value; } bool getShouldClaimSimulationOwnership() { return false; } virtual uint32_t getIncomingDirtyFlags() const; From 2668ff6d0aa417e5e1d223a5e813de88cae3603b Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 5 May 2015 15:34:50 -0700 Subject: [PATCH 2/2] check for DIRTY_ROTATION bit when copying rotation --- libraries/physics/src/ObjectMotionState.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/physics/src/ObjectMotionState.cpp b/libraries/physics/src/ObjectMotionState.cpp index 39317ea9c1..2eb63c26d7 100644 --- a/libraries/physics/src/ObjectMotionState.cpp +++ b/libraries/physics/src/ObjectMotionState.cpp @@ -121,7 +121,7 @@ void ObjectMotionState::handleEasyChanges(uint32_t flags) { } worldTrans.setOrigin(glmToBullet(getObjectPosition())); _body->setWorldTransform(worldTrans); - } else { + } else if (flags & EntityItem::DIRTY_ROTATION) { btTransform worldTrans = _body->getWorldTransform(); worldTrans.setRotation(glmToBullet(getObjectRotation())); _body->setWorldTransform(worldTrans);