Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/RenderStage.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/RenderStage.cpp (modified) (55 diffs)

OpenSceneGraph/trunk/src/osgUtil/RenderStage.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.
 */
@@ -55 +55 @@
     _cameraRequiresSetUp = false;
     _camera = 0;
-    
+
     _level = 0;
     _face = 0;
-    
+
     _imageReadPixelFormat = GL_RGBA;
     _imageReadPixelDataType = GL_UNSIGNED_BYTE;
@@ -85 +85 @@
     _cameraRequiresSetUp = false;
     _camera = 0;
-    
+
     _level = 0;
     _face = 0;
-    
+
     _imageReadPixelFormat = GL_RGBA;
     _imageReadPixelDataType = GL_UNSIGNED_BYTE;
@@ -129 +129 @@
 {
     _stageDrawnThisFrame = false;
-    
+
     if (_renderStageLighting.valid()) _renderStageLighting->reset();
 
@@ -210 +210 @@
 {
     if (_preRenderList.empty()) return;
-    
+
     //cout << "Drawing prerendering stages "<<this<< "  "<<_viewport->x()<<","<< _viewport->y()<<","<< _viewport->width()<<","<< _viewport->height()<<std::endl;
     for(RenderStageList::iterator itr=_preRenderList.begin();
@@ -227 +227 @@
 
     if (!_camera) return;
-    
+
     osg::State& state = *renderInfo.getState();
 
@@ -250 +250 @@
         depth = osg::maximum(depth,itr->second.depth());
     }
-    
+
     // OSG_NOTICE<<"RenderStage::runCameraSetUp viewport "<<_viewport->x()<<" "<<_viewport->y()<<" "<<_viewport->width()<<" "<<_viewport->height()<<std::endl;
     // OSG_NOTICE<<"RenderStage::runCameraSetUp computed "<<width<<" "<<height<<" "<<depth<<std::endl;
@@ -280 +280 @@
             _bufferAttachmentMap[itr->first]._image = image;
         }
-        
+
         if (itr->second._texture.valid())
         {
@@ -336 +336 @@
         }
     }
-    
+
     if (renderTargetImplementation==osg::Camera::FRAME_BUFFER_OBJECT)
     {
         osg::FBOExtensions* fbo_ext = osg::FBOExtensions::instance(state.getContextID(),true);
         bool fbo_supported = fbo_ext && fbo_ext->isSupported();
-        
+
         if (fbo_supported)
         {
@@ -350 +350 @@
             osg::ref_ptr<osg::FrameBufferObject> fbo = new osg::FrameBufferObject;
             osg::ref_ptr<osg::FrameBufferObject> fbo_multisample;
-            
+
             bool colorAttached = false;
             bool depthAttached = false;
@@ -398 +398 @@
                 osg::Camera::BufferComponent buffer = itr->first;
                 osg::Camera::Attachment& attachment = itr->second;
-                
+
                 if (attachment._texture.valid() || attachment._image.valid())
                     fbo->setAttachment(buffer, osg::FrameBufferAttachment(attachment));
@@ -436 +436 @@
                         samples, colorSamples)));
                 }
-                
+
                 if (buffer==osg::Camera::DEPTH_BUFFER) depthAttached = true;
                 else if (buffer==osg::Camera::STENCIL_BUFFER) stencilAttached = true;
@@ -445 +445 @@
                 }
                 else if (buffer>=osg::Camera::COLOR_BUFFER) colorAttached = true;
