Changeset 13041 for OpenSceneGraph/trunk/src/osg/PrimitiveSet.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/PrimitiveSet.cpp (modified) (11 diffs)

OpenSceneGraph/trunk/src/osg/PrimitiveSet.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.
 */
@@ -31 +31 @@
         case(TRIANGLE_FAN):
         case(QUAD_STRIP):
-        case(PATCHES): 
+        case(PATCHES):
         case(POLYGON): return 1;
     }
@@ -37 +37 @@
 }
 
-void DrawArrays::draw(State& state, bool) const 
-{
-#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
-    GLenum mode = _mode;
-    if (_mode==GL_QUADS) 
+void DrawArrays::draw(State& state, bool) const
+{
+#if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
+    GLenum mode = _mode;
+    if (_mode==GL_QUADS)
     {
         state.drawQuads(_first, _count, _numInstances);
@@ -95 +95 @@
 {
     GLenum mode = _mode;
-    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
-        if (_mode==GL_QUADS) 
+    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
+        if (_mode==GL_QUADS)
         {
             GLint first = _first;
@@ -106 +106 @@
                 first += *itr;
             }
-            
+
             return;
         }
@@ -165 +165 @@
 }
 
-void DrawElementsUByte::draw(State& state, bool useVertexBufferObjects) const 
-{
-    GLenum mode = _mode;
-    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
+void DrawElementsUByte::draw(State& state, bool useVertexBufferObjects) const
+{
+    GLenum mode = _mode;
+    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
         if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN;
         if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP;
@@ -188 +188 @@
         }
     }
-    else 
+    else
     {
         if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_BYTE, &front(), _numInstances);
@@ -221 +221 @@
 }
 
-void DrawElementsUShort::draw(State& state, bool useVertexBufferObjects) const 
-{
-    GLenum mode = _mode;
-    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
+void DrawElementsUShort::draw(State& state, bool useVertexBufferObjects) const
+{
+    GLenum mode = _mode;
+    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
         if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN;
         if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP;
@@ -244 +244 @@
         }
     }
-    else 
+    else
     {
         if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_SHORT, &front(), _numInstances);
@@ -277 +277 @@
 }
 
-void DrawElementsUInt::draw(State& state, bool useVertexBufferObjects) const 
-{
-    GLenum mode = _mode;
-    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE) 
+void DrawElementsUInt::draw(State& state, bool useVertexBufferObjects) const
+{
+    GLenum mode = _mode;
+    #if defined(OSG_GLES1_AVAILABLE) || defined(OSG_GLES2_AVAILABLE)
         if (mode==GL_POLYGON) mode = GL_TRIANGLE_FAN;
         if (mode==GL_QUAD_STRIP) mode = GL_TRIANGLE_STRIP;
@@ -300 +300 @@
         }
     }
-    else 
+    else
     {
         if (_numInstances>=1) state.glDrawElementsInstanced(mode, size(), GL_UNSIGNED_INT, &front(), _numInstances);