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

Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1

Browse source
This commit is contained in:
Seth Alves 2015-05-05 15:50:24 -07:00
commit c9f97b9d42
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/physics/src/EntityMotionState.h
View file

@ -46,7 +46,7 @@ public:
bool shouldSendUpdate(uint32_t simulationFrame); bool shouldSendUpdate(uint32_t simulationFrame);
void sendUpdate(OctreeEditPacketSender* packetSender, uint32_t step); void sendUpdate(OctreeEditPacketSender* packetSender, uint32_t step);
void setShouldClaimSimulationOwnership(bool value) { } void setShouldClaimSimulationOwnership(bool value) { _shouldClaimSimulationOwnership = value; }
bool getShouldClaimSimulationOwnership() { return false; } bool getShouldClaimSimulationOwnership() { return false; }
virtual uint32_t getIncomingDirtyFlags() const; virtual uint32_t getIncomingDirtyFlags() const;

2
libraries/physics/src/ObjectMotionState.cpp
View file

@ -121,7 +121,7 @@ void ObjectMotionState::handleEasyChanges(uint32_t flags) {
} }
worldTrans.setOrigin(glmToBullet(getObjectPosition())); worldTrans.setOrigin(glmToBullet(getObjectPosition()));
_body->setWorldTransform(worldTrans); _body->setWorldTransform(worldTrans);
} else { } else if (flags & EntityItem::DIRTY_ROTATION) {
btTransform worldTrans = _body->getWorldTransform(); btTransform worldTrans = _body->getWorldTransform();
worldTrans.setRotation(glmToBullet(getObjectRotation())); worldTrans.setRotation(glmToBullet(getObjectRotation()));
_body->setWorldTransform(worldTrans); _body->setWorldTransform(worldTrans);