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

use cube instead of entityBounds

Browse source
This commit is contained in:
SamGondelman 2017-08-16 16:19:00 -07:00 committed by Andrew Meadows
parent 4c8f683479
commit b0f30acce2
1 changed files with 8 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
assignment-client/src/entities/EntityTreeSendThread.cpp
View file

@ -197,24 +197,14 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
// larger octree cell because of its position (for example if it crosses the boundary of a cell it // larger octree cell because of its position (for example if it crosses the boundary of a cell it
// pops to the next higher cell. So we want to check to see that the entity is large enough to be seen // pops to the next higher cell. So we want to check to see that the entity is large enough to be seen
// before we consider including it. // before we consider including it.
// We can't cull a parent-entity by its dimensions because the child may be larger. We need to
// avoid sending details about a child but not the parent. The parent's queryAACube should have
// been adjusted to encompass the queryAACube of the child.
AABox entityBounds = entity->hasChildren() ? AABox(cube) : entity->getAABox(success);
if (!success) {
// if this entity is a child of an avatar, the entity-server wont be able to determine its
// AABox. If this happens, fall back to the queryAACube.
entityBounds = AABox(cube);
}
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
entityBounds, cube,
octreeSizeScale, octreeSizeScale,
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
if (renderAccuracy > 0.0f) { if (renderAccuracy > 0.0f) {
float priority = _conicalView.computePriority(entityBounds); float priority = _conicalView.computePriority(cube);
_sendQueue.push(PrioritizedEntity(entity, priority)); _sendQueue.push(PrioritizedEntity(entity, priority));
} }
} }
@ -236,19 +226,14 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
if (success) { if (success) {
if (next.intersection == ViewFrustum::INSIDE || _traversal.getCurrentView().cubeIntersectsKeyhole(cube)) { if (next.intersection == ViewFrustum::INSIDE || _traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
// See the DiffTraversal::First case for an explanation of the "entity is too small" check // See the DiffTraversal::First case for an explanation of the "entity is too small" check
AABox entityBounds = entity->hasChildren() ? AABox(cube) : entity->getAABox(success);
if (!success) {
entityBounds = AABox(cube);
}
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
entityBounds, cube,
octreeSizeScale, octreeSizeScale,
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
if (renderAccuracy > 0.0f) { if (renderAccuracy > 0.0f) {
float priority = _conicalView.computePriority(entityBounds); float priority = _conicalView.computePriority(cube);
_sendQueue.push(PrioritizedEntity(entity, priority)); _sendQueue.push(PrioritizedEntity(entity, priority));
} }
} }
@ -272,30 +257,25 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
if (success) { if (success) {
if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) { if (_traversal.getCurrentView().cubeIntersectsKeyhole(cube)) {
// See the DiffTraversal::First case for an explanation of the "entity is too small" check // See the DiffTraversal::First case for an explanation of the "entity is too small" check
AABox entityBounds = entity->hasChildren() ? AABox(cube) : entity->getAABox(success);
if (!success) {
entityBounds = AABox(cube);
}
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
entityBounds, cube,
octreeSizeScale, octreeSizeScale,
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
if (renderAccuracy > 0.0f) { if (renderAccuracy > 0.0f) {
if (entity->getLastEdited() > timestamp || !_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) { if (entity->getLastEdited() > timestamp || !_traversal.getCompletedView().cubeIntersectsKeyhole(cube)) {
float priority = _conicalView.computePriority(entityBounds); float priority = _conicalView.computePriority(cube);
_sendQueue.push(PrioritizedEntity(entity, priority)); _sendQueue.push(PrioritizedEntity(entity, priority));
} else { } else {
// If this entity was skipped last time because it was too small, we still need to send it // If this entity was skipped last time because it was too small, we still need to send it
float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(), float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(),
entityBounds, cube,
octreeSizeScale, octreeSizeScale,
lodLevelOffset); lodLevelOffset);
if (lastRenderAccuracy <= 0.0f) { if (lastRenderAccuracy <= 0.0f) {
float priority = _conicalView.computePriority(entityBounds); float priority = _conicalView.computePriority(cube);
_sendQueue.push(PrioritizedEntity(entity, priority)); _sendQueue.push(PrioritizedEntity(entity, priority));
} }
} }