Changeset 10999 for OpenSceneGraph/trunk/src/osgViewer/View.cpp

Timestamp:

01/26/10 15:57:44 (3 years ago)

Author:

robert

Message:

Removal of redundant spaces at ends of lines

Files:

• OpenSceneGraph/trunk/src/osgViewer/View.cpp (modified) (94 diffs)

OpenSceneGraph/trunk/src/osgViewer/View.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -37 +37 @@
     CollectedCoordinateSystemNodesVisitor():
         NodeVisitor(osg::NodeVisitor::TRAVERSE_ACTIVE_CHILDREN) {}
-        
+
     META_NodeVisitor("osgViewer","CollectedCoordinateSystemNodesVisitor")
 
@@ -60 +60 @@
         traverse(node);
     }
-    
+
     osg::NodePath _pathToCoordinateSystemNode;
 };
@@ -72 +72 @@
     ViewerCoordinateFrameCallback(osgViewer::View* view):
         _view(view) {}
-    
+
     virtual osg::CoordinateFrame getCoordinateFrame(const osg::Vec3d& position) const
     {
@@ -78 +78 @@
 
         osg::NodePath tmpPath = _view->getCoordinateSystemNodePath();
-        
+
         if (!tmpPath.empty())
-        {        
+        {
             osg::Matrixd coordinateFrame;
 
@@ -87 +87 @@
             {
                 osg::Vec3 local_position = position*osg::computeWorldToLocal(tmpPath);
-                
+
                 // get the coordinate frame in world coords.
                 coordinateFrame = csn->computeLocalCoordinateFrame(local_position)* osg::computeLocalToWorld(tmpPath);
@@ -122 +122 @@
         }
     }
-    
+
 protected:
     virtual ~ViewerCoordinateFrameCallback() {}
-    
+
     osg::observer_ptr<osgViewer::View> _view;
 };
@@ -147 +147 @@
     // make sure View is safe to reference multi-threaded.
     setThreadSafeRefUnref(true);
-    
+
     // need to attach a Renderer to the master camera which has been default constructed
     getCamera()->setRenderer(createRenderer(getCamera()));
 
     setEventQueue(new osgGA::EventQueue);
-    
+
     setStats(new osg::Stats("View"));
 }
@@ -183 +183 @@
 
 #if 1
-    osgViewer::View* rhs_osgViewer = dynamic_cast<osgViewer::View*>(&rhs);    
+    osgViewer::View* rhs_osgViewer = dynamic_cast<osgViewer::View*>(&rhs);
     if (rhs_osgViewer)
     {
-    
+
         // copy across rhs
         _startTick = rhs_osgViewer->_startTick;
@@ -195 +195 @@
             _scene = rhs_osgViewer->_scene;
         }
-        
+
         if (rhs_osgViewer->_cameraManipulator.valid())
         {
             _cameraManipulator = rhs_osgViewer->_cameraManipulator;
         }
-        
+
         _eventHandlers.insert(_eventHandlers.end(), rhs_osgViewer->_eventHandlers.begin(), rhs_osgViewer->_eventHandlers.end());
 
@@ -208 +208 @@
         _fusionDistanceMode = rhs_osgViewer->_fusionDistanceMode;
         _fusionDistanceValue = rhs_osgViewer->_fusionDistanceValue;
-        
-        
+
+
         // clear rhs
         rhs_osgViewer->_frameStamp = 0;
@@ -215 +215 @@
         rhs_osgViewer->_cameraManipulator = 0;
         rhs_osgViewer->_eventHandlers.clear();
-        
+
         rhs_osgViewer->_coordinateSystemNodePath.clear();
-        
+
         rhs_osgViewer->_displaySettings = 0;
     }
