Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-10 17:19:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove tabs from indentation

Browse source
This commit is contained in:
Andrew Meadows 2017-11-08 10:49:54 -08:00
parent c6bccb3de3
commit f47185b2f6
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -346,37 +346,37 @@ void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene
glm::vec3 forward = view.getDirection(); glm::vec3 forward = view.getDirection();
const float OUT_OF_VIEW_PENALTY = -10.0f; const float OUT_OF_VIEW_PENALTY = -10.0f;
while (itr != _renderablesToUpdate.end()) { while (itr != _renderablesToUpdate.end()) {
// priority = weighted linear combination of: // priority = weighted linear combination of:
// (a) apparentSize // (a) apparentSize
// (b) proximity to center of view // (b) proximity to center of view
// (c) time since last update // (c) time since last update
EntityItemPointer entity = itr->second->getEntity(); EntityItemPointer entity = itr->second->getEntity();
glm::vec3 entityPosition = entity->getPosition(); glm::vec3 entityPosition = entity->getPosition();
glm::vec3 offset = entityPosition - viewCenter; glm::vec3 offset = entityPosition - viewCenter;
float distance = glm::length(offset) + 0.001f; // add 1mm to avoid divide by zero float distance = glm::length(offset) + 0.001f; // add 1mm to avoid divide by zero
float diameter = entity->getQueryAACube().getScale(); float diameter = entity->getQueryAACube().getScale();
float apparentSize = diameter / distance; float apparentSize = diameter / distance;
float cosineAngle = glm::dot(offset, forward) / distance; float cosineAngle = glm::dot(offset, forward) / distance;
float age = (float)(sortStart - itr->second->getUpdateTime()) / (float)(USECS_PER_SECOND); float age = (float)(sortStart - itr->second->getUpdateTime()) / (float)(USECS_PER_SECOND);
// 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 relative to the others. // Thus we multiply each component by a conversion "weight" that scales its units relative to the others.
// These weights are pure magic tuning and should be hard coded in the relation below, // These weights are pure magic tuning and should be hard coded in the relation below,
// but are currently exposed for anyone who would like to explore fine tuning: // but are currently exposed for anyone who would like to explore fine tuning:
const float APPARENT_SIZE_COEFFICIENT = 1.0f; const float APPARENT_SIZE_COEFFICIENT = 1.0f;
const float CENTER_SORT_COEFFICIENT = 0.5f; const float CENTER_SORT_COEFFICIENT = 0.5f;
const float AGE_SORT_COEFFICIENT = 0.25f; const float AGE_SORT_COEFFICIENT = 0.25f;
float priority = APPARENT_SIZE_COEFFICIENT * apparentSize float priority = APPARENT_SIZE_COEFFICIENT * apparentSize
+ CENTER_SORT_COEFFICIENT * cosineAngle + CENTER_SORT_COEFFICIENT * cosineAngle
+ AGE_SORT_COEFFICIENT * age; + AGE_SORT_COEFFICIENT * age;
// decrement priority of things outside keyhole // decrement priority of things outside keyhole
if (distance > view.getCenterRadius()) { if (distance > view.getCenterRadius()) {
if (!view.sphereIntersectsFrustum(entityPosition, 0.5f * diameter)) { if (!view.sphereIntersectsFrustum(entityPosition, 0.5f * diameter)) {
priority += OUT_OF_VIEW_PENALTY; priority += OUT_OF_VIEW_PENALTY;
} }
} }
sortedRenderables.push(SortableEntityRenderer(itr->second, priority)); sortedRenderables.push(SortableEntityRenderer(itr->second, priority));
++itr; ++itr;