Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/SceneView.cpp (modified) (61 diffs)

OpenSceneGraph/trunk/src/osgUtil/SceneView.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.
 */
@@ -94 +94 @@
 
 // 32 x 32 bit array every row is a horizontal line of pixels
-//  and the (bitwise) columns a vertical line 
+//  and the (bitwise) columns a vertical line
 //  The following is a checkerboard pattern
 static const GLubyte patternCheckerboard[] = {
@@ -138 +138 @@
 
     _lightingMode=NO_SCENEVIEW_LIGHT;
-    
+
     _prioritizeTextures = false;
-    
+
     setCamera(new Camera);
     _camera->setViewport(new Viewport);
     _camera->setClearColor(osg::Vec4(0.2f, 0.2f, 0.4f, 1.0f));
-    
+
     _initCalled = false;
 
@@ -151 +151 @@
     _automaticFlush = true;
     _requiresFlush = false;
-    
+
     _activeUniforms = DEFAULT_UNIFORMS;
-    
+
     _previousFrameTime = 0;
     _previousSimulationTime = 0;
-    
+
     _redrawInterlacedStereoStencilMask = true;
     _interlacedStereoStencilWidth = 0;
@@ -174 +174 @@
 
     _lightingMode = rhs._lightingMode;
-    
+
     _prioritizeTextures = rhs._prioritizeTextures;
-    
+
     _camera = rhs._camera;
     _cameraWithOwnership = rhs._cameraWithOwnership;
-    
+
     _initCalled = false;
 
     _automaticFlush = rhs._automaticFlush;
     _requiresFlush = false;
-    
+
     _activeUniforms = rhs._activeUniforms;
-    
+
     _previousFrameTime = 0;
     _previousSimulationTime = 0;
-    
+
     _redrawInterlacedStereoStencilMask = rhs._redrawInterlacedStereoStencilMask;
     _interlacedStereoStencilWidth = rhs._interlacedStereoStencilWidth;
@@ -228 +228 @@
             _globalStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
         #endif
-        
+
         #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && defined(OSG_GL_FIXED_FUNCTION_AVAILABLE)
             osg::LightModel* lightmodel = new osg::LightModel;
@@ -239 +239 @@
         _lightingMode = NO_SCENEVIEW_LIGHT;
     }
- 
+
     _renderInfo.setState(new State);
-    
+
     _stateGraph = new StateGraph;
     _renderStage = new RenderStage;
@@ -249 +249 @@
     {
         GLObjectsVisitor::Mode  dlvMode = GLObjectsVisitor::COMPILE_DISPLAY_LISTS |
-                                          GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES | 
+                                          GLObjectsVisitor::COMPILE_STATE_ATTRIBUTES |
                                           GLObjectsVisitor::CHECK_BLACK_LISTED_MODES;
 
@@ -256 +256 @@
     #endif
 
-        // sgi's IR graphics has a problem with lighting and display lists, as it seems to store 
+        // sgi's IR graphics has a problem with lighting and display lists, as it seems to store
         // lighting state with the display list, and the display list visitor doesn't currently apply
         // state before creating display lists. So will disable the init visitor default, this won't
@@ -265 +265 @@
 
     }
-    
+
     _updateVisitor = new UpdateVisitor;
 
@@ -281 +281 @@
          _globalStateSet->setTextureAttributeAndModes(0,texenv, osg::StateAttribute::ON);
     #endif
-         
+
     _camera->setClearColor(osg::Vec4(0.2f, 0.2f, 0.4f, 1.0f));
 }
@@ -295 +295 @@
         OSG_NOTICE<<"Warning: attempt to assign a NULL camera to SceneView not permitted."<<std::endl;
     }