@@ -236 +236 @@
 {
     osg::notify(osg::INFO)<<"View::init()"<<std::endl;
-    
+
     osg::ref_ptr<osgGA::GUIEventAdapter> initEvent = _eventQueue->createEvent();
     initEvent->setEventType(osgGA::GUIEventAdapter::FRAME);
-    
+
     if (_cameraManipulator.valid())
     {
@@ -290 +290 @@
         osgUtil::Optimizer::StaticObjectDetectionVisitor sodv;
         getSceneData()->accept(sodv);
-        
+
         // make sure that existing scene graph objects are allocated with thread safe ref/unref
-        if (getViewerBase() && 
-            getViewerBase()->getThreadingModel()!=ViewerBase::SingleThreaded) 
+        if (getViewerBase() &&
+            getViewerBase()->getThreadingModel()!=ViewerBase::SingleThreaded)
         {
             getSceneData()->setThreadSafeRefUnref(true);
         }
-        
+
         // update the scene graph so that it has enough GL object buffer memory for the graphics contexts that will be using it.
         getSceneData()->resizeGLObjectBuffers(osg::DisplaySettings::instance()->getMaxNumberOfGraphicsContexts());
     }
-    
+
     computeActiveCoordinateSystemNodePath();
 
@@ -342 +342 @@
 {
     _cameraManipulator = manipulator;
-    
+
     if (_cameraManipulator.valid())
     {
@@ -348 +348 @@
 
         if (getSceneData()) _cameraManipulator->setNode(getSceneData());
-        
+
         osg::ref_ptr<osgGA::GUIEventAdapter> dummyEvent = _eventQueue->createEvent();
 
@@ -407 +407 @@
     // now search for CoordinateSystemNode's for which we want to track.
     osg::Node* subgraph = getSceneData();
-    
+
     if (subgraph)
     {
-    
+
         CollectedCoordinateSystemNodesVisitor ccsnv;
         subgraph->accept(ccsnv);
@@ -419 +419 @@
            return;
         }
-    }  
+    }
 
     // otherwise no node path found so reset to empty.
@@ -428 +428 @@
 {
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi) 
+    if (!wsi)
     {
         osg::notify(osg::NOTICE)<<"View::setUpViewAcrossAllScreens() : Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
         return;
     }
-    
+
     osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance();
-    
-    double fovy, aspectRatio, zNear, zFar;        
+
+    double fovy, aspectRatio, zNear, zFar;
     _camera->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
 
     osg::GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
-    
+
     // displayNum has not been set so reset it to 0.
     if (si.displayNum<0) si.displayNum = 0;
-    
+
     unsigned int numScreens = wsi->getNumScreens(si);
     if (numScreens==1)
     {
         if (si.screenNum<0) si.screenNum = 0;
-    
+
         unsigned int width, height;
         wsi->getScreenResolution(si, width, height);
@@ -468 +468 @@
 
         _camera->setGraphicsContext(gc.get());
-        
+
         osgViewer::GraphicsWindow* gw = dynamic_cast<osgViewer::GraphicsWindow*>(gc.get());
         if (gw)
@@ -508 +508 @@
             translate_x += double(width) / (double(height) * aspectRatio);
         }
-        
+
         bool stereoSlitScreens = numScreens==2 &&
                                  ds->getStereoMode()==osg::DisplaySettings::HORIZONTAL_SPLIT &&
                                  ds->getStereo();
-    
+
         for(unsigned int i=0; i<numScreens; ++i)
         {
             si.screenNum = i;
-        
+
             unsigned int width, height;
             wsi->getScreenResolution(si, width, height);
@@ -559 +559 @@
             {
                 unsigned int leftCameraNum = (ds->getSplitStereoHorizontalEyeMapping()==osg::DisplaySettings::LEFT_EYE_LEFT_VIEWPORT) ? 0 : 1;
-                
+
                 osg::ref_ptr<osg::DisplaySettings> ds_local = new osg::DisplaySettings(*ds);
                 ds_local->setStereoMode(leftCameraNum==i ? osg::DisplaySettings::LEFT_EYE : osg::DisplaySettings::RIGHT_EYE);
                 camera->setDisplaySettings(ds_local.get());
-                
+
                 addSlave(camera.get(), osg::Matrixd(), osg::Matrixd() );
             }
@@ -588 +588 @@
     traits->readDISPLAY();
     if (traits->displayNum<0) traits->displayNum = 0;
-    
+
     traits->screenNum = screenNum;
     traits->x = x;
@@ -613 +613 @@
     }
 
-    double fovy, aspectRatio, zNear, zFar;        
+    double fovy, aspectRatio, zNear, zFar;
     _camera->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
 
@@ -634 +634 @@
 {
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi) 
+    if (!wsi)
     {
         osg::notify(osg::NOTICE)<<"View::setUpViewOnSingleScreen() : Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
@@ -644 +644 @@
     osg::GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
-    
+
     // displayNum has not been set so reset it to 0.
     if (si.displayNum<0) si.displayNum = 0;
@@ -680 +680 @@
     }
 
-    double fovy, aspectRatio, zNear, zFar;        
+    double fovy, aspectRatio, zNear, zFar;
     _camera->getProjectionMatrixAsPerspective(fovy, aspectRatio, zNear, zFar);
 
@@ -702 +702 @@
     osg::Vec3d center(0.0,0.0,0.0);
     osg::Vec3d eye(0.0,0.0,0.0);
-    
+
     double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius);
