Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 19:29:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback and some cleanup

Browse source
This commit is contained in:
Brad Hefta-Gaub 2015-11-11 14:21:14 -08:00
parent bdfe304f7a
commit 2f903a9513
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/entities/EntityNodeData.h
View file

@ -18,8 +18,6 @@
class EntityNodeData : public OctreeQueryNode { class EntityNodeData : public OctreeQueryNode {
public: public:
EntityNodeData() : OctreeQueryNode() { }
virtual PacketType getMyPacketType() const { return PacketType::EntityData; } virtual PacketType getMyPacketType() const { return PacketType::EntityData; }
quint64 getLastDeletedEntitiesSentAt() const { return _lastDeletedEntitiesSentAt; } quint64 getLastDeletedEntitiesSentAt() const { return _lastDeletedEntitiesSentAt; }

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

@ -25,7 +25,7 @@
#include "RecurseOctreeToMapOperator.h" #include "RecurseOctreeToMapOperator.h"
#include "LogHandler.h" #include "LogHandler.h"
const quint64 EntityTree::DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50; static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER = USECS_PER_MSEC * 50;
EntityTree::EntityTree(bool shouldReaverage) : EntityTree::EntityTree(bool shouldReaverage) :
Octree(shouldReaverage), Octree(shouldReaverage),
@ -392,10 +392,8 @@ void EntityTree::processRemovedEntities(const DeleteEntityOperator& theOperator)
if (getIsServer()) { if (getIsServer()) {
// set up the deleted entities ID // set up the deleted entities ID
{ QWriteLocker locker(&_recentlyDeletedEntitiesLock);
QWriteLocker locker(&_recentlyDeletedEntitiesLock); _recentlyDeletedEntityItemIDs.insert(deletedAt, theEntity->getEntityItemID());
_recentlyDeletedEntityItemIDs.insert(deletedAt, theEntity->getEntityItemID());
}
} }
if (_simulation) { if (_simulation) {

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

@ -147,7 +147,6 @@ public:
void addNewlyCreatedHook(NewlyCreatedEntityHook* hook); void addNewlyCreatedHook(NewlyCreatedEntityHook* hook);
void removeNewlyCreatedHook(NewlyCreatedEntityHook* hook); void removeNewlyCreatedHook(NewlyCreatedEntityHook* hook);
static const quint64 DELETED_ENTITIES_EXTRA_USECS_TO_CONSIDER;
bool hasAnyDeletedEntities() const { return _recentlyDeletedEntityItemIDs.size() > 0; } bool hasAnyDeletedEntities() const { return _recentlyDeletedEntityItemIDs.size() > 0; }
bool hasEntitiesDeletedSince(quint64 sinceTime); bool hasEntitiesDeletedSince(quint64 sinceTime);
std::unique_ptr<NLPacket> encodeEntitiesDeletedSince(OCTREE_PACKET_SEQUENCE sequenceNumber, quint64& sinceTime, std::unique_ptr<NLPacket> encodeEntitiesDeletedSince(OCTREE_PACKET_SEQUENCE sequenceNumber, quint64& sinceTime,