-    
+
     if (assumeOwnershipOfCamera)
     {
@@ -309 +309 @@
 {
     // take a temporary reference to node to prevent the possibility
-    // of it getting deleted when when we do the camera clear of children. 
+    // of it getting deleted when when we do the camera clear of children.
     osg::ref_ptr<osg::Node> temporaryRefernce = node;
-    
+
     // remove pre existing children
     _camera->removeChildren(0, _camera->getNumChildren());
-    
+
     // add the new one in.
     _camera->addChild(node);
@@ -331 +331 @@
         _initVisitor->reset();
         _initVisitor->setFrameStamp(_frameStamp.get());
-        
+
         GLObjectsVisitor* dlv = dynamic_cast<GLObjectsVisitor*>(_initVisitor.get());
         if (dlv) dlv->setState(_renderInfo.getState());
-        
+
         if (_frameStamp.valid())
         {
              _initVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
         }
-        
+
         _camera->accept(*_initVisitor.get());
-        
-    } 
+
+    }
 }
 
@@ -348 +348 @@
 {
     if (_camera.valid() && _updateVisitor.valid())
-    { 
+    {
         _updateVisitor->reset();
 
@@ -358 +358 @@
              _updateVisitor->setTraversalNumber(_frameStamp->getFrameNumber());
         }
-        
+
         _camera->accept(*_updateVisitor.get());
-        
+
         // now force a recompute of the bounding volume while we are still in
         // the read/write app phase, this should prevent the need to recompute
@@ -377 +377 @@
 
     if (!_localStateSet) return;
-    
+
     if ((_activeUniforms & FRAME_NUMBER_UNIFORM) && _frameStamp.valid())
     {
         osg::Uniform* uniform = _localStateSet->getOrCreateUniform("osg_FrameNumber",osg::Uniform::UNSIGNED_INT);
-        uniform->set(_frameStamp->getFrameNumber());        
-    }
-    
+        uniform->set(_frameStamp->getFrameNumber());
+    }
+
     if ((_activeUniforms & FRAME_TIME_UNIFORM) && _frameStamp.valid())
     {
@@ -389 +389 @@
         uniform->set(static_cast<float>(_frameStamp->getReferenceTime()));
     }
-    
+
     if ((_activeUniforms & DELTA_FRAME_TIME_UNIFORM) && _frameStamp.valid())
     {
         float delta_frame_time = (_previousFrameTime != 0.0) ? static_cast<float>(_frameStamp->getReferenceTime()-_previousFrameTime) : 0.0f;
         _previousFrameTime = _frameStamp->getReferenceTime();
-        
+
         osg::Uniform* uniform = _localStateSet->getOrCreateUniform("osg_DeltaFrameTime",osg::Uniform::FLOAT);
         uniform->set(delta_frame_time);
     }
-    
+
     if ((_activeUniforms & SIMULATION_TIME_UNIFORM) && _frameStamp.valid())
     {
@@ -404 +404 @@
         uniform->set(static_cast<float>(_frameStamp->getSimulationTime()));
     }
-    
+
     if ((_activeUniforms & DELTA_SIMULATION_TIME_UNIFORM) && _frameStamp.valid())
     {
         float delta_simulation_time = (_previousSimulationTime != 0.0) ? static_cast<float>(_frameStamp->getSimulationTime()-_previousSimulationTime) : 0.0f;
         _previousSimulationTime = _frameStamp->getSimulationTime();
-        
+
         osg::Uniform* uniform = _localStateSet->getOrCreateUniform("osg_DeltaSimulationTime",osg::Uniform::FLOAT);
         uniform->set(delta_simulation_time);
     }
-    
+
     if (_activeUniforms & VIEW_MATRIX_UNIFORM)
     {
@@ -662 +662 @@
 {
     if (mode==_lightingMode) return;
-    
+
     if (_lightingMode!=NO_SCENEVIEW_LIGHT)
     {
@@ -682 +682 @@
             // add GL_LIGHTING mode
             _globalStateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);
-            if (_light.valid()) 
+            if (_light.valid())
             {
                 _globalStateSet->setAssociatedModes(_light.get(), osg::StateAttribute::ON);
@@ -692 +692 @@
 void SceneView::inheritCullSettings(const osg::CullSettings& settings, unsigned int inheritanceMask)
 {
-    if (_camera.valid() && _camera->getView()) 
+    if (_camera.valid() && _camera->getView())
     {
         if (inheritanceMask & osg::CullSettings::LIGHTING_MODE)
         {
             LightingMode newLightingMode = _lightingMode;
-        
+
             switch(_camera->getView()->getLightingMode())
             {
@@ -704 +704 @@
                 case(osg::View::SKY_LIGHT): newLightingMode = SKY_LIGHT; break;
             }
-            
+
             if (newLightingMode != _lightingMode)
             {
@@ -710 +710 @@
             }
         }
-                
+
         if (inheritanceMask & osg::CullSettings::LIGHT)
         {
@@ -716 +716 @@
         }
     }
-    
+
     osg::CullSettings::inheritCullSettings(settings, inheritanceMask);
 }
@@ -740 +740 @@
         _renderInfo.setState(new osg::State);
     }
-    
+
     osg::State* state = _renderInfo.getState();
 
@@ -747 +747 @@
         _localStateSet = new osg::StateSet;
     }
-    
+
     // we in theory should be able to be able to bypass reset, but we'll call it just incase.
     //_state->reset();
-   
+
     state->setFrameStamp(_frameStamp.get());
     state->setDisplaySettings(_displaySettings.get());
@@ -771 +771 @@
     }
 
-    if (_displaySettings.valid() && _displaySettings->getStereo()) 
+    if (_displaySettings.valid() && _displaySettings->getStereo())
     {
 
@@ -814 +814 @@
             if (!_stateGraphRight.valid()) _stateGraphRight = dynamic_cast<StateGraph*>(_stateGraph->cloneType());
             if (!_renderStageRight.valid()) _renderStageRight = dynamic_cast<RenderStage*>(_renderStage->clone(osg::CopyOp::DEEP_COPY_ALL));
-            
+
             _cullVisitorLeft->setDatabaseRequestHandler(_cullVisitor->getDatabaseRequestHandler());
             _cullVisitorLeft->setClampProjectionMatrixCallback(_cullVisitor->getClampProjectionMatrixCallback());
@@ -828 +828 @@
             computeRightEyeViewport(getViewport());
             computeNearFar = cullStage(computeRightEyeProjection(getProjectionMatrix()),computeRightEyeView(getViewMatrix()),_cullVisitorRight.get(),_stateGraphRight.get(),_renderStageRight.get(),_viewportRight.get());
-           
+
             if (computeNearFar)
             {
@@ -852 +852 @@
         }
     }
-    
+
 
 
@@ -869 +869 @@
     {
         //std::cout << "Scene graph contains occluder nodes, searching for them"<<std::endl;
-        
-        
+
+
         if (!_collectOccludersVisitor) _collectOccludersVisitor = new osg::CollectOccludersVisitor;
-        
+
         _collectOccludersVisitor->inheritCullSettings(*this);
-        
+
         _collectOccludersVisitor->reset();
-        
+
         _collectOccludersVisitor->setFrameStamp(_frameStamp.get());
 
@@ -895 +895 @@
         _collectOccludersVisitor->popProjectionMatrix();
         _collectOccludersVisitor->popViewport();
-        
+
         // sort the occluder from largest occluder volume to smallest.
         _collectOccludersVisitor->removeOccludedOccluders();
-        
-        
+
+
         OSG_DEBUG << "finished searching for occluder - found "<<_collectOccludersVisitor->getCollectedOccluderSet().size()<<std::endl;
-           
+
         cullVisitor->getOccluderList().clear();
         std::copy(_collectOccludersVisitor->getCollectedOccluderSet().begin(),_collectOccludersVisitor->getCollectedOccluderSet().end(), std::back_insert_iterator<CullStack::OccluderList>(cullVisitor->getOccluderList()));
     }
-    
+
 
 
@@ -942 +942 @@
     renderStage->setClearStencil(_camera->getClearStencil());
     renderStage->setClearMask(_camera->getClearMask());
-    
-#if 1    
+
+#if 1
     renderStage->setCamera(_camera.get());
 #endif
@@ -960 +960 @@
         default:
             break;
-        }            
+        }
     #endif
