Changeset 13041 for OpenSceneGraph/trunk/include/osg/PrimitiveSet

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osg/PrimitiveSet (modified) (27 diffs)

OpenSceneGraph/trunk/include/osg/PrimitiveSet

@@ -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.
 */
@@ -152 +152 @@
 {
     public:
-    
+
         enum Type
         {
@@ -175 +175 @@
             QUAD_STRIP = GL_QUAD_STRIP,
             POLYGON = GL_POLYGON,
-            LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT, 
-            LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT, 
-            TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT, 
+            LINES_ADJACENCY = GL_LINES_ADJACENCY_EXT,
+            LINE_STRIP_ADJACENCY = GL_LINE_STRIP_ADJACENCY_EXT,
+            TRIANGLES_ADJACENCY = GL_TRIANGLES_ADJACENCY_EXT,
             TRIANGLE_STRIP_ADJACENCY = GL_TRIANGLE_STRIP_ADJACENCY_EXT,
             PATCHES = GL_PATCHES
@@ -186 +186 @@
             _numInstances(numInstances),
             _mode(mode) {}
-    
+
         PrimitiveSet(const PrimitiveSet& prim,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             BufferData(prim,copyop),
@@ -196 +196 @@
         virtual const char* libraryName() const { return "osg"; }
         virtual const char* className() const { return "PrimitiveSet"; }
-        
+
         Type                    getType() const { return _primitiveType; }
 
@@ -208 +208 @@
         virtual DrawElements* getDrawElements() { return 0; }
         virtual const DrawElements* getDrawElements() const { return 0; }
-            
+
         void setNumInstances(int n) { _numInstances = n; }
         int getNumInstances() const { return _numInstances; }
@@ -216 +216 @@
 
         virtual void draw(State& state, bool useVertexBufferObjects) const = 0;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const = 0;
         virtual void accept(PrimitiveIndexFunctor& functor) const = 0;
-        
+
         virtual unsigned int index(unsigned int pos) const = 0;
         virtual unsigned int getNumIndices() const = 0;
         virtual void offsetIndices(int offset) = 0;
 
-        virtual unsigned int getNumPrimitives() const; 
+        virtual unsigned int getNumPrimitives() const;
 
         virtual void computeRange() const {}
@@ -245 +245 @@
             _first(0),
             _count(0) {}
-    
+
         DrawArrays(GLenum mode, GLint first, GLsizei count, int numInstances=0):
             PrimitiveSet(DrawArraysPrimitiveType, mode, numInstances),
@@ -257 +257 @@
 
         virtual Object* cloneType() const { return new DrawArrays(); }
-        virtual Object* clone(const CopyOp& copyop) const { return new DrawArrays(*this,copyop); }        
+        virtual Object* clone(const CopyOp& copyop) const { return new DrawArrays(*this,copyop); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const DrawArrays*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
         virtual const char* className() const { return "DrawArrays"; }
-        
+
 
         void set(GLenum mode,GLint first, GLsizei count)
@@ -272 +272 @@
         void setFirst(GLint first) { _first = first; }
         GLint getFirst() const { return _first; }
-        
+
         void setCount(GLsizei count) { _count = count; }
         GLsizei getCount() const { return _count; }
 
         virtual void draw(State& state, bool useVertexBufferObjects) const;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const;
         virtual void accept(PrimitiveIndexFunctor& functor) const;
-        
+
         virtual unsigned int getNumIndices() const { return static_cast<unsigned int>(_count); }
         virtual unsigned int index(unsigned int pos) const { return static_cast<unsigned int>(_first)+pos; }
@@ -302 +302 @@
             PrimitiveSet(DrawArrayLengthsPrimitiveType,mode),
             _first(0) {}
-    
+
         DrawArrayLengths(const DrawArrayLengths& dal,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             PrimitiveSet(dal,copyop),
@@ -308 +308 @@
             _first(dal._first) {}
 
-        DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) : 
+        DrawArrayLengths(GLenum mode, GLint first, unsigned int no, GLsizei* ptr) :
             PrimitiveSet(DrawArrayLengthsPrimitiveType,mode),
             vector_type(ptr,ptr+no),
             _first(first) {}
 
-        DrawArrayLengths(GLenum mode,GLint first, unsigned int no) : 
+        DrawArrayLengths(GLenum mode,GLint first, unsigned int no) :
             PrimitiveSet(DrawArrayLengthsPrimitiveType,mode),
             vector_type(no),
             _first(first) {}
 
-        DrawArrayLengths(GLenum mode,GLint first) : 
+        DrawArrayLengths(GLenum mode,GLint first) :
             PrimitiveSet(DrawArrayLengthsPrimitiveType,mode),
             vector_type(),
@@ -325 +325 @@
 
         virtual Object* cloneType() const { return new DrawArrayLengths(); }
-        virtual Object* clone(const CopyOp& copyop) const { return new DrawArrayLengths(*this,copyop); }        
+        virtual Object* clone(const CopyOp& copyop) const { return new DrawArrayLengths(*this,copyop); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const DrawArrayLengths*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
         virtual const char* className() const { return "DrawArrayLengths"; }
-        
+
 
         void setFirst(GLint first) { _first = first; }
         GLint getFirst() const { return _first; }
-        
+
         virtual void draw(State& state, bool useVertexBufferObjects) const;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const;
         virtual void accept(PrimitiveIndexFunctor& functor) const;
-        
+
         virtual unsigned int getNumIndices() const;
         virtual unsigned int index(unsigned int pos) const { return _first+pos; }
@@ -355 +355 @@
 {
     public:
-        
+
         DrawElements(Type primType=PrimitiveType, GLenum mode=0, int numInstances=0):
             PrimitiveSet(primType,mode, numInstances) {}
-    
+
         DrawElements(const DrawElements& copy,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             PrimitiveSet(copy,copyop) {}
@@ -388 +388 @@
 {
     public:
-    
+
         typedef VectorGLubyte vector_type;
 
         DrawElementsUByte(GLenum mode=0):
             DrawElements(DrawElementsUBytePrimitiveType,mode) {}
-    
+
         DrawElementsUByte(const DrawElementsUByte& array, const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             DrawElements(array,copyop),
@@ -401 +401 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr, int numInstances=0) : 
+        DrawElementsUByte(GLenum mode, unsigned int no, const GLubyte* ptr, int numInstances=0) :
             DrawElements(DrawElementsUBytePrimitiveType,mode,numInstances),
             vector_type(ptr,ptr+no) {}
@@ -408 +408 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUByte(GLenum mode, unsigned int no) : 
+        DrawElementsUByte(GLenum mode, unsigned int no) :
             DrawElements(DrawElementsUBytePrimitiveType,mode),
             vector_type(no) {}
 
         virtual Object* cloneType() const { return new DrawElementsUByte(); }
-        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUByte(*this,copyop); }        
+        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUByte(*this,copyop); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const DrawElementsUByte*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
@@ -423 +423 @@
 
         virtual void draw(State& state, bool useVertexBufferObjects) const ;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const;
         virtual void accept(PrimitiveIndexFunctor& functor) const;
@@ -430 +430 @@
         virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; }
         virtual void offsetIndices(int offset);
-        
+
         virtual void reserveElements(unsigned int numIndices) { reserve(numIndices); }
         virtual void setElement(unsigned int i, unsigned int v)  { (*this)[i] = v; }
-        virtual unsigned int getElement(unsigned int i) { return (*this)[i]; } 
-        virtual void addElement(unsigned int v) { push_back(GLubyte(v)); } 
+        virtual unsigned int getElement(unsigned int i) { return (*this)[i]; }
+        virtual void addElement(unsigned int v) { push_back(GLubyte(v)); }
 
     protected:
@@ -450 +450 @@
         DrawElementsUShort(GLenum mode=0):
             DrawElements(DrawElementsUShortPrimitiveType,mode) {}
-    
+
         DrawElementsUShort(const DrawElementsUShort& array,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             DrawElements(array,copyop),
@@ -458 +458 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr, int numInstances=0) : 
+        DrawElementsUShort(GLenum mode, unsigned int no, const GLushort* ptr, int numInstances=0) :
             DrawElements(DrawElementsUShortPrimitiveType,mode,numInstances),
             vector_type(ptr,ptr+no) {}
@@ -465 +465 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUShort(GLenum mode, unsigned int no) : 
+        DrawElementsUShort(GLenum mode, unsigned int no) :
             DrawElements(DrawElementsUShortPrimitiveType,mode),
             vector_type(no) {}
 
         template <class InputIterator>
-        DrawElementsUShort(GLenum mode, InputIterator first,InputIterator last) : 
+        DrawElementsUShort(GLenum mode, InputIterator first,InputIterator last) :
             DrawElements(DrawElementsUShortPrimitiveType,mode),
             vector_type(first,last) {}
 
         virtual Object* cloneType() const { return new DrawElementsUShort(); }
-        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUShort(*this,copyop); }        
+        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUShort(*this,copyop); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const DrawElementsUShort*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
@@ -485 +485 @@
 
         virtual void draw(State& state, bool useVertexBufferObjects) const;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const;
         virtual void accept(PrimitiveIndexFunctor& functor) const;
@@ -511 +511 @@
         DrawElementsUInt(GLenum mode=0):
             DrawElements(DrawElementsUIntPrimitiveType,mode) {}
-    
+
         DrawElementsUInt(const DrawElementsUInt& array,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
             DrawElements(array,copyop),
@@ -520 +520 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr, int numInstances=0) : 
+        DrawElementsUInt(GLenum mode, unsigned int no, const GLuint* ptr, int numInstances=0) :
             DrawElements(DrawElementsUIntPrimitiveType,mode,numInstances),
             vector_type(ptr,ptr+no) {}
@@ -527 +527 @@
          * \param no Number of intended elements. This will be the size of the underlying vector.
          */
-        DrawElementsUInt(GLenum mode, unsigned int no) : 
+        DrawElementsUInt(GLenum mode, unsigned int no) :
             DrawElements(DrawElementsUIntPrimitiveType,mode),
             vector_type(no) {}
 
         template <class InputIterator>
-        DrawElementsUInt(GLenum mode, InputIterator first,InputIterator last) : 
+        DrawElementsUInt(GLenum mode, InputIterator first,InputIterator last) :
             DrawElements(DrawElementsUIntPrimitiveType,mode),
             vector_type(first,last) {}
 
         virtual Object* cloneType() const { return new DrawElementsUInt(); }
-        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUInt(*this,copyop); }        
+        virtual Object* clone(const CopyOp& copyop) const { return new DrawElementsUInt(*this,copyop); }
         virtual bool isSameKindAs(const Object* obj) const { return dynamic_cast<const DrawElementsUInt*>(obj)!=NULL; }
         virtual const char* libraryName() const { return "osg"; }
@@ -547 +547 @@
 
         virtual void draw(State& state, bool useVertexBufferObjects) const;
-        
+
         virtual void accept(PrimitiveFunctor& functor) const;
         virtual void accept(PrimitiveIndexFunctor& functor) const;