From ad9a239b45ec4e5766e5e0a9d2f5aa3289667d15 Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Tue, 26 Sep 2017 08:12:53 -0700 Subject: [PATCH] remove unused cruft --- .../src/entities/EntityPriorityQueue.cpp | 23 ------------------- .../src/entities/EntityPriorityQueue.h | 2 -- 2 files changed, 25 deletions(-) diff --git a/assignment-client/src/entities/EntityPriorityQueue.cpp b/assignment-client/src/entities/EntityPriorityQueue.cpp index dcd5892fba..999a05f2e2 100644 --- a/assignment-client/src/entities/EntityPriorityQueue.cpp +++ b/assignment-client/src/entities/EntityPriorityQueue.cpp @@ -51,26 +51,3 @@ float ConicalView::computePriority(const AACube& cube) const { } return PrioritizedEntity::DO_NOT_SEND; } - -// static -float ConicalView::computePriority(const EntityItemPointer& entity) const { - assert(entity); - bool success; - AACube cube = entity->getQueryAACube(success); - if (success) { - return computePriority(cube); - } else { - // when in doubt give it something positive - return PrioritizedEntity::WHEN_IN_DOUBT_PRIORITY; - } -} - -float PrioritizedEntity::updatePriority(const ConicalView& conicalView) { - EntityItemPointer entity = _weakEntity.lock(); - if (entity) { - _priority = conicalView.computePriority(entity); - } else { - _priority = PrioritizedEntity::DO_NOT_SEND; - } - return _priority; -} diff --git a/assignment-client/src/entities/EntityPriorityQueue.h b/assignment-client/src/entities/EntityPriorityQueue.h index a5d0ab05ff..e308d9b549 100644 --- a/assignment-client/src/entities/EntityPriorityQueue.h +++ b/assignment-client/src/entities/EntityPriorityQueue.h @@ -27,7 +27,6 @@ public: ConicalView(const ViewFrustum& viewFrustum) { set(viewFrustum); } void set(const ViewFrustum& viewFrustum); float computePriority(const AACube& cube) const; - float computePriority(const EntityItemPointer& entity) const; private: glm::vec3 _position { 0.0f, 0.0f, 0.0f }; glm::vec3 _direction { 0.0f, 0.0f, 1.0f }; @@ -44,7 +43,6 @@ public: static const float WHEN_IN_DOUBT_PRIORITY; PrioritizedEntity(EntityItemPointer entity, float priority, bool forceRemove = false) : _weakEntity(entity), _rawEntityPointer(entity.get()), _priority(priority), _forceRemove(forceRemove) {} - float updatePriority(const ConicalView& view); EntityItemPointer getEntity() const { return _weakEntity.lock(); } EntityItem* getRawEntityPointer() const { return _rawEntityPointer; } float getPriority() const { return _priority; }