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

use correct rootSizeScale

Browse source
This commit is contained in:
SamGondelman 2017-08-16 17:29:13 -07:00 committed by Andrew Meadows
parent b0f30acce2
commit bb5368eb55
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ bool EntityTreeSendThread::addDescendantsToExtraFlaggedEntities(const QUuid& fil
return hasNewChild || hasNewDescendants; return hasNewChild || hasNewDescendants;
} }
void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTreeElementPointer root, float octreeSizeScale, int32_t lodLevelOffset) { void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTreeElementPointer root, int32_t lodLevelOffset) {
DiffTraversal::Type type = _traversal.prepareNewTraversal(view, root, lodLevelOffset); DiffTraversal::Type type = _traversal.prepareNewTraversal(view, root, lodLevelOffset);
// there are three types of traversal: // there are three types of traversal:
// //
@ -199,7 +199,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
// before we consider including it. // before we consider including it.
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
cube, cube,
octreeSizeScale, _traversal.getCurrentRootSizeScale(),
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
@ -228,7 +228,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
// 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
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
cube, cube,
octreeSizeScale, _traversal.getCurrentRootSizeScale(),
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
@ -259,7 +259,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
// 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
float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(),
cube, cube,
octreeSizeScale, _traversal.getCurrentRootSizeScale(),
lodLevelOffset); lodLevelOffset);
// Only send entities if they are large enough to see // Only send entities if they are large enough to see
@ -271,7 +271,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree
// 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(),
cube, cube,
octreeSizeScale, _traversal.getCompletedRootSizeScale(),
lodLevelOffset); lodLevelOffset);
if (lastRenderAccuracy <= 0.0f) { if (lastRenderAccuracy <= 0.0f) {

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

@ -36,7 +36,7 @@ private:
bool addAncestorsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData); bool addAncestorsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData);
bool addDescendantsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData); bool addDescendantsToExtraFlaggedEntities(const QUuid& filteredEntityID, EntityItem& entityItem, EntityNodeData& nodeData);
void startNewTraversal(const ViewFrustum& viewFrustum, EntityTreeElementPointer root, float octreeSizeScale, int32_t lodLevelOffset); void startNewTraversal(const ViewFrustum& viewFrustum, EntityTreeElementPointer root, int32_t lodLevelOffset);
DiffTraversal _traversal; DiffTraversal _traversal;
EntityPriorityQueue _sendQueue; EntityPriorityQueue _sendQueue;

3
libraries/entities/src/DiffTraversal.h
View file

@ -64,6 +64,9 @@ public:
const ViewFrustum& getCurrentView() const { return _currentView.viewFrustum; } const ViewFrustum& getCurrentView() const { return _currentView.viewFrustum; }
const ViewFrustum& getCompletedView() const { return _completedView.viewFrustum; } const ViewFrustum& getCompletedView() const { return _completedView.viewFrustum; }
const float getCurrentRootSizeScale() const { return _currentView.rootSizeScale; }
const float getCompletedRootSizeScale() const { return _completedView.rootSizeScale; }
uint64_t getStartOfCompletedTraversal() const { return _completedView.startTime; } uint64_t getStartOfCompletedTraversal() const { return _completedView.startTime; }
bool finished() const { return _path.empty(); } bool finished() const { return _path.empty(); }