Changeset 13041 for OpenSceneGraph/trunk/src/osg/ShapeDrawable.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/ShapeDrawable.cpp (modified) (25 diffs)

OpenSceneGraph/trunk/src/osg/ShapeDrawable.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.
 */
@@ -30 +30 @@
 {
     public:
-    
+
         DrawShapeVisitor(State& state,const TessellationHints* hints):
             _state(state),
@@ -40 +40 @@
                 OSG_NOTICE<<"Warning: TessellationHints ignored in present osg::ShapeDrawable implementation."<<std::endl;
             }
-#endif   
+#endif
         }
-    
+
         virtual void apply(const Sphere&);
         virtual void apply(const Box&);
@@ -58 +58 @@
         State&                      _state;
         const TessellationHints*    _hints;
-        
+
     protected:
 
@@ -64 +64 @@
 
         enum SphereHalf { SphereTopHalf, SphereBottomHalf };
-    
+
         // helpers for apply( Cylinder | Sphere | Capsule )
         void drawCylinderBody(unsigned int numSegments, float radius, float height);
@@ -75 +75 @@
     const float angleDelta = 2.0f*osg::PI/(float)numSegments;
     const float texCoordDelta = 1.0f/(float)numSegments;
-    
+
     const float r = radius;
     const float h = height;
-    
+
     float basez = -h*0.5f;
     float topz = h*0.5f;
-    
+
     float angle = 0.0f;
     float texCoord = 0.0f;
-    
+
     bool drawFrontFace = _hints ? _hints->getCreateFrontFace() : true;
     bool drawBackFace = _hints ? _hints->getCreateBackFace() : false;
-    
+
     // The only difference between the font & back face loops is that the
     //  normals are inverted and the order of the vertex pairs is reversed.
-    //  The code is mostly duplicated in order to hoist the back/front face 
+    //  The code is mostly duplicated in order to hoist the back/front face
     //  test out of the loop for efficiency
 
@@ -105 +105 @@
           float c = cosf(angle);
           float s = sinf(angle);
-  
+
           gl.Normal3f(c,s,0.0f);
-  
+
           gl.TexCoord2f(texCoord,1.0f);
           gl.Vertex3f(c*r,s*r,topz);
-  
+
           gl.TexCoord2f(texCoord,0.0f);
           gl.Vertex3f(c*r,s*r,basez);
       }
-  
+
       // do last point by hand to ensure no round off errors.
       gl.Normal3f(1.0f,0.0f,0.0f);
-  
+
       gl.TexCoord2f(1.0f,1.0f);
       gl.Vertex3f(r,0.0f,topz);
-  
+
       gl.TexCoord2f(1.0f,0.0f);
       gl.Vertex3f(r,0.0f,basez);
     }
