From 6e6793cbcc666c06db6e18a50153683f3a968937 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Fri, 24 Apr 2015 15:18:02 -0700 Subject: [PATCH] remove debugging prints --- .../src/RenderableModelEntityItem.cpp | 2 +- libraries/entities/src/EntityItem.cpp | 2 -- libraries/physics/src/EntityMotionState.cpp | 2 -- libraries/physics/src/EntityMotionState.h | 7 +------ libraries/physics/src/PhysicsEngine.cpp | 12 ------------ 5 files changed, 2 insertions(+), 23 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 1bdfa7bd1a..c4e12eb957 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -125,7 +125,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) { // XXX if (drawAsModel - && getSimulatorID() != myNodeID + && getSimulatorID() != myNodeID // XXX ) { remapTextures(); glPushMatrix(); diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index 07c7935556..8db68785d0 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -620,8 +620,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef _angularVelocity = saveAngularVelocity; _gravity = saveGravity; _acceleration = saveAcceleration; - } else { - qDebug() << "accepting update"; } return bytesRead; diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index dba4cfac79..d0c362b852 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -202,7 +202,6 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) { } if (getShouldClaimSimulationOwnership()) { - qDebug() << "shouldSendUpdate due to claiming ownership"; return true; } @@ -345,7 +344,6 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()..."; #endif - qDebug() << "sending" << _body->isActive() << (_entity->getSimulatorID() == myNodeID); entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties); } else { #ifdef WANT_DEBUG diff --git a/libraries/physics/src/EntityMotionState.h b/libraries/physics/src/EntityMotionState.h index 1ab3309934..07f82aaa42 100644 --- a/libraries/physics/src/EntityMotionState.h +++ b/libraries/physics/src/EntityMotionState.h @@ -67,12 +67,7 @@ public: quint8 getAccelerationNearlyGravityCount() { return _accelerationNearlyGravityCount; } virtual EntityItem* getEntity() const { return _entity; } - virtual void setShouldClaimSimulationOwnership(bool value) { - if (value) { - qDebug() << "setShouldClaimSimulationOwnership to TRUE"; - } - _shouldClaimSimulationOwnership = value; - } + virtual void setShouldClaimSimulationOwnership(bool value) { _shouldClaimSimulationOwnership = value; } virtual bool getShouldClaimSimulationOwnership() { return _shouldClaimSimulationOwnership; } protected: diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index afb0e65a00..6d0c9c878a 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -393,22 +393,12 @@ void PhysicsEngine::doOwnershipInfection(const btCollisionObject* objectA, const // (a && a->getShouldClaimSimulationOwnership()) || (objectA == characterCollisionObject)) { if (bIsDynamic) { - qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection A" - << (aIsDynamic && (entityA->getSimulatorID() == myNodeID)) - << (a && a->getShouldClaimSimulationOwnership()) - << (objectA == characterCollisionObject); - b->setShouldClaimSimulationOwnership(true); } } else if ((bIsDynamic && (entityB->getSimulatorID() == myNodeID)) || // (b && b->getShouldClaimSimulationOwnership()) || (objectB == characterCollisionObject)) { if (aIsDynamic) { - qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection B" - << (bIsDynamic && (entityB->getSimulatorID() == myNodeID)) - << (b && b->getShouldClaimSimulationOwnership()) - << (objectB == characterCollisionObject); - a->setShouldClaimSimulationOwnership(true); } } @@ -587,14 +577,12 @@ void PhysicsEngine::bump(EntityItem* bumpEntity) { EntityItem* entityB = entityMotionStateB ? entityMotionStateB->getEntity() : NULL; if (entityA && entityB) { if (entityA == bumpEntity) { - qDebug() << "setShouldClaimSimulationOwnership(true) in bump"; entityMotionStateB->setShouldClaimSimulationOwnership(true); if (!objectB->isActive()) { objectB->setActivationState(ACTIVE_TAG); } } if (entityB == bumpEntity) { - qDebug() << "setShouldClaimSimulationOwnership(true) in bump"; entityMotionStateA->setShouldClaimSimulationOwnership(true); if (!objectA->isActive()) { objectA->setActivationState(ACTIVE_TAG);