-    
+
     bool centerProjection = false;
 
     osg::Vec3d projector = eye - osg::Vec3d(0.0,0.0, distance);
-    
+
     osg::notify(osg::INFO)<<"create3DSphericalDisplayDistortionMesh : Projector position = "<<projector<<std::endl;
     osg::notify(osg::INFO)<<"create3DSphericalDisplayDistortionMesh : distance = "<<distance<<std::endl;
@@ -725 +725 @@
     float height = heightVector.length();
     yAxis /= height;
-    
+
     int noSteps = 50;
 
@@ -736 +736 @@
     osg::Vec3 dx = xAxis*(width/((float)(noSteps-1)));
     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1)));
-    
+
     osg::Vec3d screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
     float screenRadius = heightVector.length() * 0.5f;
@@ -756 +756 @@
 
                 phi *= 2.0;
-                
+
                 if (theta<0.0) theta += 2.0*osg::PI;
 
@@ -770 +770 @@
                 osg::Vec2 texcoord1(theta/(2.0*osg::PI), 1.0f - phi/osg::PI_2);
                 if (intensityMap)
-                {            
+                {
                     colors->push_back(intensityMap->getColor(texcoord1));
                 }
@@ -798 +798 @@
 
                 // osg::notify(osg::NOTICE)<<"theta = "<<theta<< "phi="<<phi<<std::endl;
-                
+
                 double f = distance * sin(phi);
                 double e = distance * cos(phi) + sqrt( sphere_radius*sphere_radius - f*f);
@@ -804 +804 @@
                 double h = e * sin(phi);
                 double z = l - distance;
-                
+
                 osg::Vec3 texcoord(h * cos(theta) / sphere_radius,
                                    h * sin(theta) / sphere_radius,
@@ -814 +814 @@
                 osg::Vec2 texcoord1(theta/(2.0*osg::PI), 1.0f - phi/osg::PI_2);
                 if (intensityMap)
-                {            
+                {
                     colors->push_back(intensityMap->getColor(texcoord1));
                 }
@@ -828 +828 @@
         }
     }
-    
+
     // pass the created vertex array to the points geometry object.
     geometry->setVertexArray(vertices);
@@ -848 +848 @@
         geometry->addPrimitiveSet(elements);
     }
-    
+
     return geometry;
 }
@@ -856 +856 @@
     osg::notify(osg::INFO)<<"View::setUpViewFor3DSphericalDisplay(rad="<<radius<<", cllr="<<collar<<", sn="<<screenNum<<", im="<<intensityMap<<")"<<std::endl;
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi) 
+    if (!wsi)
     {
         osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
@@ -864 +864 @@
     osg::GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
-    
+
     // displayNum has not been set so reset it to 0.
     if (si.displayNum<0) si.displayNum = 0;
@@ -885 +885 @@
     traits->doubleBuffer = true;
     traits->sharedContext = 0;
-    
+
 
     osg::ref_ptr<osg::GraphicsContext> gc = osg::GraphicsContext::createGraphicsContext(traits.get());
@@ -893 +893 @@
         return;
     }
-    
+
     bool applyIntensityMapAsColours = true;
 
@@ -911 +911 @@
     texture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP_TO_EDGE);
     texture->setWrap(osg::Texture::WRAP_R,osg::Texture::CLAMP_TO_EDGE);
-    
-#if 0    
+
+#if 0
     osg::Camera::RenderTargetImplementation renderTargetImplementation = osg::Camera::SEPERATE_WINDOW;
     GLenum buffer = GL_FRONT;
@@ -938 +938 @@
     }
 
-    
+
     // top face
     {
@@ -1034 +1034 @@
         addSlave(camera.get(), osg::Matrixd(), osg::Matrixd::rotate(osg::inDegrees(180.0f), 1.0,0.0,0.0));
     }
