Showing the changes to assignment-client/src/entities/EntityTreeSendThread.cpp (1 of 3 files). Show all
Unified · Split
| @@ -170,7 +170,7 @@ bool EntityTreeSendThread::addDescendantsToExtraFlaggedEntities(const QUuid& fil · 169 unmodified lines | |||
| 170 | return hasNewChild || hasNewDescendants; | 170 | return hasNewChild || hasNewDescendants; |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTreeElementPointer root, float octreeSizeScale, int32_t lodLevelOffset) { | 173 | void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTreeElementPointer root, int32_t lodLevelOffset) { |
| 174 | DiffTraversal::Type type = _traversal.prepareNewTraversal(view, root, lodLevelOffset); | 174 | DiffTraversal::Type type = _traversal.prepareNewTraversal(view, root, lodLevelOffset); |
| 175 | // there are three types of traversal: | 175 | // there are three types of traversal: |
| 176 | // | 176 | // |
| @@ -199,7 +199,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 22 unmodified lines | |||
| 199 | // before we consider including it. | 199 | // before we consider including it. |
| 200 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), | 200 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), |
| 201 | cube, | 201 | cube, |
| 202 | octreeSizeScale, | 202 | _traversal.getCurrentRootSizeScale(), |
| 203 | lodLevelOffset); | 203 | lodLevelOffset); |
| 204 | 204 | ||
| 205 | // Only send entities if they are large enough to see | 205 | // Only send entities if they are large enough to see |
| @@ -228,7 +228,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 22 unmodified lines | |||
| 228 | // See the DiffTraversal::First case for an explanation of the "entity is too small" check | 228 | // See the DiffTraversal::First case for an explanation of the "entity is too small" check |
| 229 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), | 229 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), |
| 230 | cube, | 230 | cube, |
| 231 | octreeSizeScale, | 231 | _traversal.getCurrentRootSizeScale(), |
| 232 | lodLevelOffset); | 232 | lodLevelOffset); |
| 233 | 233 | ||
| 234 | // Only send entities if they are large enough to see | 234 | // Only send entities if they are large enough to see |
| @@ -259,7 +259,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 24 unmodified lines | |||
| 259 | // See the DiffTraversal::First case for an explanation of the "entity is too small" check | 259 | // See the DiffTraversal::First case for an explanation of the "entity is too small" check |
| 260 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), | 260 | float renderAccuracy = calculateRenderAccuracy(_traversal.getCurrentView().getPosition(), |
| 261 | cube, | 261 | cube, |
| 262 | octreeSizeScale, | 262 | _traversal.getCurrentRootSizeScale(), |
| 263 | lodLevelOffset); | 263 | lodLevelOffset); |
| 264 | 264 | ||
| 265 | // Only send entities if they are large enough to see | 265 | // Only send entities if they are large enough to see |
| @@ -271,7 +271,7 @@ void EntityTreeSendThread::startNewTraversal(const ViewFrustum& view, EntityTree · 5 unmodified lines | |||
| 271 | // If this entity was skipped last time because it was too small, we still need to send it | 271 | // If this entity was skipped last time because it was too small, we still need to send it |
| 272 | float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(), | 272 | float lastRenderAccuracy = calculateRenderAccuracy(_traversal.getCompletedView().getPosition(), |
| 273 | cube, | 273 | cube, |
| 274 | octreeSizeScale, | 274 | _traversal.getCompletedRootSizeScale(), |
| 275 | lodLevelOffset); | 275 | lodLevelOffset); |
| 276 | 276 | ||
| 277 | if (lastRenderAccuracy <= 0.0f) { | 277 | if (lastRenderAccuracy <= 0.0f) { |