From 81185cfe5615ceecbc67eb0a89c8a203cdd1d692 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 26 Jan 2015 12:46:22 -0800 Subject: [PATCH] removed some debugging --- libraries/entities/src/EntityItem.cpp | 3 --- libraries/entities/src/EntityItem.h | 2 -- libraries/physics/src/EntityMotionState.cpp | 1 - libraries/physics/src/PhysicsEngine.cpp | 8 -------- 4 files changed, 14 deletions(-) diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp index ab859c7282..b987e37f3b 100644 --- a/libraries/entities/src/EntityItem.cpp +++ b/libraries/entities/src/EntityItem.cpp @@ -21,11 +21,8 @@ #include "EntityItem.h" #include "EntityTree.h" -quint64 EntityItem::lastCollisionTime = 0; bool EntityItem::_sendPhysicsUpdates = true; - - void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) { _id = entityItemID.id; _creatorTokenID = entityItemID.creatorTokenID; diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h index 1c35a0aa3d..2cba4692d0 100644 --- a/libraries/entities/src/EntityItem.h +++ b/libraries/entities/src/EntityItem.h @@ -54,8 +54,6 @@ public: DIRTY_UPDATEABLE = 0x0080, }; - static quint64 lastCollisionTime; - DONT_ALLOW_INSTANTIATION // This class can not be instantiated directly EntityItem(const EntityItemID& entityItemID); diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp index 02a0dfbf92..01063a43d6 100644 --- a/libraries/physics/src/EntityMotionState.cpp +++ b/libraries/physics/src/EntityMotionState.cpp @@ -106,7 +106,6 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) { 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 } diff --git a/libraries/physics/src/PhysicsEngine.cpp b/libraries/physics/src/PhysicsEngine.cpp index b427d78a69..dfd28dd8a4 100644 --- a/libraries/physics/src/PhysicsEngine.cpp +++ b/libraries/physics/src/PhysicsEngine.cpp @@ -371,18 +371,10 @@ void PhysicsEngine::computeCollisionEvents() { if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) { idB = static_cast(B)->getEntity()->getEntityItemID(); } - -//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(); - emit entityCollisionWithEntity(idA, idB, contactItr->second); }