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

remove unused cruft

Browse source
This commit is contained in:
Andrew Meadows 2017-09-26 08:12:53 -07:00
parent 8134e2b7f9
commit ad9a239b45
2 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
assignment-client/src/entities/EntityPriorityQueue.cpp
View file

@ -51,26 +51,3 @@ float ConicalView::computePriority(const AACube& cube) const {
} }
return PrioritizedEntity::DO_NOT_SEND; 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;
}

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

@ -27,7 +27,6 @@ public:
ConicalView(const ViewFrustum& viewFrustum) { set(viewFrustum); } ConicalView(const ViewFrustum& viewFrustum) { set(viewFrustum); }
void set(const ViewFrustum& viewFrustum); void set(const ViewFrustum& viewFrustum);
float computePriority(const AACube& cube) const; float computePriority(const AACube& cube) const;
float computePriority(const EntityItemPointer& entity) const;
private: private:
glm::vec3 _position { 0.0f, 0.0f, 0.0f }; glm::vec3 _position { 0.0f, 0.0f, 0.0f };
glm::vec3 _direction { 0.0f, 0.0f, 1.0f }; glm::vec3 _direction { 0.0f, 0.0f, 1.0f };
@ -44,7 +43,6 @@ public:
static const float WHEN_IN_DOUBT_PRIORITY; static const float WHEN_IN_DOUBT_PRIORITY;
PrioritizedEntity(EntityItemPointer entity, float priority, bool forceRemove = false) : _weakEntity(entity), _rawEntityPointer(entity.get()), _priority(priority), _forceRemove(forceRemove) {} 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(); } EntityItemPointer getEntity() const { return _weakEntity.lock(); }
EntityItem* getRawEntityPointer() const { return _rawEntityPointer; } EntityItem* getRawEntityPointer() const { return _rawEntityPointer; }
float getPriority() const { return _priority; } float getPriority() const { return _priority; }