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

clean up some debugging prints

Browse source
This commit is contained in:
Seth Alves 2015-04-20 15:59:33 -07:00
parent 56b005a872
commit d6c8bd94cf
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/entities/src/EntityTreeElement.cpp
View file

@ -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;

6
libraries/physics/src/EntityMotionState.cpp
View file

@ -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

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

@ -401,14 +401,12 @@ void PhysicsEngine::computeCollisionEvents() {
if (objectA == characterCollisionObject && !objectB->isStaticOrKinematicObject() && b) {
EntityItem* entityB = static_cast<EntityMotionState*>(b)->getEntity();
if (entityB->getSimulatorID() != myNodeID && !entityB->getShouldClaimSimulationOwnership()) {
qDebug() << "CLAIMING B";
entityB->setShouldClaimSimulationOwnership(true);
}
}
if (objectB == characterCollisionObject && !objectA->isStaticOrKinematicObject() && a) {
EntityItem* entityA = static_cast<EntityMotionState*>(a)->getEntity();
if (entityA->getSimulatorID() != myNodeID && !entityA->getShouldClaimSimulationOwnership()) {
qDebug() << "CLAIMING A";
entityA->setShouldClaimSimulationOwnership(true);
}
}