Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mess with debugging prints

Browse source
This commit is contained in:
Seth Alves 2015-04-13 15:22:54 -07:00
parent 9c2fec36fd
commit 396f6b1987
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@
#include "EntityItem.h" #include "EntityItem.h"
#define WANT_DEBUG 1
void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType type, void EntityEditPacketSender::adjustEditPacketForClockSkew(PacketType type,
unsigned char* editBuffer, size_t length, int clockSkew) { unsigned char* editBuffer, size_t length, int clockSkew) {

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

@ -680,6 +680,7 @@ void EntityItem::simulate(const quint64& now) {
#ifdef WANT_DEBUG #ifdef WANT_DEBUG
qCDebug(entities) << "********** EntityItem::simulate()"; qCDebug(entities) << "********** EntityItem::simulate()";
qCDebug(entities) << " entity ID=" << getEntityItemID(); qCDebug(entities) << " entity ID=" << getEntityItemID();
qCDebug(entities) << " simulator ID=" << getSimulatorID();
qCDebug(entities) << " now=" << now; qCDebug(entities) << " now=" << now;
qCDebug(entities) << " _lastSimulated=" << _lastSimulated; qCDebug(entities) << " _lastSimulated=" << _lastSimulated;
qCDebug(entities) << " timeElapsed=" << timeElapsed; qCDebug(entities) << " timeElapsed=" << timeElapsed;
@ -1197,6 +1198,6 @@ void EntityItem::updateLifetime(float value) {
void EntityItem::updateSimulatorID(QString value) { void EntityItem::updateSimulatorID(QString value) {
if (_simulatorID != value) { if (_simulatorID != value) {
_simulatorID = value; _simulatorID = value;
_dirtyFlags |= EntityItem::DIRTY_MOTION_TYPE; _dirtyFlags |= EntityItem::DIRTY_UPDATEABLE;
} }
} }

1
libraries/entities/src/EntityItemProperties.h
View file

@ -343,6 +343,7 @@ inline QDebug operator<<(QDebug debug, const EntityItemProperties& properties) {
DEBUG_PROPERTY_IF_CHANGED(debug, properties, EmitStrength, emitStrength, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, EmitStrength, emitStrength, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, LocalGravity, localGravity, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, LocalGravity, localGravity, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, ParticleRadius, particleRadius, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, ParticleRadius, particleRadius, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, SimulatorID, simulatorID, "");
DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, ""); DEBUG_PROPERTY_IF_CHANGED(debug, properties, MarketplaceID, marketplaceID, "");
debug << " last edited:" << properties.getLastEdited() << "\n"; debug << " last edited:" << properties.getLastEdited() << "\n";

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

@ -219,6 +219,10 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
if (_outgoingPacketFlags) { if (_outgoingPacketFlags) {
EntityItemProperties properties = _entity->getProperties(); EntityItemProperties properties = _entity->getProperties();
// if (_outgoingPacketFlags & EntityItem::DIRTY_UPDATEABLE) {
// properties.setSimulatorID(_entity->getSimulatorID());
// }
if (_outgoingPacketFlags & EntityItem::DIRTY_POSITION) { if (_outgoingPacketFlags & EntityItem::DIRTY_POSITION) {
btTransform worldTrans = _body->getWorldTransform(); btTransform worldTrans = _body->getWorldTransform();
_sentPosition = bulletToGLM(worldTrans.getOrigin()); _sentPosition = bulletToGLM(worldTrans.getOrigin());