From 08fbcbaf40e34a5b1227195eaff6a07e2e853462 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 26 Jan 2015 12:38:02 -0800 Subject: [PATCH] tweaks for debugging --- examples/controllers/hydra/gun.js | 3 ++- libraries/physics/src/EntityMotionState.cpp | 20 ++++++++++++-------- libraries/physics/src/PhysicsEngine.cpp | 8 ++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/examples/controllers/hydra/gun.js b/examples/controllers/hydra/gun.js index 0c0740e12b..f3c1e14001 100644 --- a/examples/controllers/hydra/gun.js +++ b/examples/controllers/hydra/gun.js @@ -486,7 +486,8 @@ function mousePressEvent(event) { if (clickedOverlay == offButton) { Script.stop(); } else if (clickedOverlay == platformButton) { - makePlatform(-9.8, 1.0, 5); + var platformSize = 3; + makePlatform(-9.8, 1.0, platformSize); } else if (clickedOverlay == gridButton) { makeGrid("Box", 1.0, 3); } diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index c8b0133b86..02a0dfbf92 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -99,13 +99,15 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) { _outgoingPacketFlags = DIRTY_PHYSICS_FLAGS; EntityMotionState::enqueueOutgoingEntity(_entity); - - quint64 now = usecTimestampNow(); - qDebug() << "EntityMotionState::setWorldTransform()... changed entity:" << _entity->getEntityItemID(); - qDebug() << " last edited:" << _entity->getLastEdited() << formatUsecTime(now - _entity->getLastEdited()) << "ago"; - qDebug() << " last simulated:" << _entity->getLastSimulated() << formatUsecTime(now - _entity->getLastSimulated()) << "ago"; - qDebug() << " last updated:" << _entity->getLastUpdated() << formatUsecTime(now - _entity->getLastUpdated()) << "ago"; - qDebug() << " last collision:" << EntityItem::lastCollisionTime << formatUsecTime(now - EntityItem::lastCollisionTime) << "ago"; + + #ifdef WANT_DEBUG + quint64 now = usecTimestampNow(); + qDebug() << "EntityMotionState::setWorldTransform()... changed entity:" << _entity->getEntityItemID(); + qDebug() << " last edited:" << _entity->getLastEdited() << formatUsecTime(now - _entity->getLastEdited()) << "ago"; + qDebug() << " last simulated:" << _entity->getLastSimulated() << formatUsecTime(now - _entity->getLastSimulated()) << "ago"; + qDebug() << " last updated:" << _entity->getLastUpdated() << formatUsecTime(now - _entity->getLastUpdated()) << "ago"; + qDebug() << " last collision:" << EntityItem::lastCollisionTime << formatUsecTime(now - EntityItem::lastCollisionTime) << "ago"; + #endif } void EntityMotionState::updateObjectEasy(uint32_t flags, uint32_t frame) { @@ -240,7 +242,9 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_ #endif entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties); } else { - qDebug() << "EntityMotionState::sendUpdate()... NOT sending update as requested."; + #ifdef WANT_DEBUG + qDebug() << "EntityMotionState::sendUpdate()... NOT sending update as requested."; + #endif } // The outgoing flags only itemized WHAT to send, not WHETHER to send, hence we always set them diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index fce8faf301..b427d78a69 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -372,16 +372,16 @@ void PhysicsEngine::computeCollisionEvents() { idB = static_cast(B)->getEntity()->getEntityItemID(); } -qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************"; -EntityItem::lastCollisionTime = usecTimestampNow(); +//qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************"; +//EntityItem::lastCollisionTime = usecTimestampNow(); emit entityCollisionWithEntity(idA, idB, contactItr->second); } else if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) { EntityItemID idA; EntityItemID idB = static_cast(B)->getEntity()->getEntityItemID(); -qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************"; -EntityItem::lastCollisionTime = usecTimestampNow(); +//qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************"; +//EntityItem::lastCollisionTime = usecTimestampNow(); emit entityCollisionWithEntity(idA, idB, contactItr->second); }