-    
+
     getCamera()->setProjectionMatrixAsPerspective(90.0f, 1.0, 1, 1000.0);
 
@@ -1042 +1042 @@
         geode->addDrawable(create3DSphericalDisplayDistortionMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), radius, collar, applyIntensityMapAsColours ? intensityMap : 0, projectorMatrix));
 
-        // new we need to add the texture to the mesh, we do so by creating a 
+        // new we need to add the texture to the mesh, we do so by creating a
         // StateSet to contain the Texture StateAttribute.
         osg::StateSet* stateset = geode->getOrCreateStateSet();
@@ -1065 +1065 @@
         camera->setInheritanceMask(camera->getInheritanceMask() & ~osg::CullSettings::CLEAR_COLOR & ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE);
         //camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-        
+
         camera->setProjectionMatrixAsOrtho2D(0,width,0,height);
         camera->setViewMatrix(osg::Matrix::identity());
@@ -1071 +1071 @@
         // add subgraph to render
         camera->addChild(geode);
-        
+
         camera->setName("DistortionCorrectionCamera");
 
         addSlave(camera.get(), osg::Matrixd(), osg::Matrixd(), false);
     }
-    
+
     getCamera()->setNearFarRatio(0.0001f);
-    
+
     if (getLightingMode()==osg::View::HEADLIGHT)
     {
@@ -1090 +1090 @@
     osg::Vec3d center(0.0,0.0,0.0);
     osg::Vec3d eye(0.0,0.0,0.0);
-    
+
     double distance = sqrt(sphere_radius*sphere_radius - collar_radius*collar_radius);
     bool flip = false;
@@ -1096 +1096 @@
 
     osg::Vec3d projector = eye - osg::Vec3d(0.0,0.0, distance);
-    
-    
+
+
     osg::notify(osg::INFO)<<"createParoramicSphericalDisplayDistortionMesh : Projector position = "<<projector<<std::endl;
     osg::notify(osg::INFO)<<"createParoramicSphericalDisplayDistortionMesh : distance = "<<distance<<std::endl;
@@ -1113 +1113 @@
     float height = heightVector.length();
     yAxis /= height;
-    
+
     int noSteps = 160;
 
@@ -1124 +1124 @@
     osg::Vec3 dx = xAxis*(width/((float)(noSteps-2)));
     osg::Vec3 dy = yAxis*(height/((float)(noSteps-1)));
-    
+
     osg::Vec3 top = origin + yAxis*height;
 
     osg::Vec3 screenCenter = origin + widthVector*0.5f + heightVector*0.5f;
     float screenRadius = heightVector.length() * 0.5f;
-    
+
     geometry->getOrCreateStateSet()->setMode(GL_CULL_FACE, osg::StateAttribute::OFF | osg::StateAttribute::PROTECTED);
 
@@ -1140 +1140 @@
             double theta = texcoord.x() * 2.0 * osg::PI;
             double phi = (1.0-texcoord.y()) * osg::PI;
-            
+
             if (texcoord_flip) texcoord.y() = 1.0f - texcoord.y();
 
             osg::Vec3 pos(sin(phi)*sin(theta), sin(phi)*cos(theta), cos(phi));
             pos = pos*projectorMatrix;
-            
+
             double alpha = atan2(pos.x(), pos.y());
             if (alpha<0.0) alpha += 2.0*osg::PI;
-            
+
             double beta = atan2(sqrt(pos.x()*pos.x() + pos.y()*pos.y()), pos.z());
             if (beta<0.0) beta += 2.0*osg::PI;
@@ -1154 +1154 @@
             double gamma = atan2(sqrt(double(pos.x()*pos.x() + pos.y()*pos.y())), double(pos.z()+distance));
             if (gamma<0.0) gamma += 2.0*osg::PI;
-            
-            
+
+
             osg::Vec3 v = screenCenter + osg::Vec3(sin(alpha)*gamma*2.0/osg::PI, -cos(alpha)*gamma*2.0/osg::PI, 0.0f)*screenRadius;
-             
+
             if (flip)
                 vertices->push_back(osg::Vec3(v.x(), top.y()-(v.y()-origin.y()),v.z()));
@@ -1164 +1164 @@
 
             texcoords0->push_back( texcoord );
-        
+
             osg::Vec2 texcoord1(alpha/(2.0*osg::PI), 1.0f - beta/osg::PI);
             if (intensityMap)
@@ -1201 +1201 @@
             int i3 = j+1+(i)*noSteps;
             int i4 = j+1+(i+1)*noSteps;
-            
+
             osg::Vec3& v1 = (*vertices)[i1];
             osg::Vec3& v2 = (*vertices)[i2];
@@ -1211 +1211 @@
             if ((v3-screenCenter).length()>screenRadius) continue;
             if ((v4-screenCenter).length()>screenRadius) continue;
-            
+
             elements->push_back(i1);
             elements->push_back(i2);
             elements->push_back(i3);
-            
+
             elements->push_back(i1);
             elements->push_back(i3);
@@ -1221 +1221 @@
         }
     }
