Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/logo/ReaderWriterLOGO.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/osgPlugins/logo/ReaderWriterLOGO.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/src/osgPlugins/logo/ReaderWriterLOGO.cpp

@@ -58 +58 @@
                         {
                             logos->getViewport()->setViewport( vp->x(), vp->y(), vp->width(), vp->height() );
-                            logos->dirtyDisplayList(); 
+                            logos->dirtyDisplayList();
                         }
                     }
@@ -66 +66 @@
         };
 
-        Logos() 
+        Logos()
         {
             osg::StateSet *sset = new osg::StateSet;
@@ -75 +75 @@
             sset->setMode( GL_DEPTH_TEST, osg::StateAttribute::OFF );
             sset->setTextureMode( 0, GL_TEXTURE_2D, osg::StateAttribute::OFF );
-#if 1            
+#if 1
             // for now we'll crudely set the bin number to 100 to force it to draw later and ontop of the scene
             sset->setRenderBinDetails( 100 , "RenderBin" );
@@ -98 +98 @@
         #if !defined(OSG_GLES1_AVAILABLE) && !defined(OSG_GLES2_AVAILABLE) && !defined(OSG_GL3_AVAILABLE)
 
-            if( renderInfo.getContextID() != _contextID ) 
+            if( renderInfo.getContextID() != _contextID )
                 return;
 
@@ -169 +169 @@
             glMatrixMode( GL_PROJECTION );
             glPopMatrix();
-            glMatrixMode( GL_MODELVIEW );            
+            glMatrixMode( GL_MODELVIEW );
         #else
             OSG_NOTICE<<"Warning: Logos::drawImplementation(..) not supported."<<std::endl;
@@ -201 +201 @@
         }
 
-        virtual osg::BoundingBox computeBound() const 
+        virtual osg::BoundingBox computeBound() const
         {
             return osg::BoundingBox( -1, -1, -1, 1, 1, 1);
@@ -226 +226 @@
             supportsExtension("logo","Ascii logo placement format");
         }
-        
+
         virtual const char* className() const { return "Logo Database Reader/Writer"; }
 
@@ -235 +235 @@
 
             std::string fileName = osgDB::findDataFile( file, options );
-            if (fileName.empty()) 
+            if (fileName.empty())
                 return ReadResult::FILE_NOT_FOUND;
 
@@ -290 +290 @@
                         break;
                     }
-                    
+
                     if (tn < 0)
                     {
@@ -296 +296 @@
                         break;
                     }
-                    
+
                     unsigned int n = static_cast<unsigned int>(tn);
                     if( screen != n )
@@ -318 +318 @@
             }
             fclose( fp );
-       
+
             if( ld->hasLogos() )
                 geode->addDrawable( ld );
-        
+
             geode->setCullingActive(false);
             return geode;