Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 13:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed some debugging

Browse source
This commit is contained in:
ZappoMan 2015-01-26 12:46:22 -08:00
parent 08fbcbaf40
commit 81185cfe56
4 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities/src/EntityItem.cpp
View file

@ -21,11 +21,8 @@
#include "EntityItem.h" #include "EntityItem.h"
#include "EntityTree.h" #include "EntityTree.h"
quint64 EntityItem::lastCollisionTime = 0;
bool EntityItem::_sendPhysicsUpdates = true; bool EntityItem::_sendPhysicsUpdates = true;
void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) { void EntityItem::initFromEntityItemID(const EntityItemID& entityItemID) {
_id = entityItemID.id; _id = entityItemID.id;
_creatorTokenID = entityItemID.creatorTokenID; _creatorTokenID = entityItemID.creatorTokenID;

2
libraries/entities/src/EntityItem.h
View file

@ -54,8 +54,6 @@ public:
DIRTY_UPDATEABLE = 0x0080, DIRTY_UPDATEABLE = 0x0080,
}; };
static quint64 lastCollisionTime;
DONT_ALLOW_INSTANTIATION // This class can not be instantiated directly DONT_ALLOW_INSTANTIATION // This class can not be instantiated directly
EntityItem(const EntityItemID& entityItemID); EntityItem(const EntityItemID& entityItemID);

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

@ -106,7 +106,6 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) {
qDebug() << " last edited:" << _entity->getLastEdited() << formatUsecTime(now - _entity->getLastEdited()) << "ago"; qDebug() << " last edited:" << _entity->getLastEdited() << formatUsecTime(now - _entity->getLastEdited()) << "ago";
qDebug() << " last simulated:" << _entity->getLastSimulated() << formatUsecTime(now - _entity->getLastSimulated()) << "ago"; qDebug() << " last simulated:" << _entity->getLastSimulated() << formatUsecTime(now - _entity->getLastSimulated()) << "ago";
qDebug() << " last updated:" << _entity->getLastUpdated() << formatUsecTime(now - _entity->getLastUpdated()) << "ago"; qDebug() << " last updated:" << _entity->getLastUpdated() << formatUsecTime(now - _entity->getLastUpdated()) << "ago";
qDebug() << " last collision:" << EntityItem::lastCollisionTime << formatUsecTime(now - EntityItem::lastCollisionTime) << "ago";
#endif #endif
} }

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

@ -371,18 +371,10 @@ void PhysicsEngine::computeCollisionEvents() {
if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) { if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) {
idB = static_cast<EntityMotionState*>(B)->getEntity()->getEntityItemID(); idB = static_cast<EntityMotionState*>(B)->getEntity()->getEntityItemID();
} }
//qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************";
//EntityItem::lastCollisionTime = usecTimestampNow();
emit entityCollisionWithEntity(idA, idB, contactItr->second); emit entityCollisionWithEntity(idA, idB, contactItr->second);
} else if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) { } else if (B && B->getType() == MOTION_STATE_TYPE_ENTITY) {
EntityItemID idA; EntityItemID idA;
EntityItemID idB = static_cast<EntityMotionState*>(B)->getEntity()->getEntityItemID(); EntityItemID idB = static_cast<EntityMotionState*>(B)->getEntity()->getEntityItemID();
//qDebug() << "entityCollisionWithEntity()... idA:" << idA << "idB:" << idB << "*******************************";
//EntityItem::lastCollisionTime = usecTimestampNow();
emit entityCollisionWithEntity(idA, idB, contactItr->second); emit entityCollisionWithEntity(idA, idB, contactItr->second);
} }