-                
+
             }
 
             if (!depthAttached)
             {
-                // If doing MSFBO (and therefore need two FBOs, one for multisampled rendering and one for 
-                // final resolve), then configure "fbo" as the resolve FBO, and When done 
-                // configuring, swap it into "_resolveFbo" (see line 554). But, if not 
+                // If doing MSFBO (and therefore need two FBOs, one for multisampled rendering and one for
+                // final resolve), then configure "fbo" as the resolve FBO, and When done
+                // configuring, swap it into "_resolveFbo" (see line 554). But, if not
                 // using MSFBO, then "fbo" is just the render fbo.
-                // If using MSFBO, then resolveBuffersMask 
-                // is the value set by the app for the resolve buffers. But if not using 
-                // MSFBO, then resolveBuffersMask is the value set by the app for render 
+                // If using MSFBO, then resolveBuffersMask
+                // is the value set by the app for the resolve buffers. But if not using
+                // MSFBO, then resolveBuffersMask is the value set by the app for render
                 // buffers. In both cases, resolveBuffersMask is used to configure "fbo".
                 if( resolveBuffersMask & osg::Camera::IMPLICIT_DEPTH_BUFFER_ATTACHMENT )
@@ -505 +505 @@
             fbo->apply(state);
 
-            // If no color attachment make sure to set glDrawBuffer/glReadBuffer to none 
+            // If no color attachment make sure to set glDrawBuffer/glReadBuffer to none
             // otherwise glCheckFramebufferStatus will fail
-            // It has to be done after call to glBindFramebuffer (fbo->apply) 
+            // It has to be done after call to glBindFramebuffer (fbo->apply)
             // and before call to glCheckFramebufferStatus
             if ( !colorAttached )
@@ -529 +529 @@
                 fbo_ext->glBindFramebuffer(GL_FRAMEBUFFER_EXT, fboId);
                 fbo = 0;
-                
+
                 // clean up.
                 double availableTime = 100.0f;
@@ -535 +535 @@
                 osg::RenderBuffer::flushDeletedRenderBuffers(state.getContextID(),currentTime,availableTime);
                 osg::FrameBufferObject::flushDeletedFrameBufferObjects(state.getContextID(),currentTime,availableTime);
-               
+
 
             }
@@ -542 +542 @@
                 setDrawBuffer(GL_NONE, false );
                 setReadBuffer(GL_NONE, false );
-       
+
                 _fbo = fbo;
 
@@ -579 +579 @@
             }
         }
-        
+
         if (!fbo_supported)
         {
@@ -588 +588 @@
         }
     }
-    
+
     // check whether PBuffer-RTT is supported or not
-    if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT && 
+    if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT &&
         !osg::isGLExtensionSupported(state.getContextID(), "WGL_ARB_render_texture"))
