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

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgUtil/GLObjectsVisitor.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgUtil/GLObjectsVisitor.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.
 */
@@ -17 +17 @@
 #include <osg/Timer>
 
-namespace osgUtil 
+namespace osgUtil
 {
 
@@ -67 +67 @@
 {
     if (_drawablesAppliedSet.count(&drawable)!=0) return;
-    
+
     _drawablesAppliedSet.insert(&drawable);
 
@@ -105 +105 @@
 {
     if (_stateSetAppliedSet.count(&stateset)!=0) return;
-    
+
     _stateSetAppliedSet.insert(&stateset);
 
@@ -111 +111 @@
     {
         stateset.compileGLObjects(*_renderInfo.getState());
-        
+
         osg::Program* program = dynamic_cast<osg::Program*>(stateset.getAttribute(osg::StateAttribute::PROGRAM));
         if (program) {
             if( program->isFixedFunction() )
                 _lastCompiledProgram = NULL; // It does not make sense to apply uniforms on fixed pipe
-            else 
+            else
                 _lastCompiledProgram = program;
         }
@@ -126 +126 @@
             {
                 pcp->useProgram();
-                
+
                 _renderInfo.getState()->setLastAppliedProgramObject(pcp);
-            
+
                 osg::StateSet::UniformList& ul = stateset.getUniformList();
                 for(osg::StateSet::UniformList::iterator itr = ul.begin();
@@ -139 +139 @@
         }
         else if(_renderInfo.getState()->getLastAppliedProgramObject()){
-                            
+
             osg::GL2Extensions* extensions = osg::GL2Extensions::Get(_renderInfo.getState()->getContextID(), true);
             extensions->glUseProgram(0);
             _renderInfo.getState()->setLastAppliedProgramObject(0);
         }
-        
+
     }
 
@@ -151 +151 @@
         stateset.releaseGLObjects(_renderInfo.getState());
     }
-    
+
     if (_mode & CHECK_BLACK_LISTED_MODES)
     {
@@ -179 +179 @@
 {
     GLObjectsVisitor glObjectsVisitor(_mode);
-    
+
     context->getState()->initializeExtensionProcs();
 
     glObjectsVisitor.setState(context->getState());
-    
+
     // OSG_NOTICE<<"GLObjectsOperation::before <<<<<<<<<<<"<<std::endl;
     if (_subgraph.valid())