-    
+
     if (_globalStateSet.valid()) cullVisitor->pushStateSet(_globalStateSet.get());
     if (_secondaryStateSet.valid()) cullVisitor->pushStateSet(_secondaryStateSet.get());
@@ -972 +972 @@
     cullVisitor->pushModelViewMatrix(mv.get(),osg::Transform::ABSOLUTE_RF);
 
-    // traverse the scene graph to generate the rendergraph.    
-    // If the camera has a cullCallback execute the callback which has the  
+    // traverse the scene graph to generate the rendergraph.
+    // If the camera has a cullCallback execute the callback which has the
     // requirement that it must traverse the camera's children.
     {
@@ -989 +989 @@
     if (_secondaryStateSet.valid()) cullVisitor->popStateSet();
     if (_globalStateSet.valid()) cullVisitor->popStateSet();
-    
+
 
     renderStage->sort();
@@ -999 +999 @@
     // allocation and deleteing of the StateGraph nodes.
     rendergraph->prune();
-    
-    // set the number of dynamic objects in the scene.    
+
+    // set the number of dynamic objects in the scene.
     _dynamicObjectCount += renderStage->computeNumberOfDynamicRenderLeaves();
 
@@ -1011 +1011 @@
 {
     if (!_camera) return;
-   
+
     _camera->releaseGLObjects(_renderInfo.getState());
-    
+
     // we need to reset State as it keeps handles to Program objects.
     if (_renderInfo.getState()) _renderInfo.getState()->reset();
@@ -1022 +1022 @@
 {
     _requiresFlush = false;
-    
+
     osg::flushAllDeletedGLObjects(getState()->getContextID());
  }
@@ -1029 +1029 @@
 {
     // OSG_NOTICE<<"SceneView::flushDeletedGLObjects(availableTime="<<availableTime<<")"<<std::endl;
-    
+
     osg::State* state = _renderInfo.getState();
 
@@ -1058 +1058 @@
     // context for when the object were originally created.  Here we know what
     // context we are in so can flush the appropriate caches.
-    
+
     if (_requiresFlush)
     {
@@ -1069 +1069 @@
 
     RenderLeaf* previous = NULL;
-    if (_displaySettings.valid() && _displaySettings->getStereo()) 
-    {
-    
+    if (_displaySettings.valid() && _displaySettings->getStereo())
+    {
+
         switch(_displaySettings->getStereoMode())
         {
@@ -1131 +1131 @@
                 _renderStageLeft->setColorMask(cmask);
                 _renderStageRight->setColorMask(cmask);
-                
+
                 _localStateSet->setAttribute(getViewport());
 
-                
+
                 _renderStageLeft->drawPreRenderStages(_renderInfo,previous);
                 _renderStageRight->drawPreRenderStages(_renderInfo,previous);
@@ -1146 +1146 @@
                     _renderStageLeft->setColorMask(leftColorMask);
                 }
-                
+
                 // red
                 leftColorMask->setMask(true,false,false,true);
@@ -1157 +1157 @@
                 // draw left eye.
                 _renderStageLeft->draw(_renderInfo,previous);
-                
-                
+
+
 
                 // ensure that right eye color planes are active.
@@ -1170 +1170 @@
                 // cyan
                 rightColorMask->setMask(false,true,true,true);
-                
+
                 // blue
                 // rightColorMask->setMask(false,false,true,true);
@@ -1221 +1221 @@
                           static_cast<int>(getViewport()->height()),_renderStageLeft->getClearColor());
 
-             
+
                 _localStateSet->setAttribute(_viewportLeft.get());
                 _renderStageLeft->draw(_renderInfo,previous);
@@ -1349 +1349 @@
                     glOrtho(0.0, 1.0, 0.0, 1.0, -1.0, 1.0);
                     glMatrixMode(GL_MODELVIEW);
-                    glLoadIdentity();    
-                    
+                    glLoadIdentity();
+
                     getViewport()->apply(*state);
                     getState()->applyMode(GL_LIGHTING,false);
@@ -1375 +1375 @@
                     getState()->applyMode(GL_POLYGON_STIPPLE,true);
                     glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-                    glRecti(0, 0, 1, 1);   
+                    glRecti(0, 0, 1, 1);
                     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
                     getState()->applyMode(GL_POLYGON_STIPPLE,false);
                     getState()->applyMode(GL_LIGHTING,true);
                     getState()->applyMode(GL_DEPTH_TEST,true);
-                    
+
                     _redrawInterlacedStereoStencilMask = false;
                     _interlacedStereoStencilWidth = static_cast<int>(getViewport()->width());
@@ -1390 +1390 @@
 
                 glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
-                glStencilFunc(GL_EQUAL, 0, ~0u);    
+                glStencilFunc(GL_EQUAL, 0, ~0u);
                 _renderStageLeft->draw(_renderInfo,previous);
-                
+
                 glStencilFunc(GL_NOTEQUAL, 0, ~0u);
                 _renderStageRight->draw(_renderInfo,previous);
@@ -1443 +1443 @@
         _renderStage->draw(_renderInfo,previous);
     }
-    
+
     // re apply the defalt OGL state.
     state->popAllStateSets();
@@ -1483 +1483 @@
     osg::Matrix inverseMVPW;
     inverseMVPW.invert(computeMVPW());
-    
+
     object = window*inverseMVPW;
-    
+
     return true;
 }
@@ -1499 +1499 @@
     osg::Matrix inverseMVPW;
     inverseMVPW.invert(computeMVPW());
-    
+
     near_point = osg::Vec3(x,y,0.0f)*inverseMVPW;
     far_point = osg::Vec3(x,y,1.0f)*inverseMVPW;
-        
+
     return true;
 }
@@ -1520 +1520 @@
 {
     osg::Matrix matrix( getViewMatrix() * getProjectionMatrix());
-        
+
     if (getViewport())
         matrix.postMult(getViewport()->computeWindowMatrix());
@@ -1535 +1535 @@
 
     _renderInfo.getState()->applyAttribute(viewport.get());
-    
+
     glScissor( x, y, width, height );
     glEnable( GL_SCISSOR_TEST );
@@ -1551 +1551 @@
                                            bottom, top,
                                            zNear, zFar));
-}                                           
+}
 
 void SceneView::setProjectionMatrixAsOrtho2D(double left, double right,
@@ -1574 +1574 @@
     setProjectionMatrix(osg::Matrixd::perspective(fovy,aspectRatio,
                                                  zNear, zFar));
-}                                      
+}
 
 bool SceneView::getProjectionMatrixAsOrtho(double& left, double& right,
@@ -1592 +1592 @@
                                          bottom, top,
                                          zNear, zFar);
-}                                  
+}
 
 bool SceneView::getProjectionMatrixAsPerspective(double& fovy,double& aspectRatio,
@@ -1598 +1598 @@
 {
     return getProjectionMatrix().getPerspective(fovy, aspectRatio, zNear, zFar);
-}                                                 
+}
 
 void SceneView::setViewMatrixAsLookAt(const Vec3& eye,const Vec3& center,const Vec3& up)
@@ -1612 +1612 @@
 bool SceneView::getStats(Statistics& stats)
 {
-    if (_displaySettings.valid() && _displaySettings->getStereo()) 
+    if (_displaySettings.valid() && _displaySettings->getStereo())
     {
         switch(_displaySettings->getStereoMode())