diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp index 60b6c93483..9de7329594 100644 --- a/libraries/entities/src/EntityTreeElement.cpp +++ b/libraries/entities/src/EntityTreeElement.cpp @@ -745,6 +745,7 @@ int EntityTreeElement::readElementDataFromBuffer(const unsigned char* data, int EntityTreeElement* currentContainingElement = _myTree->getContainingElement(entityItemID); // this Node was the original source of this packet, so read it, but ignore it. + /// XXX what should be done here? Do we need to ignore packets which show us as simulator owner? XXX // bool shouldIgnore = (entityItem && entityItem->getSimulatorID() == myNodeID); XXX bool shouldIgnore = false; diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 74a3d3220c..e188bad613 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -217,7 +217,9 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ if (glm::length(_measuredAcceleration) < MEASURED_ACCELERATION_CLOSE_TO_ZERO) { _entity->setAcceleration(glm::vec3(0)); } else { - _entity->setAcceleration(_entity->getGravity()); + // _entity->setAcceleration(_entity->getGravity()); + // XXX + _entity->setAcceleration(glm::vec3(0)); } if (_outgoingPacketFlags & EntityItem::DIRTY_POSITION) { @@ -314,8 +316,6 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()..."; #endif - qCDebug(physics) << "EntityMotionState::sendUpdate()"; - entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties); } else { #ifdef WANT_DEBUG diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index c3ed870375..a55da0fa8c 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -401,14 +401,12 @@ void PhysicsEngine::computeCollisionEvents() { if (objectA == characterCollisionObject && !objectB->isStaticOrKinematicObject() && b) { EntityItem* entityB = static_cast(b)->getEntity(); if (entityB->getSimulatorID() != myNodeID && !entityB->getShouldClaimSimulationOwnership()) { - qDebug() << "CLAIMING B"; entityB->setShouldClaimSimulationOwnership(true); } } if (objectB == characterCollisionObject && !objectA->isStaticOrKinematicObject() && a) { EntityItem* entityA = static_cast(a)->getEntity(); if (entityA->getSimulatorID() != myNodeID && !entityA->getShouldClaimSimulationOwnership()) { - qDebug() << "CLAIMING A"; entityA->setShouldClaimSimulationOwnership(true); } }