-   
+
     return geometry;
 }
@@ -1230 +1230 @@
 
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi) 
+    if (!wsi)
     {
         osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
@@ -1238 +1238 @@
     osg::GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
-    
+
     // displayNum has not been set so reset it to 0.
     if (si.displayNum<0) si.displayNum = 0;
@@ -1258 +1258 @@
     traits->doubleBuffer = true;
     traits->sharedContext = 0;
-    
+
 
     bool applyIntensityMapAsColours = true;
@@ -1283 +1283 @@
     texture->setWrap(osg::Texture::WRAP_S,osg::Texture::CLAMP_TO_EDGE);
     texture->setWrap(osg::Texture::WRAP_T,osg::Texture::CLAMP_TO_EDGE);
-    
-#if 0    
+
+#if 0
     osg::Camera::RenderTargetImplementation renderTargetImplementation = osg::Camera::SEPERATE_WINDOW;
     GLenum buffer = GL_FRONT;
@@ -1315 +1315 @@
         geode->addDrawable(createParoramicSphericalDisplayDistortionMesh(osg::Vec3(0.0f,0.0f,0.0f), osg::Vec3(width,0.0f,0.0f), osg::Vec3(0.0f,height,0.0f), radius, collar, applyIntensityMapAsColours ? intensityMap : 0, projectorMatrix));
 
-        // new we need to add the texture to the mesh, we do so by creating a 
+        // new we need to add the texture to the mesh, we do so by creating a
         // StateSet to contain the Texture StateAttribute.
         osg::StateSet* stateset = geode->getOrCreateStateSet();
@@ -1342 +1342 @@
         camera->setInheritanceMask(camera->getInheritanceMask() & ~osg::CullSettings::CLEAR_COLOR & ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE);
         //camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-        
+
         camera->setProjectionMatrixAsOrtho2D(0,width,0,height);
         camera->setViewMatrix(osg::Matrix::identity());
@@ -1348 +1348 @@
         // add subgraph to render
         camera->addChild(geode);
-        
+
         camera->setName("DistortionCorrectionCamera");
 
@@ -1360 +1360 @@
 
     osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface();
-    if (!wsi) 
+    if (!wsi)
     {
         osg::notify(osg::NOTICE)<<"Error, no WindowSystemInterface available, cannot create windows."<<std::endl;
@@ -1368 +1368 @@
     osg::GraphicsContext::ScreenIdentifier si;
     si.readDISPLAY();
-    
+
     // displayNum has not been set so reset it to 0.
     if (si.displayNum<0) si.displayNum = 0;
-    
+
     si.screenNum = screenNum;
 
@@ -1388 +1388 @@
     traits->doubleBuffer = true;
     traits->sharedContext = 0;
-    
+
 
     osg::ref_ptr<osg::GraphicsContext> gc = osg::GraphicsContext::createGraphicsContext(traits.get());
@@ -1415 +1415 @@
     textureD->setFilter(osg::Texture2D::MAG_FILTER,osg::Texture2D::LINEAR);
 
-#if 0    
+#if 0
     osg::Camera::RenderTargetImplementation renderTargetImplementation = osg::Camera::SEPERATE_WINDOW;
     GLenum buffer = GL_FRONT;
@@ -1482 +1482 @@
                 for (int x=0; x<=9; ++x){
                     for (int y=7; y>=0; --y){
-                        int i = 2*(7-y)+16*x;            
+                        int i = 2*(7-y)+16*x;
                         cheader[i] = (((1<<(y))&(header[x])) << (7-(y)));
                     }
                 }
-            }            
+            }
             textureHeader->setImage(imageheader.get());
         }
