From a0fb242bf859ed7e5d1ca6893a62442a5143343f Mon Sep 17 00:00:00 2001
From: Aesylwinn <kyleacooley@gmail.com>
Date: Fri, 25 Mar 2016 23:47:05 -0400
Subject: [PATCH] Slight improvement to camera placement.

---
 apps/opencs/view/render/cameracontroller.cpp | 28 ++++++++++++++++++++
 apps/opencs/view/render/cameracontroller.hpp | 16 +++++++++++
 apps/opencs/view/render/scenewidget.cpp      |  3 +--
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/apps/opencs/view/render/cameracontroller.cpp b/apps/opencs/view/render/cameracontroller.cpp
index 518db2076..bfdb00089 100644
--- a/apps/opencs/view/render/cameracontroller.cpp
+++ b/apps/opencs/view/render/cameracontroller.cpp
@@ -3,6 +3,7 @@
 #include <QKeyEvent>
 
 #include <osg/Camera>
+#include <osg/Drawable>
 #include <osg/Matrixd>
 #include <osg/Quat>
 
@@ -541,4 +542,31 @@ namespace CSVRender
 
         getCamera()->setViewMatrixAsLookAt(mCenter + offset, mCenter, up);
     }
+
+    CameraComputeBoundsVisitor::CameraComputeBoundsVisitor(unsigned int mask)
+        : mMask(mask)
+    {
+    }
+
+    unsigned int CameraComputeBoundsVisitor::getMask() const
+    {
+        return mMask;
+    }
+
+    void CameraComputeBoundsVisitor::setMask(unsigned int value)
+    {
+        mMask = value;
+    }
+
+    void CameraComputeBoundsVisitor::apply(osg::Drawable& drawable)
+    {
+        if (drawable.getNodeMask() & mMask)
+            ComputeBoundsVisitor::apply(drawable);
+    }
+
+    void CameraComputeBoundsVisitor::apply(osg::Transform& transform)
+    {
+        if (transform.getNodeMask() & mMask)
+            ComputeBoundsVisitor::apply(transform);
+    }
 }
diff --git a/apps/opencs/view/render/cameracontroller.hpp b/apps/opencs/view/render/cameracontroller.hpp
index 97a5ef2b2..fefa3a422 100644
--- a/apps/opencs/view/render/cameracontroller.hpp
+++ b/apps/opencs/view/render/cameracontroller.hpp
@@ -4,6 +4,7 @@
 #include <string>
 
 #include <osg/BoundingBox>
+#include <osg/ComputeBoundsVisitor>
 #include <osg/ref_ptr>
 #include <osg/Vec3d>
 
@@ -144,6 +145,21 @@ namespace CSVRender
             double mOrbitSpeed;
             double mOrbitSpeedMult;
     };
+
+    class CameraComputeBoundsVisitor : public osg::ComputeBoundsVisitor
+    {
+    public:
+        CameraComputeBoundsVisitor(unsigned int mask);
+
+        unsigned int getMask() const;
+        void setMask(unsigned int mask);
+
+        void apply(osg::Drawable& drawable);
+        void apply(osg::Transform& transform);
+
+    private:
+        unsigned int mMask;
+    };
 }
 
 #endif
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 5c565cd2f..fe8de40e7 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -12,7 +12,6 @@
 #include <osgViewer/ViewerEventHandlers>
 #include <osg/LightModel>
 #include <osg/BoundingBox>
-#include <osg/ComputeBoundsVisitor>
 
 #include <osgGA/TrackballManipulator>
 #include <osgGA/FirstPersonManipulator>
@@ -315,7 +314,7 @@ void SceneWidget::update(double dt)
     }
     else
     {
-        osg::ComputeBoundsVisitor boundsVisitor;
+        CameraComputeBoundsVisitor boundsVisitor(Mask_Reference | Mask_Terrain);
         osg::BoundingBox &boundingBox(boundsVisitor.getBoundingBox());
 
         mRootNode->accept(boundsVisitor);