add LOD support for model and particle rendering

interface/src/models/ModelTreeRenderer.cpp

@@ -12,7 +12,7 @@
 #include <glm/gtx/quaternion.hpp>
 
 #include "InterfaceConfig.h"
-
+#include "Menu.h"
 #include "ModelTreeRenderer.h"
 
 ModelTreeRenderer::ModelTreeRenderer() :
@@ -118,6 +118,15 @@ void ModelTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
     }
 }
 
+float ModelTreeRenderer::getSizeScale() const { 
+    return Menu::getInstance()->getVoxelSizeScale();
+}
+
+int ModelTreeRenderer::getBoundaryLevelAdjust() const { 
+    return Menu::getInstance()->getBoundaryLevelAdjust();
+}
+
+
 void ModelTreeRenderer::processEraseMessage(const QByteArray& dataByteArray, const SharedNodePointer& sourceNode) {
     static_cast<ModelTree*>(_tree)->processEraseMessage(dataByteArray, sourceNode);
 }

interface/src/models/ModelTreeRenderer.h

@@ -36,6 +36,8 @@ public:
     virtual PacketType getMyQueryMessageType() const { return PacketTypeModelQuery; }
     virtual PacketType getExpectedPacketType() const { return PacketTypeModelData; }
     virtual void renderElement(OctreeElement* element, RenderArgs* args);
+    virtual float getSizeScale() const;
+    virtual int getBoundaryLevelAdjust() const;
 
     void update();
 

libraries/octree/src/OctreeElement.cpp

@@ -1208,6 +1208,7 @@ ViewFrustum::location OctreeElement::inFrustum(const ViewFrustum& viewFrustum) c
 //    By doing this, we don't need to test each child voxel's position vs the LOD boundary
 bool OctreeElement::calculateShouldRender(const ViewFrustum* viewFrustum, float voxelScaleSize, int boundaryLevelAdjust) const {
     bool shouldRender = false;
+    
     if (hasContent()) {
         float furthestDistance = furthestDistanceToCamera(*viewFrustum);
         float childBoundary = boundaryDistanceForRenderLevel(getLevel() + 1 + boundaryLevelAdjust, voxelScaleSize);

libraries/octree/src/OctreeRenderer.cpp

@@ -140,19 +140,22 @@ void OctreeRenderer::processDatagram(const QByteArray& dataByteArray, const Shar
 
 bool OctreeRenderer::renderOperation(OctreeElement* element, void* extraData) {
     RenderArgs* args = static_cast<RenderArgs*>(extraData);
-    //if (true || element->isInView(*args->_viewFrustum)) {
     if (element->isInView(*args->_viewFrustum)) {
         if (element->hasContent()) {
-            args->_renderer->renderElement(element, args);
+            if (element->calculateShouldRender(args->_viewFrustum, args->_sizeScale, args->_boundaryLevelAdjust)) {
+                args->_renderer->renderElement(element, args);
+            } else {
+                return false; // if we shouldn't render, then we also should stop recursing.
+            }
         }
-        return true;
+        return true; // continue recursing
     }
     // if not in view stop recursing
     return false;
 }
 
 void OctreeRenderer::render() {
-    RenderArgs args = { 0, this, _viewFrustum };
+    RenderArgs args = { 0, this, _viewFrustum, getSizeScale(), getBoundaryLevelAdjust() };
     if (_tree) {
         _tree->lockForRead();
         _tree->recurseTreeWithOperation(renderOperation, &args);

libraries/octree/src/OctreeRenderer.h

@@ -31,6 +31,8 @@ public:
     int _renderedItems;
     OctreeRenderer* _renderer;
     ViewFrustum* _viewFrustum;
+    float _sizeScale;
+    int _boundaryLevelAdjust;
 };
 
 
@@ -46,6 +48,8 @@ public:
     virtual PacketType getMyQueryMessageType() const = 0;
     virtual PacketType getExpectedPacketType() const = 0;
     virtual void renderElement(OctreeElement* element, RenderArgs* args) = 0;
+    virtual float getSizeScale() const { return DEFAULT_OCTREE_SIZE_SCALE; }
+    virtual int getBoundaryLevelAdjust() const { return 0; }
 
     virtual void setTree(Octree* newTree);