@@ -1531 +1531 @@
             stateset->addUniform(new osg::Uniform("wow_tcolor", 1));
             stateset->addUniform(new osg::Uniform("wow_tdepth", 2));
-            
+
             osg::Shader *frag = new osg::Shader(osg::Shader::FRAGMENT);
             frag->setShaderSource(" "\
@@ -1589 +1589 @@
             camera->setInheritanceMask(camera->getInheritanceMask() & ~osg::CullSettings::CLEAR_COLOR & ~osg::CullSettings::COMPUTE_NEAR_FAR_MODE);
             //camera->setComputeNearFarMode(osg::CullSettings::DO_NOT_COMPUTE_NEAR_FAR);
-            
+
             camera->setProjectionMatrixAsOrtho2D(0,width,0,height);
             camera->setViewMatrix(osg::Matrix::identity());
@@ -1595 +1595 @@
             // add subgraph to render
             camera->addChild(geode);
-            
+
             camera->setName("WoWCamera");
 
@@ -1610 +1610 @@
 
     osg::Node* sceneData = _scene.valid() ? _scene->getSceneData() : 0;
-    
+
     if (_cameraManipulator.valid())
     {
         _cameraManipulator->setNode(sceneData);
-        
+
         osg::ref_ptr<osgGA::GUIEventAdapter> dummyEvent = _eventQueue->createEvent();
 
@@ -1624 +1624 @@
         _camera->removeChildren(0,_camera->getNumChildren());
         if (sceneData) _camera->addChild(sceneData);
-        
+
         Renderer* renderer = dynamic_cast<Renderer*>(_camera->getRenderer());
         if (renderer) renderer->setCompileOnNextDraw(true);
@@ -1637 +1637 @@
             slave._camera->removeChildren(0,slave._camera->getNumChildren());
             if (sceneData) slave._camera->addChild(sceneData);
-        
+
             Renderer* renderer = dynamic_cast<Renderer*>(slave._camera->getRenderer());
             if (renderer) renderer->setCompileOnNextDraw(true);
         }
-    }    
+    }
 }
 
