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/PrimitiveSet.cpp

    r11942 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*/ 
     
    3131        case(TRIANGLE_FAN): 
    3232        case(QUAD_STRIP): 
    33         case(PATCHES):  
     33        case(PATCHES): 
    3434        case(POLYGON): return 1; 
    3535    } 
     
    3737} 
    3838 
    39 void DrawArrays::draw(State& state, bool) const  
    40 { 
    41 #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)  
    42     GLenum mode = _mode; 
    43     if (_mode==GL_QUADS)  
     39void DrawArrays::draw(State& state, bool) const 
     40{ 
     41#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
     42    GLenum mode = _mode; 
     43    if (_mode==GL_QUADS) 
    4444    { 
    4545        state.drawQuads(_first, _count, _numInstances); 
     
    9595{ 
    9696    GLenum mode = _mode; 
    97     #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)  
    98         if (_mode==GL_QUADS)  
     97    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
     98        if (_mode==GL_QUADS) 
    9999        { 
    100100            GLint first = _first; 
     
    106106                first += *itr; 
    107107            } 
    108              
     108 
    109109            return; 
    110110        } 
     
    165165} 
    166166 
    167 void DrawElementsUByte::draw(State& state, bool useVertexBufferObjects) const  
    168 { 
    169     GLenum mode = _mode; 
    170     #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)  
     167void DrawElementsUByte::draw(State& state, bool useVertexBufferObjects) const 
     168{ 
     169    GLenum mode = _mode; 
     170    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
    171171        if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN; 
    172172        if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP; 
     
    188188        } 
    189189    } 
    190     else  
     190    else 
    191191    { 
    192192        if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances); 
     
    221221} 
    222222 
    223 void DrawElementsUShort::draw(State& state, bool useVertexBufferObjects) const  
    224 { 
    225     GLenum mode = _mode; 
    226     #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)  
     223void DrawElementsUShort::draw(State& state, bool useVertexBufferObjects) const 
     224{ 
     225    GLenum mode = _mode; 
     226    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
    227227        if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN; 
    228228        if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP; 
     
    244244        } 
    245245    } 
    246     else  
     246    else 
    247247    { 
    248248        if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_SHORT, &front(), _numInstances); 
     
    277277} 
    278278 
    279 void DrawElementsUInt::draw(State& state, bool useVertexBufferObjects) const  
    280 { 
    281     GLenum mode = _mode; 
    282     #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)  
     279void DrawElementsUInt::draw(State& state, bool useVertexBufferObjects) const 
     280{ 
     281    GLenum mode = _mode; 
     282    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
    283283        if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN; 
    284284        if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP; 
     
    300300        } 
    301301    } 
    302     else  
     302    else 
    303303    { 
    304304        if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_INT, &front(), _numInstances);