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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osg/FrameBufferObject.cpp

    r12432 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*/ 
     
    8989    LOAD_FBO_EXT(glGetRenderbufferParameteriv); 
    9090 
    91     _supported =  
     91    _supported = 
    9292        glBindRenderbuffer != 0 && 
    9393        glDeleteRenderbuffers != 0 && 
     
    241241    { 
    242242        ext->glGenRenderbuffers(1, &objectID); 
    243         if (objectID == 0)  
     243        if (objectID == 0) 
    244244            return 0; 
    245245        dirty = 1; 
     
    336336        TEXTURE2DMULTISAMPLE 
    337337    }; 
    338      
     338 
    339339    TargetType targetType; 
    340340    ref_ptr<RenderBuffer> renderbufferTarget; 
     
    427427{ 
    428428    osg::Texture* texture = attachment._texture.get(); 
    429      
     429 
    430430    if (texture) 
    431431    { 
     
    462462            return; 
    463463        } 
    464          
     464 
    465465        osg::Texture2DArray* texture2DArray = dynamic_cast<osg::Texture2DArray*>(texture); 
    466466        if (texture2DArray) 
     
    557557 
    558558        Texture::FilterMode minFilter = _ximpl->textureTarget->getFilter(Texture::MIN_FILTER); 
    559         if (minFilter==Texture::LINEAR_MIPMAP_LINEAR ||  
    560             minFilter==Texture::LINEAR_MIPMAP_NEAREST ||  
    561             minFilter==Texture::NEAREST_MIPMAP_LINEAR ||  
     559        if (minFilter==Texture::LINEAR_MIPMAP_LINEAR || 
     560            minFilter==Texture::LINEAR_MIPMAP_NEAREST || 
     561            minFilter==Texture::NEAREST_MIPMAP_LINEAR || 
    562562            minFilter==Texture::NEAREST_MIPMAP_NEAREST) 
    563563        { 
     
    587587            return; 
    588588    } 
    589      
     589 
    590590    switch (_ximpl->targetType) 
    591591    { 
     
    859859    if (_unsupported[contextID]) 
    860860        return; 
    861          
    862          
     861 
     862 
    863863    FBOExtensions* ext = FBOExtensions::instance(contextID,true); 
    864864    if (!ext->isSupported()) 
     
    893893    if (dirtyAttachmentList) 
    894894    { 
    895         // the set of of attachments appears to be thread sensitive, it shouldn't be because  
     895        // the set of of attachments appears to be thread sensitive, it shouldn't be because 
    896896        // OpenGL FBO handles osg::FrameBufferObject has are multi-buffered... 
    897897        // so as a temporary fix will stick in a mutex to ensure that only one thread passes through here 
     
    908908 
    909909    } 
    910      
    911     
     910 
     911 
    912912    ext->glBindFramebuffer(target, fboID); 
    913913 
     
    937937                    else 
    938938                    { 
    939                         OSG_WARN <<  
     939                        OSG_WARN << 
    940940                            "Warning: FrameBufferObject: could not attach PACKED_DEPTH_STENCIL_BUFFER, " 
    941941                            "EXT_packed_depth_stencil is not supported !" << std::endl; 
     
    947947                    break; 
    948948            } 
    949         }         
     949        } 
    950950        dirtyAttachmentList = 0; 
    951951    }