-    {    
+    {
         if (renderTargetImplementation<renderTargetFallback)
             renderTargetImplementation = renderTargetFallback;
@@ -600 +600 @@
 
     // if any of the renderTargetImplementations require a separate graphics context such as with pbuffer try in turn to
-    // set up, but if each level fails then resort to the next level down.    
+    // set up, but if each level fails then resort to the next level down.
     while (!getGraphicsContext() &&
            (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT ||
@@ -624 +624 @@
             osg::Texture* pBufferTexture = 0;
             GLenum bufferFormat = GL_NONE;
-            unsigned int level = 0; 
-            unsigned int face = 0; 
+            unsigned int level = 0;
+            unsigned int face = 0;
 
             bool colorAttached = false;
@@ -710 +710 @@
 
             if (!depthAttached)
-            {                
+            {
                 traits->depth = 24;
             }
 
             if (!colorAttached)
-            {                
+            {
                 if (bufferFormat == GL_NONE) bufferFormat = GL_RGB;
 
@@ -728 +728 @@
             {
                 traits->sharedContext = state.getGraphicsContext();
-                
+
                 const osg::GraphicsContext::Traits* sharedTraits = traits->sharedContext->getTraits();
                 if (sharedTraits)
@@ -746 +746 @@
 
                 // successfully set up graphics context as requested,
-                // will assign this graphics context to the RenderStage and 
+                // will assign this graphics context to the RenderStage and
                 // associated parameters.  Setting the graphics context will
                 // single this while loop to exit successful.
                 setGraphicsContext(context.get());
-                
+
                 // how to do we detect that an attempt to set up RTT has failed??
 
@@ -770 +770 @@
             {
                 OSG_INFO<<"Failed to acquire Graphics Context"<<std::endl;
-                
+
                 if (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT)
                 {
@@ -779 +779 @@
                         renderTargetImplementation = osg::Camera::PIXEL_BUFFER;
                 }
-                else 
+                else
                 {
                     renderTargetImplementation = osg::Camera::FRAME_BUFFER;
@@ -787 +787 @@
         }
     }
-    
+
     // finally if all else has failed, then the frame buffer fallback will come in to play.
     if (renderTargetImplementation==osg::Camera::FRAME_BUFFER)
@@ -797 +797 @@
             ++itr)
         {
-            // assign the texture... 
+            // assign the texture...
             if (itr->second._texture.valid()) setTexture(itr->second._texture.get(), itr->second._level, itr->second._face);
         }
@@ -857 +857 @@
     {
         // need to implement
-        texture3D->copyTexSubImage3D(state, 
+        texture3D->copyTexSubImage3D(state,
                                      static_cast<int>(_viewport->x()),
                                      static_cast<int>(_viewport->y()),
@@ -869 +869 @@
     {
         // need to implement
-        textureCubeMap->copyTexSubImageCubeMap(state, _face, 
+        textureCubeMap->copyTexSubImageCubeMap(state, _face,
                                      static_cast<int>(_viewport->x()),
                                      static_cast<int>(_viewport->y()),
@@ -908 +908 @@
 
     bool using_multiple_render_targets = fbo_supported && _fbo->hasMultipleRenderingTargets();
-    
+
     if (!using_multiple_render_targets)
     {
         #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
-        
-            if( getDrawBufferApplyMask() ) 
+
+            if( getDrawBufferApplyMask() )
                 glDrawBuffer(_drawBuffer);
 
-            if( getReadBufferApplyMask() ) 
+            if( getReadBufferApplyMask() )
                 glReadBuffer(_readBuffer);
-        
+
         #endif
     }
@@ -927 +927 @@
     }
 
-    // do the drawing itself.    
+    // do the drawing itself.
     RenderBin::draw(renderInfo,previous);
 
@@ -953 +953 @@
         GLbitfield blitMask = 0;
         bool needToBlitColorBuffers = false;
-        
+
         //find which buffer types should be copied
         for (FrameBufferObject::AttachmentMap::const_iterator
@@ -1020 +1020 @@
         }
 #endif
-        
+
         apply_read_fbo = true;
         read_fbo = _resolveFbo.get();
@@ -1044 +1044 @@
 
             #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE)
-            
+
                 if (using_multiple_render_targets)
                 {
@@ -1069 +1069 @@
             GLenum dataType = itr->second._image->getDataType();
             if (dataType==0) dataType = _imageReadPixelDataType;
-            if (dataType==0) dataType = GL_UNSIGNED_BYTE;       
+            if (dataType==0) dataType = GL_UNSIGNED_BYTE;
 
             itr->second._image->readPixels(static_cast<int>(_viewport->x()),
                                            static_cast<int>(_viewport->y()),
                                            static_cast<int>(_viewport->width()),
-                                           static_cast<int>(_viewport->height()), 
+                                           static_cast<int>(_viewport->height()),
                                            pixelFormat, dataType);
         }
@@ -1099 +1099 @@
             ++itr)
         {
-            if (itr->second._texture.valid() && itr->second._mipMapGeneration) 
+            if (itr->second._texture.valid() && itr->second._mipMapGeneration)
             {
                 state.setActiveTextureUnit(0);
@@ -1111 +1111 @@
 struct DrawInnerOperation : public osg::Operation
 {
-    DrawInnerOperation(RenderStage* stage, osg::RenderInfo& renderInfo) : 
+    DrawInnerOperation(RenderStage* stage, osg::RenderInfo& renderInfo) :
         osg::Operation("DrawInnerStage",false),
         _stage(stage),
@@ -1130 +1130 @@
         }
     }
-    
+
     RenderStage* _stage;
     RenderInfo _renderInfo;
@@ -1142 +1142 @@
     if(_initialViewMatrix.valid()) renderInfo.getState()->setInitialViewMatrix(_initialViewMatrix.get());
 
-    // push the stages camera so that drawing code can query it     
+    // push the stages camera so that drawing code can query it
     if (_camera) renderInfo.pushCamera(_camera);
 
@@ -1156 +1156 @@
     // so there is no need to call it here.
     drawPreRenderStages(renderInfo,previous);
-    
+
     if (_cameraRequiresSetUp)
     {
@@ -1169 +1169 @@
     osg::OperationThread* useThread = 0;
     osg::RenderInfo useRenderInfo(renderInfo);
-    
+
     RenderLeaf* saved_previous = previous;
 
@@ -1177 +1177 @@
         // now as an experiment.
         callingContext->releaseContext();
-    
+
         // OSG_NOTICE<<"  enclosing state before - "<<state.getStateSetStackSize()<<std::endl;
 
@@ -1184 +1184 @@
         useThread = useContext->getGraphicsThread();
         useRenderInfo.setState(useState);
-        
+
         // synchronize the frame stamps
         useState->setFrameStamp(const_cast<osg::FrameStamp*>(state.getFrameStamp()));
@@ -1191 +1191 @@
         useState->setDynamicObjectCount(state.getDynamicObjectCount());
         useState->setDynamicObjectRenderingCompletedCallback(state.getDynamicObjectRenderingCompletedCallback());
-        
-        if (!useThread) 
+
+        if (!useThread)
         {
             previous = 0;
             useContext->makeCurrent();
-            
+
             // OSG_NOTICE<<"  nested state before - "<<useState->getStateSetStackSize()<<std::endl;
         }
@@ -1208 +1208 @@
         (*(_camera->getPreDrawCallback()))(renderInfo);
     }
-    
-    bool doCopyTexture = _texture.valid() ? 
+
+    bool doCopyTexture = _texture.valid() ?
                         (callingContext != useContext) :
                         false;
@@ -1217 +1217 @@
 #if 1
         ref_ptr<osg::BlockAndFlushOperation> block = new osg::BlockAndFlushOperation;
-    
+
         useThread->add(new DrawInnerOperation( this, renderInfo ));
-        
+
         useThread->add(block.get());
-        
+
         // wait till the DrawInnerOperations is complete.
         block->block();
-        
+
         doCopyTexture = false;
-        
+
 #else
         useThread->add(new DrawInnerOperation( this, renderInfo ), true);
-        
+
         doCopyTexture = false;
-#endif        
+#endif
     }
     else
     {
         drawInner( useRenderInfo, previous, doCopyTexture);
-        
+
         if (useRenderInfo.getUserData() != renderInfo.getUserData())
         {
             renderInfo.setUserData(useRenderInfo.getUserData());
         }
-        
+
     }
 
@@ -1281 +1281 @@
             // to ensure that textures are updated before main thread commenses.
             glFlush();
-            
-        
+
+
             useContext->releaseContext();
         }
@@ -1290 +1290 @@
     {
         // restore the graphics context.
-        
+
         previous = saved_previous;
-        
+
         // OSG_NOTICE<<"  nested state after - "<<useState->getStateSetStackSize()<<std::endl;
         // OSG_NOTICE<<"  enclosing state after - "<<state.getStateSetStackSize()<<std::endl;
@@ -1350 +1350 @@
             glClearDepthf( _clearDepth);
         #endif
-        
+
         glDepthMask ( GL_TRUE );
         state.haveAppliedAttribute( osg::StateAttribute::DEPTH );
@@ -1368 +1368 @@
         }
     #endif
-    
+
 
     glClear( _clearMask );
-    
+
     #ifdef USE_SCISSOR_TEST
         glDisable( GL_SCISSOR_TEST );
@@ -1379 +1379 @@
         glMatrixMode( GL_MODELVIEW );
         glLoadIdentity();
-    #endif    
+    #endif
 
     // apply the positional state.
@@ -1403 +1403 @@
 {
     if (_postRenderList.empty()) return;
-    
+
     //cout << "Drawing prerendering stages "<<this<< "  "<<_viewport->x()<<","<< _viewport->y()<<","<< _viewport->width()<<","<< _viewport->height()<<std::endl;
     for(RenderStageList::iterator itr=_postRenderList.begin();
@@ -1438 +1438 @@
         }
     }
-        
+
     if (RenderBin::getStats(stats))
     {
@@ -1470 +1470 @@
         count += post_itr->second->computeNumberOfDynamicRenderLeaves();
     }
-    
+
     return count;
 }