@@ -1671 +1671 @@
 {
     osg::notify(osg::INFO)<<"View::requestWarpPointer("<<x<<","<<y<<")"<<std::endl;
-    
+
     float local_x, local_y;
     const osg::Camera* camera = getCameraContainingPosition(x, y, local_x, local_y);
@@ -1697 +1697 @@
 {
     if (_camera == camera) return true;
-    
+
     for(unsigned i=0; i<getNumSlaves(); ++i)
     {
@@ -1708 +1708 @@
 const osg::Camera* View::getCameraContainingPosition(float x, float y, float& local_x, float& local_y) const
 {
-    const osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState(); 
+    const osgGA::GUIEventAdapter* eventState = getEventQueue()->getCurrentEventState();
     const osgViewer::GraphicsWindow* gw = dynamic_cast<const osgViewer::GraphicsWindow*>(eventState->getGraphicsContext());
 
@@ -1720 +1720 @@
     {
         const osg::Viewport* viewport = _camera->getViewport();
-        
+
         double new_x = x;
         double new_y = y;
@@ -1731 +1731 @@
                        static_cast<double>(_camera->getGraphicsContext()->getTraits()->height) * (y - eventState->getYmin())/(eventState->getYmax()-eventState->getXmin());
         }
-        
-        if (viewport && 
+
+        if (viewport &&
             new_x >= (viewport->x()-epsilon) && new_y >= (viewport->y()-epsilon) &&
             new_x < (viewport->x()+viewport->width()-1.0+epsilon) && new_y <= (viewport->y()+viewport->height()-1.0+epsilon) )
@@ -1746 +1746 @@
 
     osg::Matrix masterCameraVPW = getCamera()->getViewMatrix() * getCamera()->getProjectionMatrix();
-    
+
     // convert to non dimensional
     x = (x - eventState->getXmin()) * 2.0 / (eventState->getXmax()-eventState->getXmin()) - 1.0;
@@ -1752 +1752 @@
 
     if (view_invert_y) y = - y;
-    
+
     for(int i=getNumSlaves()-1; i>=0; --i)
     {
         const Slave& slave = getSlave(i);
-        if (slave._camera.valid() && 
+        if (slave._camera.valid() &&
             slave._camera->getAllowEventFocus() &&
             slave._camera->getRenderTargetImplementation()==osg::Camera::FRAME_BUFFER)
@@ -1776 +1776 @@
             //osg::notify(osg::NOTICE)<<"  new_coord "<<new_coord<<std::endl;;
 
-            if (viewport && 
+            if (viewport &&
                 new_coord.x() >= (viewport->x()-epsilon) && new_coord.y() >= (viewport->y()-epsilon) &&
                 new_coord.x() < (viewport->x()+viewport->width()-1.0+epsilon) && new_coord.y() <= (viewport->y()+viewport->height()-1.0+epsilon) )
             {
                 // osg::notify(osg::NOTICE)<<"  in viewport "<<std::endl;;
-                
+
                 local_x = new_coord.x();
                 local_y = new_coord.y();
@@ -1794 +1794 @@
         }
     }
-    
+
     local_x = x;
     local_y = y;
-    
+
     return 0;
 }
@@ -1805 +1805 @@
     if (!_camera.valid()) return false;
 
-    float local_x, local_y = 0.0;    
+    float local_x, local_y = 0.0;
     const osg::Camera* camera = getCameraContainingPosition(x, y, local_x, local_y);
     if (!camera) camera = _camera.get();
-    
+
 
     osgUtil::LineSegmentIntersector::CoordinateFrame cf = camera->getViewport() ? osgUtil::Intersector::WINDOW : osgUtil::Intersector::PROJECTION;
@@ -1826 +1826 @@
     osgUtil::IntersectionVisitor iv(picker.get());
     iv.setTraversalMask(traversalMask);
-    
-    
+
+
 #if 1
     const_cast<osg::Camera*>(camera)->accept(iv);
-#else    
+#else
 
     // timing test code paths for comparing KdTree based intersections vs conventional intersections
@@ -1838 +1838 @@
 
     const_cast<osg::Camera*>(camera)->accept(iv);
-    
+
 
     osg::Timer_t before = osg::Timer::instance()->tick();
@@ -1856 +1856 @@
     const_cast<osg::Camera*>(camera)->accept(iv);
     osg::Timer_t after = osg::Timer::instance()->tick();
-    
+
     int intersectsAfterConventional = picker->getIntersections().size();
 
@@ -1862 +1862 @@
     double timeKdTree = osg::Timer::instance()->delta_m(after_dummy, after_kdTree_2);
     double timeConventional = osg::Timer::instance()->delta_m(after_kdTree_2, after);
-    
+
     osg::notify(osg::NOTICE)<<"Using Dummy                    "<<timeDummy<<std::endl;
     osg::notify(osg::NOTICE)<<"      KdTrees                  "<<timeKdTree
@@ -1873 +1873 @@
     osg::notify(osg::NOTICE)<<"      Delta sans Traversal     "<<(timeConventional-timeDummy)/(timeKdTree-timeDummy)<<std::endl;
     osg::notify(osg::NOTICE)<<std::endl;
-#endif    
+#endif
 
     if (picker->containsIntersections())
@@ -1890 +1890 @@
 {
     if (!_camera.valid() || nodePath.empty()) return false;
-    
-    float local_x, local_y = 0.0;    
+
+    float local_x, local_y = 0.0;
     const osg::Camera* camera = getCameraContainingPosition(x, y, local_x, local_y);
     if (!camera) camera = _camera.get();
-    
+
     osg::Matrixd matrix;
     if (nodePath.size()>1)
@@ -1901 +1901 @@
         matrix = osg::computeLocalToWorld(prunedNodePath);
     }
-    
+
     matrix.postMult(camera->getViewMatrix());
     matrix.postMult(camera->getProjectionMatrix());
@@ -1919 +1919 @@
     osg::Vec3d startVertex = osg::Vec3d(local_x,local_y,zNear) * inverse;
     osg::Vec3d endVertex = osg::Vec3d(local_x,local_y,zFar) * inverse;
-    
+
     osg::ref_ptr< osgUtil::LineSegmentIntersector > picker = new osgUtil::LineSegmentIntersector(osgUtil::Intersector::MODEL, startVertex, endVertex);
-    
+
     osgUtil::IntersectionVisitor iv(picker.get());
     iv.setTraversalMask(traversalMask);
@@ -1938 +1938 @@
 }
 
+