Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 14:42:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup

Browse source
This commit is contained in:
ZappoMan 2014-11-06 14:00:26 -08:00
parent 90b079d5a8
commit 768a854b00
4 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/octree/OctreeInboundPacketProcessor.cpp
View file

@ -154,7 +154,6 @@ void OctreeInboundPacketProcessor::processPacket(const SharedNodePointer& sendin
quint64 startLock = usecTimestampNow(); quint64 startLock = usecTimestampNow();
_myServer->getOctree()->lockForWrite(); _myServer->getOctree()->lockForWrite();
quint64 startProcess = usecTimestampNow(); quint64 startProcess = usecTimestampNow();
int editDataBytesRead = _myServer->getOctree()->processEditPacketData(packetType, int editDataBytesRead = _myServer->getOctree()->processEditPacketData(packetType,
reinterpret_cast<const unsigned char*>(packet.data()), reinterpret_cast<const unsigned char*>(packet.data()),

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

@ -496,10 +496,8 @@ int EntityTree::processEditPacketData(PacketType packetType, const unsigned char
// if the entityItem exists, then update it // if the entityItem exists, then update it
if (existingEntity) { if (existingEntity) {
qDebug() << "Calling updateEntity() properties.getLastEdited(): " << properties.getLastEdited();
updateEntity(entityItemID, properties); updateEntity(entityItemID, properties);
existingEntity->markAsChangedOnServer(); existingEntity->markAsChangedOnServer();
qDebug() << "AFTER updateEntity() now: " << usecTimestampNow();
} else { } else {
qDebug() << "User attempted to edit an unknown entity. ID:" << entityItemID; qDebug() << "User attempted to edit an unknown entity. ID:" << entityItemID;
} }

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

@ -325,9 +325,7 @@ OctreeElement::AppendState EntityTreeElement::appendElementData(OctreePacketData
if (successAppendEntityCount) { if (successAppendEntityCount) {
foreach (uint16_t i, indexesOfEntitiesToInclude) { foreach (uint16_t i, indexesOfEntitiesToInclude) {
EntityItem* entity = (*_entityItems)[i]; EntityItem* entity = (*_entityItems)[i];
LevelDetails entityLevel = packetData->startLevel(); LevelDetails entityLevel = packetData->startLevel();
OctreeElement::AppendState appendEntityState = entity->appendEntityData(packetData, OctreeElement::AppendState appendEntityState = entity->appendEntityData(packetData,
params, entityTreeElementExtraEncodeData); params, entityTreeElementExtraEncodeData);

1
libraries/octree/src/Octree.cpp
View file

@ -19,7 +19,6 @@
#include <fstream> // to load voxels from file #include <fstream> // to load voxels from file
#include <QDebug> #include <QDebug>
#include <QThread>
#include <QVector> #include <QVector>
#include <GeometryUtil.h> #include <GeometryUtil.h>