From 46cd1f458b16fbc65096f1c2d7b75c95ef5e2608 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 5 May 2015 17:20:27 +0200
Subject: [PATCH] Actually call render on zone entities from tree

---
 .../src/EntityTreeRenderer.cpp                | 55 +++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
index 041dde70bf..273f2d67e5 100644
--- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp
+++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp
@@ -641,8 +641,7 @@ void EntityTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
         
         if (entityItem->isVisible()) {
 
-            // NOTE: Zone Entities are a special case we handle here... Zones don't render
-            // like other entity types. So we will skip the normal rendering tests
+            // NOTE: Zone Entities are a special case we handle here...
             if (entityItem->getType() == EntityTypes::Zone) {
                 if (entityItem->contains(_viewState->getAvatarPosition())) {
                     float entityVolumeEstimate = entityItem->getVolumeEstimate();
@@ -663,42 +662,42 @@ void EntityTreeRenderer::renderElement(OctreeElement* element, RenderArgs* args)
                         }
                     }
                 }
-            } else {
-                // render entityItem 
-                AABox entityBox = entityItem->getAABox();
-        
-                // TODO: some entity types (like lights) might want to be rendered even
-                // when they are outside of the view frustum...
-                float distance = args->_viewFrustum->distanceToCamera(entityBox.calcCenter());
+            }
             
-                bool outOfView = args->_viewFrustum->boxInFrustum(entityBox) == ViewFrustum::OUTSIDE;
-                if (!outOfView) {
-                    bool bigEnoughToRender = _viewState->shouldRenderMesh(entityBox.getLargestDimension(), distance);
+            // render entityItem
+            AABox entityBox = entityItem->getAABox();
+            
+            // TODO: some entity types (like lights) might want to be rendered even
+            // when they are outside of the view frustum...
+            float distance = args->_viewFrustum->distanceToCamera(entityBox.calcCenter());
+            
+            bool outOfView = args->_viewFrustum->boxInFrustum(entityBox) == ViewFrustum::OUTSIDE;
+            if (!outOfView) {
+                bool bigEnoughToRender = _viewState->shouldRenderMesh(entityBox.getLargestDimension(), distance);
                 
-                    if (bigEnoughToRender) {
-                        renderProxies(entityItem, args);
-
-                        Glower* glower = NULL;
-                        if (entityItem->getGlowLevel() > 0.0f) {
-                            glower = new Glower(entityItem->getGlowLevel());
-                        }
-                        entityItem->render(args);
-                        args->_itemsRendered++;
-                        if (glower) {
-                            delete glower;
-                        }
-                    } else {
-                        args->_itemsTooSmall++;
+                if (bigEnoughToRender) {
+                    renderProxies(entityItem, args);
+                    
+                    Glower* glower = NULL;
+                    if (entityItem->getGlowLevel() > 0.0f) {
+                        glower = new Glower(entityItem->getGlowLevel());
+                    }
+                    entityItem->render(args);
+                    args->_itemsRendered++;
+                    if (glower) {
+                        delete glower;
                     }
                 } else {
-                    args->_itemsOutOfView++;
+                    args->_itemsTooSmall++;
                 }
+            } else {
+                args->_itemsOutOfView++;
             }
         }
     }
 }
 
-float EntityTreeRenderer::getSizeScale() const { 
+float EntityTreeRenderer::getSizeScale() const {
     return _viewState->getSizeScale();
 }