From f3968679d3474275c6914cb618062fbf045391d2 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 19 Mar 2014 15:44:18 -0700
Subject: [PATCH] cleanup isInView() to use inFrustum() directly

---
 libraries/octree/src/OctreeElement.cpp | 7 -------
 libraries/octree/src/OctreeElement.h   | 4 +---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/libraries/octree/src/OctreeElement.cpp b/libraries/octree/src/OctreeElement.cpp
index bdf396a656..cdc4f419c0 100644
--- a/libraries/octree/src/OctreeElement.cpp
+++ b/libraries/octree/src/OctreeElement.cpp
@@ -1183,13 +1183,6 @@ float OctreeElement::getEnclosingRadius() const {
     return getScale() * sqrtf(3.0f) / 2.0f;
 }
 
-bool OctreeElement::isInView(const ViewFrustum& viewFrustum) const {
-    AABox box = _box; // use temporary box so we can scale it
-    box.scale(TREE_SCALE);
-    bool inView = (ViewFrustum::OUTSIDE != viewFrustum.boxInFrustum(box));
-    return inView;
-}
-
 ViewFrustum::location OctreeElement::inFrustum(const ViewFrustum& viewFrustum) const {
     AABox box = _box; // use temporary box so we can scale it
     box.scale(TREE_SCALE);
diff --git a/libraries/octree/src/OctreeElement.h b/libraries/octree/src/OctreeElement.h
index cbdad959be..ca2fa0b540 100644
--- a/libraries/octree/src/OctreeElement.h
+++ b/libraries/octree/src/OctreeElement.h
@@ -112,9 +112,7 @@ public:
     int getLevel() const { return numberOfThreeBitSectionsInCode(getOctalCode()) + 1; }
     
     float getEnclosingRadius() const;
-
-
-    bool isInView(const ViewFrustum& viewFrustum) const; 
+    bool isInView(const ViewFrustum& viewFrustum) const { return inFrustum(viewFrustum) != ViewFrustum::OUTSIDE; }
     ViewFrustum::location inFrustum(const ViewFrustum& viewFrustum) const;
     float distanceToCamera(const ViewFrustum& viewFrustum) const; 
     float furthestDistanceToCamera(const ViewFrustum& viewFrustum) const;