-    
+
     if (drawBackFace) {
       for(unsigned int bodyi=0;
@@ -132 +132 @@
           float c = cosf(angle);
           float s = sinf(angle);
-  
+
           gl.Normal3f(-c,-s,0.0f);
-  
+
           gl.TexCoord2f(texCoord,0.0f);
           gl.Vertex3f(c*r,s*r,basez);
@@ -141 +141 @@
           gl.Vertex3f(c*r,s*r,topz);
       }
-  
+
       // do last point by hand to ensure no round off errors.
       gl.Normal3f(-1.0f,0.0f,0.0f);
-  
+
       gl.TexCoord2f(1.0f,0.0f);
       gl.Vertex3f(r,0.0f,basez);
-  
+
       gl.TexCoord2f(1.0f,1.0f);
       gl.Vertex3f(r,0.0f,topz);
@@ -198 +198 @@
             // The only difference between the font & back face loops is that the
             //  normals are inverted and the order of the vertex pairs is reversed.
-            //  The code is mostly duplicated in order to hoist the back/front face 
+            //  The code is mostly duplicated in order to hoist the back/front face
             //  test out of the loop for efficiency
-            
+
             if (drawFrontFace) {
               for(unsigned int topi=0; topi<numSegments;
                   ++topi,angle+=angleDelta,texCoord+=texCoordHorzDelta)
               {
-  
+
                   float c = cosf(angle);
                   float s = sinf(angle);
-  
+
                   gl.Normal3f(c*nRatioTop,s*nRatioTop,nzTop);
-  
+
                   gl.TexCoord2f(texCoord,vTop);
                   gl.Vertex3f(c*rTop,s*rTop,zTop+zOffset);
-  
+
                   gl.Normal3f(c*nRatioBase,s*nRatioBase,nzBase);
-  
+
                   gl.TexCoord2f(texCoord,vBase);
                   gl.Vertex3f(c*rBase,s*rBase,zBase+zOffset);
-  
+
               }
-  
+
               // do last point by hand to ensure no round off errors.
               gl.Normal3f(nRatioTop,0.0f,nzTop);
-  
+
               gl.TexCoord2f(1.0f,vTop);
               gl.Vertex3f(rTop,0.0f,zTop+zOffset);
-  
+
               gl.Normal3f(nRatioBase,0.0f,nzBase);
-  
+
               gl.TexCoord2f(1.0f,vBase);
               gl.Vertex3f(rBase,0.0f,zBase+zOffset);
             }
-            
+
           if (drawBackFace) {
               for(unsigned int topi=0; topi<numSegments;
                   ++topi,angle+=angleDelta,texCoord+=texCoordHorzDelta)
               {
-  
+
                   float c = cosf(angle);
                   float s = sinf(angle);
-  
+
                   gl.Normal3f(-c*nRatioBase,-s*nRatioBase,-nzBase);
-  
+
                   gl.TexCoord2f(texCoord,vBase);
                   gl.Vertex3f(c*rBase,s*rBase,zBase+zOffset);
-  
+
                   gl.Normal3f(-c*nRatioTop,-s*nRatioTop,-nzTop);
-  
+
                   gl.TexCoord2f(texCoord,vTop);
                   gl.Vertex3f(c*rTop,s*rTop,zTop+zOffset);
               }
-  
+
               // do last point by hand to ensure no round off errors.
               gl.Normal3f(-nRatioBase,0.0f,-nzBase);
-  
+
               gl.TexCoord2f(1.0f,vBase);
               gl.Vertex3f(rBase,0.0f,zBase+zOffset);
 
               gl.Normal3f(-nRatioTop,0.0f,-nzTop);
-  
+
               gl.TexCoord2f(1.0f,vTop);
               gl.Vertex3f(rTop,0.0f,zTop+zOffset);
-  
+
           }
 
@@ -725 +725 @@
 
     // cylinder body
-    if (createBody) 
+    if (createBody)
         drawCylinderBody(numSegments, cylinder.getRadius(), cylinder.getHeight());
 
@@ -831 +831 @@
 
     // capsule cylindrical body
-    if (createBody) 
+    if (createBody)
         drawCylinderBody(numSegments, capsule.getRadius(), capsule.getHeight());
 
     // capsule top cap
-    if (createTop) 
+    if (createTop)
         drawHalfSphere(numSegments, numRows, capsule.getRadius(), SphereTopHalf, capsule.getHeight()/2.0f);
 
     // capsule bottom cap
-    if (createBottom) 
+    if (createBottom)
         drawHalfSphere(numSegments, numRows, capsule.getRadius(), SphereBottomHalf, -capsule.getHeight()/2.0f);
 
@@ -856 +856 @@
     const Vec3Array* vertices = mesh.getVertices();
     const IndexArray* indices = mesh.getIndices();
-    
+
      if (vertices && indices)
      {
@@ -1061 +1061 @@
 {
     public:
-    
+
         ComputeBoundShapeVisitor(BoundingBox& bb):_bb(bb) {}
 
@@ -1237 +1237 @@
     const Vec3Array* vertices = mesh.getVertices();
     const IndexArray* indices = mesh.getIndices();
-    
+
     if (vertices && indices)
     {
@@ -1328 +1328 @@
 {
     public:
-    
+
         PrimitiveShapeVisitor(PrimitiveFunctor& functor,const TessellationHints* hints):
             _functor(functor),
@@ -1363 +1363 @@
 {
     const float angleDelta = 2.0f*osg::PI/(float)numSegments;
-    
+
     const float r = radius;
     const float h = height;
-    
+
     float basez = -h*0.5f;
     float topz = h*0.5f;
-    
+
     float angle = 0.0f;
-    
+
     _functor.begin(GL_QUAD_STRIP);
 
@@ -1388 +1388 @@
         _functor.vertex(osg::Vec3(r,0.0f,topz) * matrix);
         _functor.vertex(osg::Vec3(r,0.0f,basez) * matrix);
-    
+
     _functor.end();
 }
@@ -1434 +1434 @@
 
             }
-  
+
             // do last point by hand to ensure no round off errors.
             _functor.vertex(osg::Vec3(rTop,0.0f,zTop+zOffset) * matrix);
-            _functor.vertex(osg::Vec3(rBase,0.0f,zBase+zOffset) * matrix);            
+            _functor.vertex(osg::Vec3(rBase,0.0f,zBase+zOffset) * matrix);
 
         _functor.end();
-        
-        
+
+
         lBase=lTop;
         rBase=rTop;
@@ -1447 +1447 @@
         vBase=vTop;
     }
-        
+
 }
 
@@ -1559 +1559 @@
         Matrix matrix = box.computeRotationMatrix();
         matrix.setTrans(box.getCenter());
-        
+
         base_1 = base_1*matrix;
         base_2 = base_2*matrix;
@@ -1844 +1844 @@
     const Vec3Array* vertices = mesh.getVertices();
     const IndexArray* indices = mesh.getIndices();
-    
+
      if (vertices && indices)
      {
@@ -1870 +1870 @@
 {
     if (field.getNumColumns()==0 || field.getNumRows()==0) return;
-    
+
     Matrix matrix = field.computeRotationMatrix();
     matrix.setTrans(field.getOrigin());
@@ -1948 +1948 @@
 void ShapeDrawable::setTessellationHints(TessellationHints* hints)
 {
-    if (_tessellationHints!=hints) 
-    {
-        _tessellationHints = hints; 
+    if (_tessellationHints!=hints)
+    {
+        _tessellationHints = hints;
         dirtyDisplayList();
     }
@@ -1963 +1963 @@
     {
         gl.Color4fv(_color.ptr());
-    
+
         DrawShapeVisitor dsv(state,_tessellationHints.get());
-        
+
         _shape->accept(dsv);
     }