Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move debug into ifdef

Browse source
This commit is contained in:
ZappoMan 2015-01-27 11:29:17 -08:00
parent 45dbff67f8
commit b1586d4f90
2 changed files with 38 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,13 +167,12 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
quint64 lastEdited = getLastEdited(); quint64 lastEdited = getLastEdited();
const bool wantDebug = false; #ifdef WANT_DEBUG
if (wantDebug) {
float editedAgo = getEditedAgo(); float editedAgo = getEditedAgo();
QString agoAsString = formatSecondsElapsed(editedAgo); QString agoAsString = formatSecondsElapsed(editedAgo);
qDebug() << "Writing entity " << getEntityItemID() << " to buffer, lastEdited =" << lastEdited qDebug() << "Writing entity " << getEntityItemID() << " to buffer, lastEdited =" << lastEdited
<< " ago=" << editedAgo << "seconds - " << agoAsString; << " ago=" << editedAgo << "seconds - " << agoAsString;
} #endif
bool successIDFits = false; bool successIDFits = false;
bool successTypeFits = false; bool successTypeFits = false;
@ -227,11 +226,6 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
APPEND_ENTITY_PROPERTY(PROP_POSITION, appendPosition, getPosition()); APPEND_ENTITY_PROPERTY(PROP_POSITION, appendPosition, getPosition());
APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, appendValue, getDimensions()); // NOTE: PROP_RADIUS obsolete APPEND_ENTITY_PROPERTY(PROP_DIMENSIONS, appendValue, getDimensions()); // NOTE: PROP_RADIUS obsolete
if (wantDebug) {
qDebug() << " APPEND_ENTITY_PROPERTY() PROP_DIMENSIONS:" << getDimensions();
}
APPEND_ENTITY_PROPERTY(PROP_ROTATION, appendValue, getRotation()); APPEND_ENTITY_PROPERTY(PROP_ROTATION, appendValue, getRotation());
APPEND_ENTITY_PROPERTY(PROP_DENSITY, appendValue, getDensity()); APPEND_ENTITY_PROPERTY(PROP_DENSITY, appendValue, getDensity());
APPEND_ENTITY_PROPERTY(PROP_VELOCITY, appendValue, getVelocity()); APPEND_ENTITY_PROPERTY(PROP_VELOCITY, appendValue, getVelocity());
@ -310,7 +304,6 @@ int EntityItem::expectedBytes() {
int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args) { int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLeftToRead, ReadBitstreamToTreeParams& args) {
bool wantDebug = false;
if (args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU) { if (args.bitstreamVersion < VERSION_ENTITIES_SUPPORT_SPLIT_MTU) {
@ -375,7 +368,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
_created = createdFromBuffer; _created = createdFromBuffer;
} }
if (wantDebug) { #ifdef WANT_DEBUG
quint64 lastEdited = getLastEdited(); quint64 lastEdited = getLastEdited();
float editedAgo = getEditedAgo(); float editedAgo = getEditedAgo();
QString agoAsString = formatSecondsElapsed(editedAgo); QString agoAsString = formatSecondsElapsed(editedAgo);
@ -389,7 +382,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
qDebug() << " age=" << getAge() << "seconds - " << ageAsString; qDebug() << " age=" << getAge() << "seconds - " << ageAsString;
qDebug() << " lastEdited =" << lastEdited; qDebug() << " lastEdited =" << lastEdited;
qDebug() << " ago=" << editedAgo << "seconds - " << agoAsString; qDebug() << " ago=" << editedAgo << "seconds - " << agoAsString;
} #endif
quint64 lastEditedFromBuffer = 0; quint64 lastEditedFromBuffer = 0;
quint64 lastEditedFromBufferAdjusted = 0; quint64 lastEditedFromBufferAdjusted = 0;
@ -406,7 +399,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
bool fromSameServerEdit = (lastEditedFromBuffer == _lastEditedFromRemoteInRemoteTime); bool fromSameServerEdit = (lastEditedFromBuffer == _lastEditedFromRemoteInRemoteTime);
if (true || wantDebug) { #ifdef WANT_DEBUG
qDebug() << "data from server **************** "; qDebug() << "data from server **************** ";
qDebug() << " entityItemID:" << getEntityItemID(); qDebug() << " entityItemID:" << getEntityItemID();
qDebug() << " now:" << now; qDebug() << " now:" << now;
@ -417,7 +410,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
qDebug() << " _lastEditedFromRemote:" << debugTime(_lastEditedFromRemote, now); qDebug() << " _lastEditedFromRemote:" << debugTime(_lastEditedFromRemote, now);
qDebug() << " _lastEditedFromRemoteInRemoteTime:" << debugTime(_lastEditedFromRemoteInRemoteTime, now); qDebug() << " _lastEditedFromRemoteInRemoteTime:" << debugTime(_lastEditedFromRemoteInRemoteTime, now);
qDebug() << " fromSameServerEdit:" << fromSameServerEdit; qDebug() << " fromSameServerEdit:" << fromSameServerEdit;
} #endif
bool ignoreServerPacket = false; // assume we'll use this server packet bool ignoreServerPacket = false; // assume we'll use this server packet
@ -440,16 +433,16 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
if (ignoreServerPacket) { if (ignoreServerPacket) {
overwriteLocalData = false; overwriteLocalData = false;
if (true || wantDebug) { #ifdef WANT_DEBUG
qDebug() << "IGNORING old data from server!!! ****************"; qDebug() << "IGNORING old data from server!!! ****************";
debugDump(); debugDump();
} #endif
} else { } else {
if (true || wantDebug) { #ifdef WANT_DEBUG
qDebug() << "USING NEW data from server!!! ****************"; qDebug() << "USING NEW data from server!!! ****************";
debugDump(); debugDump();
} #endif
// don't allow _lastEdited to be in the future // don't allow _lastEdited to be in the future
_lastEdited = lastEditedFromBufferAdjusted; _lastEdited = lastEditedFromBufferAdjusted;
@ -467,11 +460,11 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
quint64 updateDelta = updateDeltaCoder; quint64 updateDelta = updateDeltaCoder;
if (overwriteLocalData) { if (overwriteLocalData) {
_lastUpdated = lastEditedFromBufferAdjusted + updateDelta; // don't adjust for clock skew since we already did that _lastUpdated = lastEditedFromBufferAdjusted + updateDelta; // don't adjust for clock skew since we already did that
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " _lastUpdated:" << debugTime(_lastUpdated, now); qDebug() << " _lastUpdated:" << debugTime(_lastUpdated, now);
qDebug() << " _lastEdited:" << debugTime(_lastEdited, now); qDebug() << " _lastEdited:" << debugTime(_lastEdited, now);
qDebug() << " lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now); qDebug() << " lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now);
} #endif
} }
encodedUpdateDelta = updateDeltaCoder; // determine true length encodedUpdateDelta = updateDeltaCoder; // determine true length
dataAt += encodedUpdateDelta.size(); dataAt += encodedUpdateDelta.size();
@ -485,18 +478,18 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
quint64 simulatedDelta = simulatedDeltaCoder; quint64 simulatedDelta = simulatedDeltaCoder;
if (overwriteLocalData) { if (overwriteLocalData) {
_lastSimulated = lastEditedFromBufferAdjusted + simulatedDelta; // don't adjust for clock skew since we already did that _lastSimulated = lastEditedFromBufferAdjusted + simulatedDelta; // don't adjust for clock skew since we already did that
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " _lastSimulated:" << debugTime(_lastSimulated, now); qDebug() << " _lastSimulated:" << debugTime(_lastSimulated, now);
qDebug() << " _lastEdited:" << debugTime(_lastEdited, now); qDebug() << " _lastEdited:" << debugTime(_lastEdited, now);
qDebug() << " lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now); qDebug() << " lastEditedFromBufferAdjusted:" << debugTime(lastEditedFromBufferAdjusted, now);
} #endif
} }
encodedSimulatedDelta = simulatedDeltaCoder; // determine true length encodedSimulatedDelta = simulatedDeltaCoder; // determine true length
dataAt += encodedSimulatedDelta.size(); dataAt += encodedSimulatedDelta.size();
bytesRead += encodedSimulatedDelta.size(); bytesRead += encodedSimulatedDelta.size();
} }
#if 1 //def WANT_DEBUG #ifdef WANT_DEBUG
if (overwriteLocalData) { if (overwriteLocalData) {
qDebug() << "EntityItem::readEntityDataFromBuffer()... changed entity:" << getEntityItemID(); qDebug() << "EntityItem::readEntityDataFromBuffer()... changed entity:" << getEntityItemID();
qDebug() << " getLastEdited:" << debugTime(getLastEdited(), now); qDebug() << " getLastEdited:" << debugTime(getLastEdited(), now);
@ -524,21 +517,9 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
if (overwriteLocalData) { if (overwriteLocalData) {
setRadius(fromBuffer); setRadius(fromBuffer);
} }
if (wantDebug) {
qDebug() << " readEntityDataFromBuffer() OLD FORMAT... found PROP_RADIUS";
}
} }
} else { } else {
READ_ENTITY_PROPERTY_SETTER(PROP_DIMENSIONS, glm::vec3, setDimensions); READ_ENTITY_PROPERTY_SETTER(PROP_DIMENSIONS, glm::vec3, setDimensions);
if (wantDebug) {
qDebug() << " readEntityDataFromBuffer() NEW FORMAT... look for PROP_DIMENSIONS";
}
}
if (wantDebug) {
qDebug() << " readEntityDataFromBuffer() _dimensions:" << getDimensionsInMeters() << " in meters";
} }
READ_ENTITY_PROPERTY_QUAT_SETTER(PROP_ROTATION, updateRotation); READ_ENTITY_PROPERTY_QUAT_SETTER(PROP_ROTATION, updateRotation);
@ -557,13 +538,6 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
READ_ENTITY_PROPERTY(PROP_LOCKED, bool, _locked); READ_ENTITY_PROPERTY(PROP_LOCKED, bool, _locked);
READ_ENTITY_PROPERTY_STRING(PROP_USER_DATA,setUserData); READ_ENTITY_PROPERTY_STRING(PROP_USER_DATA,setUserData);
if (wantDebug) {
qDebug() << " readEntityDataFromBuffer() _registrationPoint:" << _registrationPoint;
qDebug() << " readEntityDataFromBuffer() _visible:" << _visible;
qDebug() << " readEntityDataFromBuffer() _ignoreForCollisions:" << _ignoreForCollisions;
qDebug() << " readEntityDataFromBuffer() _collisionsWillMove:" << _collisionsWillMove;
}
bytesRead += readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, propertyFlags, overwriteLocalData); bytesRead += readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args, propertyFlags, overwriteLocalData);
recalculateCollisionShape(); recalculateCollisionShape();
@ -577,10 +551,11 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
float skipTimeForward = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND); float skipTimeForward = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND);
if (skipTimeForward > 0.0f) { if (skipTimeForward > 0.0f) {
#ifdef WANT_DEBUG
qDebug() << "skipTimeForward:" << skipTimeForward; qDebug() << "skipTimeForward:" << skipTimeForward;
#endif
simulateKinematicMotion(skipTimeForward); simulateKinematicMotion(skipTimeForward);
} }
//simulate(now);
_lastSimulated = now; _lastSimulated = now;
} }
} }
@ -606,13 +581,12 @@ void EntityItem::adjustEditPacketForClockSkew(unsigned char* editPacketBuffer, s
memcpy(&lastEditedInLocalTime, dataAt, sizeof(lastEditedInLocalTime)); memcpy(&lastEditedInLocalTime, dataAt, sizeof(lastEditedInLocalTime));
quint64 lastEditedInServerTime = lastEditedInLocalTime + clockSkew; quint64 lastEditedInServerTime = lastEditedInLocalTime + clockSkew;
memcpy(dataAt, &lastEditedInServerTime, sizeof(lastEditedInServerTime)); memcpy(dataAt, &lastEditedInServerTime, sizeof(lastEditedInServerTime));
const bool wantDebug = true; #ifdef WANT_DEBUG
if (wantDebug) {
qDebug("EntityItem::adjustEditPacketForClockSkew()..."); qDebug("EntityItem::adjustEditPacketForClockSkew()...");
qDebug() << " lastEditedInLocalTime: " << lastEditedInLocalTime; qDebug() << " lastEditedInLocalTime: " << lastEditedInLocalTime;
qDebug() << " clockSkew: " << clockSkew; qDebug() << " clockSkew: " << clockSkew;
qDebug() << " lastEditedInServerTime: " << lastEditedInServerTime; qDebug() << " lastEditedInServerTime: " << lastEditedInServerTime;
} #endif
} }
float EntityItem::computeMass() const { float EntityItem::computeMass() const {
@ -667,15 +641,13 @@ bool EntityItem::isRestingOnSurface() const {
} }
void EntityItem::simulate(const quint64& now) { void EntityItem::simulate(const quint64& now) {
bool wantDebug = false;
if (_lastSimulated == 0) { if (_lastSimulated == 0) {
_lastSimulated = now; _lastSimulated = now;
} }
float timeElapsed = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND); float timeElapsed = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND);
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << "********** EntityItem::simulate()"; qDebug() << "********** EntityItem::simulate()";
qDebug() << " entity ID=" << getEntityItemID(); qDebug() << " entity ID=" << getEntityItemID();
qDebug() << " now=" << now; qDebug() << " now=" << now;
@ -710,27 +682,23 @@ void EntityItem::simulate(const quint64& now) {
qDebug() << " getAge()=" << getAge(); qDebug() << " getAge()=" << getAge();
qDebug() << " getLifetime()=" << getLifetime(); qDebug() << " getLifetime()=" << getLifetime();
} }
}
if (wantDebug) {
qDebug() << " ********** EntityItem::simulate() .... SETTING _lastSimulated=" << _lastSimulated; qDebug() << " ********** EntityItem::simulate() .... SETTING _lastSimulated=" << _lastSimulated;
} #endif
simulateKinematicMotion(timeElapsed); simulateKinematicMotion(timeElapsed);
_lastSimulated = now; _lastSimulated = now;
} }
void EntityItem::simulateKinematicMotion(float timeElapsed) { void EntityItem::simulateKinematicMotion(float timeElapsed) {
bool wantDebug = false;
if (hasAngularVelocity()) { if (hasAngularVelocity()) {
// angular damping // angular damping
glm::vec3 angularVelocity = getAngularVelocity(); glm::vec3 angularVelocity = getAngularVelocity();
if (_angularDamping > 0.0f) { if (_angularDamping > 0.0f) {
angularVelocity *= powf(1.0f - _angularDamping, timeElapsed); angularVelocity *= powf(1.0f - _angularDamping, timeElapsed);
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " angularDamping :" << _angularDamping; qDebug() << " angularDamping :" << _angularDamping;
qDebug() << " newAngularVelocity:" << angularVelocity; qDebug() << " newAngularVelocity:" << angularVelocity;
} #endif
setAngularVelocity(angularVelocity); setAngularVelocity(angularVelocity);
} }
@ -758,19 +726,19 @@ void EntityItem::simulateKinematicMotion(float timeElapsed) {
glm::vec3 velocity = getVelocity(); glm::vec3 velocity = getVelocity();
if (_damping > 0.0f) { if (_damping > 0.0f) {
velocity *= powf(1.0f - _damping, timeElapsed); velocity *= powf(1.0f - _damping, timeElapsed);
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " damping:" << _damping; qDebug() << " damping:" << _damping;
qDebug() << " velocity AFTER dampingResistance:" << velocity; qDebug() << " velocity AFTER dampingResistance:" << velocity;
qDebug() << " glm::length(velocity):" << glm::length(velocity); qDebug() << " glm::length(velocity):" << glm::length(velocity);
qDebug() << " velocityEspilon :" << ENTITY_ITEM_EPSILON_VELOCITY_LENGTH; qDebug() << " velocityEspilon :" << ENTITY_ITEM_EPSILON_VELOCITY_LENGTH;
} #endif
} }
// integrate position forward // integrate position forward
glm::vec3 position = getPosition(); glm::vec3 position = getPosition();
glm::vec3 newPosition = position + (velocity * timeElapsed); glm::vec3 newPosition = position + (velocity * timeElapsed);
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " EntityItem::simulate()...."; qDebug() << " EntityItem::simulate()....";
qDebug() << " timeElapsed:" << timeElapsed; qDebug() << " timeElapsed:" << timeElapsed;
qDebug() << " old AACube:" << getMaximumAACube(); qDebug() << " old AACube:" << getMaximumAACube();
@ -780,7 +748,7 @@ void EntityItem::simulateKinematicMotion(float timeElapsed) {
qDebug() << " getDistanceToBottomOfEntity():" << getDistanceToBottomOfEntity() * (float)TREE_SCALE << " in meters"; qDebug() << " getDistanceToBottomOfEntity():" << getDistanceToBottomOfEntity() * (float)TREE_SCALE << " in meters";
qDebug() << " newPosition:" << newPosition; qDebug() << " newPosition:" << newPosition;
qDebug() << " glm::distance(newPosition, position):" << glm::distance(newPosition, position); qDebug() << " glm::distance(newPosition, position):" << glm::distance(newPosition, position);
} #endif
position = newPosition; position = newPosition;
@ -803,12 +771,12 @@ void EntityItem::simulateKinematicMotion(float timeElapsed) {
setVelocity(velocity); setVelocity(velocity);
} }
if (wantDebug) { #ifdef WANT_DEBUG
qDebug() << " new position:" << position; qDebug() << " new position:" << position;
qDebug() << " new velocity:" << velocity; qDebug() << " new velocity:" << velocity;
qDebug() << " new AACube:" << getMaximumAACube(); qDebug() << " new AACube:" << getMaximumAACube();
qDebug() << " old getAABox:" << getAABox(); qDebug() << " old getAABox:" << getAABox();
} #endif
} }
} }
@ -882,13 +850,12 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
if (somethingChanged) { if (somethingChanged) {
somethingChangedNotification(); // notify derived classes that something has changed somethingChangedNotification(); // notify derived classes that something has changed
bool wantDebug = false;
uint64_t now = usecTimestampNow(); uint64_t now = usecTimestampNow();
if (wantDebug) { #ifdef WANT_DEBUG
int elapsed = now - getLastEdited(); int elapsed = now - getLastEdited();
qDebug() << "EntityItem::setProperties() AFTER update... edited AGO=" << elapsed << qDebug() << "EntityItem::setProperties() AFTER update... edited AGO=" << elapsed <<
"now=" << now << " getLastEdited()=" << getLastEdited(); "now=" << now << " getLastEdited()=" << getLastEdited();
} #endif
if (_created != UNKNOWN_CREATED_TIME) { if (_created != UNKNOWN_CREATED_TIME) {
setLastEdited(now); setLastEdited(now);
} }
@ -1030,15 +997,6 @@ void EntityItem::setRadius(float value) {
float diameter = value * 2.0f; float diameter = value * 2.0f;
float maxDimension = sqrt((diameter * diameter) / 3.0f); float maxDimension = sqrt((diameter * diameter) / 3.0f);
_dimensions = glm::vec3(maxDimension, maxDimension, maxDimension); _dimensions = glm::vec3(maxDimension, maxDimension, maxDimension);
bool wantDebug = false;
if (wantDebug) {
qDebug() << "EntityItem::setRadius()...";
qDebug() << " radius:" << value;
qDebug() << " diameter:" << diameter;
qDebug() << " maxDimension:" << maxDimension;
qDebug() << " _dimensions:" << _dimensions;
}
} }
// TODO: get rid of all users of this function... // TODO: get rid of all users of this function...

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

@ -228,14 +228,16 @@ void EntityMotionState::sendUpdate(OctreeEditPacketSender* packetSender, uint32_
// we only update lastEdited when we're sending new physics data // we only update lastEdited when we're sending new physics data
// (i.e. NOT when we just simulate the positions forward, nore when we resend non-moving data) // (i.e. NOT when we just simulate the positions forward, nore when we resend non-moving data)
// NOTE: Andrew & Brad to discuss. Let's make sure we're using lastEdited, lastSimulated, and lastUpdated correctly // NOTE: Andrew & Brad to discuss. Let's make sure we're using lastEdited, lastSimulated, and lastUpdated correctly
quint64 now = usecTimestampNow();
quint64 lastSimulated = _entity->getLastSimulated(); // or now??? quint64 lastSimulated = _entity->getLastSimulated(); // or now???
_entity->setLastEdited(lastSimulated); _entity->setLastEdited(lastSimulated);
properties.setLastEdited(lastSimulated); properties.setLastEdited(lastSimulated);
#ifdef WANT_DEBUG
quint64 now = usecTimestampNow();
qDebug() << "EntityMotionState::sendUpdate()"; qDebug() << "EntityMotionState::sendUpdate()";
qDebug() << " EntityItemId:" << _entity->getEntityItemID() << "---------------------------------------------"; qDebug() << " EntityItemId:" << _entity->getEntityItemID() << "---------------------------------------------";
qDebug() << " lastSimulated:" << debugTime(lastSimulated, now); qDebug() << " lastSimulated:" << debugTime(lastSimulated, now);
#endif //def WANT_DEBUG
} else { } else {
properties.setLastEdited(_entity->getLastEdited()); properties.setLastEdited(_entity->getLastEdited());