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

remove debugging prints

Browse source
This commit is contained in:
Seth Alves 2015-04-24 15:18:02 -07:00
parent 2a8fbeca32
commit 6e6793cbcc
5 changed files with 2 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -125,7 +125,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
// XXX // XXX
if (drawAsModel if (drawAsModel
&& getSimulatorID() != myNodeID && getSimulatorID() != myNodeID // XXX
) { ) {
remapTextures(); remapTextures();
glPushMatrix(); glPushMatrix();

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

@ -620,8 +620,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
_angularVelocity = saveAngularVelocity; _angularVelocity = saveAngularVelocity;
_gravity = saveGravity; _gravity = saveGravity;
_acceleration = saveAcceleration; _acceleration = saveAcceleration;
} else {
qDebug() << "accepting update";
} }
return bytesRead; return bytesRead;

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

@ -202,7 +202,6 @@ bool EntityMotionState::shouldSendUpdate(uint32_t simulationFrame) {
} }
if (getShouldClaimSimulationOwnership()) { if (getShouldClaimSimulationOwnership()) {
qDebug() << "shouldSendUpdate due to claiming ownership";
return true; return true;
} }
@ -345,7 +344,6 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()..."; qCDebug(physics) << "EntityMotionState::sendUpdate()... calling queueEditEntityMessage()...";
#endif #endif
qDebug() << "sending" << _body->isActive() << (_entity->getSimulatorID() == myNodeID);
entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties); entityPacketSender->queueEditEntityMessage(PacketTypeEntityAddOrEdit, id, properties);
} else { } else {
#ifdef WANT_DEBUG #ifdef WANT_DEBUG

7
libraries/physics/src/EntityMotionState.h
View file

@ -67,12 +67,7 @@ public:
quint8 getAccelerationNearlyGravityCount() { return _accelerationNearlyGravityCount; } quint8 getAccelerationNearlyGravityCount() { return _accelerationNearlyGravityCount; }
virtual EntityItem* getEntity() const { return _entity; } virtual EntityItem* getEntity() const { return _entity; }
virtual void setShouldClaimSimulationOwnership(bool value) { virtual void setShouldClaimSimulationOwnership(bool value) { _shouldClaimSimulationOwnership = value; }
if (value) {
qDebug() << "setShouldClaimSimulationOwnership to TRUE";
}
_shouldClaimSimulationOwnership = value;
}
virtual bool getShouldClaimSimulationOwnership() { return _shouldClaimSimulationOwnership; } virtual bool getShouldClaimSimulationOwnership() { return _shouldClaimSimulationOwnership; }
protected: protected:

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

@ -393,22 +393,12 @@ void PhysicsEngine::doOwnershipInfection(const btCollisionObject* objectA, const
// (a && a->getShouldClaimSimulationOwnership()) || // (a && a->getShouldClaimSimulationOwnership()) ||
(objectA == characterCollisionObject)) { (objectA == characterCollisionObject)) {
if (bIsDynamic) { if (bIsDynamic) {
qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection A"
<< (aIsDynamic && (entityA->getSimulatorID() == myNodeID))
<< (a && a->getShouldClaimSimulationOwnership())
<< (objectA == characterCollisionObject);
b->setShouldClaimSimulationOwnership(true); b->setShouldClaimSimulationOwnership(true);
} }
} else if ((bIsDynamic && (entityB->getSimulatorID() == myNodeID)) || } else if ((bIsDynamic && (entityB->getSimulatorID() == myNodeID)) ||
// (b && b->getShouldClaimSimulationOwnership()) || // (b && b->getShouldClaimSimulationOwnership()) ||
(objectB == characterCollisionObject)) { (objectB == characterCollisionObject)) {
if (aIsDynamic) { if (aIsDynamic) {
qDebug() << "setShouldClaimSimulationOwnership(true) in doOwnershipInfection B"
<< (bIsDynamic && (entityB->getSimulatorID() == myNodeID))
<< (b && b->getShouldClaimSimulationOwnership())
<< (objectB == characterCollisionObject);
a->setShouldClaimSimulationOwnership(true); a->setShouldClaimSimulationOwnership(true);
} }
} }
@ -587,14 +577,12 @@ void PhysicsEngine::bump(EntityItem* bumpEntity) {
EntityItem* entityB = entityMotionStateB ? entityMotionStateB->getEntity() : NULL; EntityItem* entityB = entityMotionStateB ? entityMotionStateB->getEntity() : NULL;
if (entityA && entityB) { if (entityA && entityB) {
if (entityA == bumpEntity) { if (entityA == bumpEntity) {
qDebug() << "setShouldClaimSimulationOwnership(true) in bump";
entityMotionStateB->setShouldClaimSimulationOwnership(true); entityMotionStateB->setShouldClaimSimulationOwnership(true);
if (!objectB->isActive()) { if (!objectB->isActive()) {
objectB->setActivationState(ACTIVE_TAG); objectB->setActivationState(ACTIVE_TAG);
} }
} }
if (entityB == bumpEntity) { if (entityB == bumpEntity) {
qDebug() << "setShouldClaimSimulationOwnership(true) in bump";
entityMotionStateA->setShouldClaimSimulationOwnership(true); entityMotionStateA->setShouldClaimSimulationOwnership(true);
if (!objectA->isActive()) { if (!objectA->isActive()) {
objectA->setActivationState(ACTIVE_TAG); objectA->setActivationState(ACTIVE_TAG);