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

fix sorting algorithm for avatar render updates

Browse source
This commit is contained in:
Andrew Meadows 2017-02-21 13:34:07 -08:00
parent 5c782deb4d
commit 27dd82b517
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/AvatarManager.cpp
View file

@ -154,8 +154,7 @@ public:
AvatarPriority(AvatarSharedPointer a, float p) : avatar(a), priority(p) {} AvatarPriority(AvatarSharedPointer a, float p) : avatar(a), priority(p) {}
AvatarSharedPointer avatar; AvatarSharedPointer avatar;
float priority; float priority;
// NOTE: we invert the less-than operator to sort high priorities to front bool operator<(const AvatarPriority& other) const { return priority < other.priority; }
bool operator<(const AvatarPriority& other) const { return priority > other.priority; }
}; };
void AvatarManager::updateOtherAvatars(float deltaTime) { void AvatarManager::updateOtherAvatars(float deltaTime) {
@ -206,9 +205,8 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
float radius = avatar->getBoundingRadius(); float radius = avatar->getBoundingRadius();
const glm::vec3& forward = cameraView.getDirection(); const glm::vec3& forward = cameraView.getDirection();
float apparentSize = radius / distance; float apparentSize = radius / distance;
float cosineAngle = glm::length(offset - glm::dot(offset, forward) * forward) / distance; float cosineAngle = glm::length(glm::dot(offset, forward) * forward) / distance;
const float TIME_PENALTY = 0.080f; // seconds float age = (float)(startTime - avatar->getLastRenderUpdateTime()) / (float)(USECS_PER_SECOND);
float age = (float)(startTime - avatar->getLastRenderUpdateTime()) / (float)(USECS_PER_SECOND) - TIME_PENALTY;
// NOTE: we are adding values of different units to get a single measure of "priority". // NOTE: we are adding values of different units to get a single measure of "priority".
// Thus we multiply each component by a conversion "weight" that scales its units // Thus we multiply each component by a conversion "weight" that scales its units
// relative to the others. These weights are pure magic tuning and are hard coded in the // relative to the others. These weights are pure magic tuning and are hard coded in the