Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgUtil/GLObjectsVisitor.cpp

    r11844 r13041  
    1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield  
     1/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
    22 * 
    3  * This library is open source and may be redistributed and/or modified under   
    4  * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or  
     3 * This library is open source and may be redistributed and/or modified under 
     4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
    55 * (at your option) any later version.  The full license is in LICENSE file 
    66 * included with this distribution, and on the openscenegraph.org website. 
    7  *  
     7 * 
    88 * This library is distributed in the hope that it will be useful, 
    99 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    10  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1111 * OpenSceneGraph Public License for more details. 
    1212*/ 
     
    1717#include <osg/Timer> 
    1818 
    19 namespace osgUtil  
     19namespace osgUtil 
    2020{ 
    2121 
     
    6767{ 
    6868    if (_drawablesAppliedSet.count(&drawable)!=0) return; 
    69      
     69 
    7070    _drawablesAppliedSet.insert(&drawable); 
    7171 
     
    105105{ 
    106106    if (_stateSetAppliedSet.count(&stateset)!=0) return; 
    107      
     107 
    108108    _stateSetAppliedSet.insert(&stateset); 
    109109 
     
    111111    { 
    112112        stateset.compileGLObjects(*_renderInfo.getState()); 
    113          
     113 
    114114        osg::Program* program = dynamic_cast<osg::Program*>(stateset.getAttribute(osg::StateAttribute::PROGRAM)); 
    115115        if (program) { 
    116116            if( program->isFixedFunction() ) 
    117117                _lastCompiledProgram = NULL; // It does not make sense to apply uniforms on fixed pipe 
    118             else  
     118            else 
    119119                _lastCompiledProgram = program; 
    120120        } 
     
    126126            { 
    127127                pcp->useProgram(); 
    128                  
     128 
    129129                _renderInfo.getState()->setLastAppliedProgramObject(pcp); 
    130              
     130 
    131131                osg::StateSet::UniformList& ul = stateset.getUniformList(); 
    132132                for(osg::StateSet::UniformList::iterator itr = ul.begin(); 
     
    139139        } 
    140140        else if(_renderInfo.getState()->getLastAppliedProgramObject()){ 
    141                              
     141 
    142142            osg::GL2Extensions* extensions = osg::GL2Extensions::Get(_renderInfo.getState()->getContextID(), true); 
    143143            extensions->glUseProgram(0); 
    144144            _renderInfo.getState()->setLastAppliedProgramObject(0); 
    145145        } 
    146          
     146 
    147147    } 
    148148 
     
    151151        stateset.releaseGLObjects(_renderInfo.getState()); 
    152152    } 
    153      
     153 
    154154    if (_mode & CHECK_BLACK_LISTED_MODES) 
    155155    { 
     
    179179{ 
    180180    GLObjectsVisitor glObjectsVisitor(_mode); 
    181      
     181 
    182182    context->getState()->initializeExtensionProcs(); 
    183183 
    184184    glObjectsVisitor.setState(context->getState()); 
    185      
     185 
    186186    // OSG_NOTICE<<"GLObjectsOperation::before <<<<<<<<<<<"<<std::endl; 
    187187    if (_subgraph.valid())