Changeset 13041 for OpenSceneGraph/trunk/src/osgShadow/OccluderGeometry.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/osgShadow/OccluderGeometry.cpp (modified) (47 diffs)

OpenSceneGraph/trunk/src/osgShadow/OccluderGeometry.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.
 */
@@ -34 +34 @@
     osg::Drawable(oc,copyop)
 {
-    
+
 }
 
@@ -54 +54 @@
     {
         if (node.getStateSet()) pushState(node.getStateSet());
-        
+
         traverse(node);
 
         if (node.getStateSet()) popState();
     }
-    
+
     void apply(osg::Transform& transform)
     {
         if (transform.getStateSet()) pushState(transform.getStateSet());
-        
+
         osg::Matrix matrix;
         if (!_matrixStack.empty()) matrix = _matrixStack.back();
-        
+
         transform.computeLocalToWorldMatrix(matrix,this);
-        
+
         pushMatrix(matrix);
-        
+
         traverse(transform);
-        
+
         popMatrix();
 
         if (transform.getStateSet()) popState();
     }
-    
+
     void apply(osg::Geode& geode)
     {
@@ -87 +87 @@
 
             if (drawable->getStateSet()) pushState(drawable->getStateSet());
-            
+
             apply(geode.getDrawable(i));
 
             if (drawable->getStateSet()) popState();
         }
-        
+
         if (geode.getStateSet()) popState();
     }
-    
+
     void pushState(osg::StateSet* stateset)
     {
         osg::StateAttribute::GLModeValue prevBlendModeValue = _blendModeStack.empty() ? osg::StateAttribute::GLModeValue(osg::StateAttribute::INHERIT) : _blendModeStack.back();
         osg::StateAttribute::GLModeValue newBlendModeValue = stateset->getMode(GL_BLEND);
-        
-        if (!(newBlendModeValue & osg::StateAttribute::PROTECTED) && 
+
+        if (!(newBlendModeValue & osg::StateAttribute::PROTECTED) &&
              (prevBlendModeValue & osg::StateAttribute::OVERRIDE) )
         {
             newBlendModeValue = prevBlendModeValue;
         }
-        
+
         _blendModeStack.push_back(newBlendModeValue);
     }
-    
+
     void popState()
     {
         _blendModeStack.pop_back();
     }
-    
+
     void pushMatrix(osg::Matrix& matrix)
     {
         _matrixStack.push_back(matrix);
     }
-    
+
     void popMatrix()
     {
@@ -133 +133 @@
             return;
         }
-        
+
         _oc->processGeometry(drawable, (_matrixStack.empty() ? 0 : &_matrixStack.back()), _ratio);
-        
-    }
-    
+
+    }
+
 protected:
-    
+
     OccluderGeometry* _oc;
-    
+
     typedef std::vector<osg::Matrix> MatrixStack;
     typedef std::vector<osg::StateAttribute::GLModeValue> ModeStack;
-    
+
     float           _ratio;
     MatrixStack     _matrixStack;
     ModeStack       _blendModeStack;
-    
+
 };
 
@@ -156 +156 @@
 
     osg::Timer_t startTick = osg::Timer::instance()->tick();
-    
+
     CollectOccludersVisitor cov(this, matrix, sampleRatio);
     subgraph->accept(cov);
-    
+
     setUpInternalStructures();
 
@@ -182 +182 @@
     typedef std::vector<const osg::Vec3*> VertexPointers;
     VertexPointers _vertexPointers;
-    
+
     OccluderGeometry::Vec3List _tempoaryTriangleVertices;
 
@@ -204 +204 @@
             _tempoaryTriangleVertices.push_back(v2);
             _tempoaryTriangleVertices.push_back(v3);
-            
+
         }
         else
@@ -215 +215 @@
 
     }
-    
+
     void copyToLocalData()
     {
         if ((_vertexPointers.size()+_tempoaryTriangleVertices.size())<3) return;
-    
-    
+
+
         const osg::Vec3* minVertex = _vertexPointers.empty() ? 0 : _vertexPointers.front();
         const osg::Vec3* maxVertex = _vertexPointers.empty() ? 0 : _vertexPointers.front();
-    
+
         VertexPointers::iterator itr;
         for(itr = _vertexPointers.begin();
@@ -235 +235 @@
         unsigned int base = _vertices->size();
         unsigned int numberNewVertices = _vertexPointers.empty() ? 0 : (maxVertex - minVertex) + 1;
-        
+
         // OSG_NOTICE<<"base = "<<base<<" numberNewVertices="<<numberNewVertices<<std::endl;
 
         _vertices->resize(base + numberNewVertices + _tempoaryTriangleVertices.size());
-        
+
         for(itr = _vertexPointers.begin();
             itr != _vertexPointers.end();
@@ -267 +267 @@
             }
         }
-        
+
     }
 
@@ -282 +282 @@
 
     drawable->accept(tc);
-    
+
     tc.copyToLocalData();
-    
-#if 0    
+
+#if 0
     for(Vec3List::iterator vitr = _vertices.begin();
         vitr != _vertices.end();
@@ -308 +308 @@
 
     removeDuplicateVertices();
-    
+
     osg::Timer_t t1 = osg::Timer::instance()->tick();
 
@@ -320 +320 @@
 
     buildEdgeMaps();
-    
+
     osg::Timer_t t4 = osg::Timer::instance()->tick();
 
@@ -332 +332 @@
 
     dirtyBound();
-    
+
     dirtyDisplayList();
 }
@@ -367 +367 @@
 {
     if (_vertices.empty()) return;
-    
+
     OSG_NOTICE<<"OccluderGeometry::removeDuplicates() before = "<<_vertices.size()<<std::endl;
 
@@ -400 +400 @@
         else
         {
-            prev = curr; 
+            prev = curr;
             ++numUnique;
         }
     }
-    
+
     OSG_NOTICE<<"Num diplicates = "<<numDuplicates<<std::endl;
     OSG_NOTICE<<"Num unique = "<<numUnique<<std::endl;
@@ -410 +410 @@
     if (numDuplicates==0) return;
 
-    // now assign the unique Vec3 to the newVertices arrays    
+    // now assign the unique Vec3 to the newVertices arrays
     typedef std::vector<unsigned int> IndexMap;
     IndexMap indexMap(indexVec3PtrPairs.size());
@@ -429 +429 @@
     for(; curr != indexVec3PtrPairs.end(); ++curr)
     {
-        if (*prev==*curr) 
+        if (*prev==*curr)
         {
             indexMap[curr->index] = index;
@@ -435 +435 @@
         else
         {
-            ++index;            
-            
+            ++index;
+
             // add new unique vertex
             indexMap[curr->index] = index;
             newVertices.push_back(*(curr->vec));
 
-            prev = curr; 
+            prev = curr;
         }
     }
@@ -462 +462 @@
     // OSG_NOTICE<<"OccluderGeometry::removeNullTriangles()"<<std::endl;
 
-    
+
     UIntList::iterator lastValidItr = _triangleIndices.begin();
     for(UIntList::iterator titr = _triangleIndices.begin();
@@ -501 +501 @@
 {
     // OSG_NOTICE<<"OccluderGeometry::computeNormals()"<<std::endl;
-    
+
     unsigned int numTriangles = _triangleIndices.size() / 3;
     unsigned int redundentIndices = _triangleIndices.size() - numTriangles * 3;
@@ -509 +509 @@
         _triangleIndices.erase(_triangleIndices.begin() + numTriangles * 3, _triangleIndices.end());
     }
-    
+
     _triangleNormals.clear();
     _triangleNormals.reserve(numTriangles);
-    
+
     _normals.resize(_vertices.size());
 
@@ -529 +529 @@
 
         if (!_normals.empty())
-        {        
+        {
             _normals[p1] += normal;
             _normals[p2] += normal;
@@ -535 +535 @@
         }
     }
-    
+
     for(Vec3List::iterator nitr = _normals.begin();
         nitr != _normals.end();
@@ -543 +543 @@
     }
 
-    
+
 }
 
@@ -549 +549 @@
 {
     // OSG_NOTICE<<"OccluderGeometry::buildEdgeMaps()"<<std::endl;
-    
+
     typedef std::set<Edge> EdgeSet;
     EdgeSet edgeSet;
-    
+
     unsigned int numTriangleErrors = 0;
     unsigned int triNo=0;
@@ -562 +562 @@
         GLuint p2 = *titr++;
         GLuint p3 = *titr++;
-        
+
         {
             Edge edge12(p1,p2);
             EdgeSet::iterator itr = edgeSet.find(edge12);
-            if (itr == edgeSet.end()) 
+            if (itr == edgeSet.end())
             {
                 if (!edge12.addTriangle(triNo)) ++numTriangleErrors;
@@ -577 +577 @@
         }
 
-        {        
+        {
             Edge edge23(p2,p3);
             EdgeSet::iterator itr = edgeSet.find(edge23);
-            if (itr == edgeSet.end()) 
+            if (itr == edgeSet.end())
             {
                 if (!edge23.addTriangle(triNo)) ++numTriangleErrors;
@@ -590 +590 @@
             }
         }
-        
+
         {
             Edge edge31(p3,p1);
             EdgeSet::iterator itr = edgeSet.find(edge31);
-            if (itr == edgeSet.end()) 
+            if (itr == edgeSet.end())
             {
                 if (!edge31.addTriangle(triNo)) ++numTriangleErrors;
-                
+
                 edgeSet.insert(edge31);
             }
@@ -609 +609 @@
     _edges.clear();
     _edges.reserve(edgeSet.size());
-    
+
     unsigned int numEdgesWithNoTriangles = 0;
     unsigned int numEdgesWithOneTriangles = 0;
     unsigned int numEdgesWithTwoTriangles = 0;
-    
+
     for(EdgeSet::iterator eitr = edgeSet.begin();
         eitr != edgeSet.end();
@@ -635 +635 @@
             pos = _vertices[opposite];
         }
-        
+
         if (edge._t2>=0)
         {
@@ -656 +656 @@
                 edge._normal.set(0.0,0.0,0.0);
                 OSG_NOTICE<<"Warning no triangles on edge."<<std::endl;
-                break; 
+                break;
             case(1):
                 ++numEdgesWithOneTriangles;
                 edge._normal = pos - mid;
                 edge._normal.normalize();
-                break; 
+                break;
             default:
-                ++numEdgesWithTwoTriangles; 
+                ++numEdgesWithTwoTriangles;
                 edge._normal = (pos*0.5f) - mid;
                 edge._normal.normalize();
-                break; 
+                break;
         }
 
@@ -687 +687 @@
 {
     silhouetteIndices.clear();
-    
+
     for(EdgeList::const_iterator eitr = _edges.begin();
         eitr != _edges.end();
@@ -699 +699 @@
             osg::Vec3 normal = (v2-v1) ^ lightdirection;
             if (normal * edge._normal > 0.0)
-            {        
+            {
                 silhouetteIndices.push_back(edge._p1);
                 silhouetteIndices.push_back(edge._p2);
@@ -715 +715 @@
 {
     silhouetteIndices.clear();
-    
+
     for(EdgeList::const_iterator eitr = _edges.begin();
         eitr != _edges.end();
@@ -727 +727 @@
             osg::Vec3 normal = (v2-v1) ^ (v1-lightpos);
             if (normal * edge._normal > 0.0)
-            {        
+            {
                 silhouetteIndices.push_back(edge._p1);
                 silhouetteIndices.push_back(edge._p2);
@@ -765 +765 @@
         // directional light.
         osg::Vec3 lightdirection( -lightpos.x(), -lightpos.y(), -lightpos.z());
-        
+
         // OSG_NOTICE<<"Directional light"<<std::endl;
-        
+
         // choose the base plane
         const osg::Polytope::PlaneList& planes = _boundingPolytope.getPlaneList();
@@ -787 +787 @@
         UIntList silhouetteIndices;
         computeLightDirectionSilhouetteEdges(lightdirection, silhouetteIndices);
-        
+
         osg::Vec3 offset( lightdirection*5.0f );
-        
+
         float directionScale = 1.0f / basePlane.dotProductNormal(lightdirection);
-        
+
         for(UIntList::iterator itr = silhouetteIndices.begin();
             itr != silhouetteIndices.end();
@@ -829 +829 @@
         UIntList silhouetteIndices;
         computeLightPositionSilhouetteEdges(lightposition, silhouetteIndices);
-        
+
         // OSG_NOTICE<<"basePlane "<<basePlane[0]<<" "<<basePlane[1]<<" "<<basePlane[2]<<" "<<basePlane[3]<<std::endl;
         // OSG_NOTICE<<"lightpos  = "<<std::endl;
@@ -840 +840 @@
             const osg::Vec3& v1 = _vertices[*itr++];
             const osg::Vec3& v2 = _vertices[*itr++];
-            
+
             osg::Vec3 d1 = v1 - lightposition;
             osg::Vec3 d2 = v2 - lightposition;
@@ -893 +893 @@
 
     renderInfo.getState()->setVertexPointer( 3, GL_FLOAT, 0, &(_vertices.front()) );
-    
+
     if (!_normals.empty())
     {
@@ -937 +937 @@
     {
         osg::State* state = renderInfo.getState();
-        
+
         state->disableAllVertexArrays();
 
@@ -959 +959 @@
     {
         osg::State* state = renderInfo.getState();
-        
+
         state->disableAllVertexArrays();
         state->setVertexPointer( 3, GL_FLOAT, 0, &(_vertices.front()) );
@@ -968 +968 @@
 
         glDrawArrays( GL_QUADS, 0, _vertices.size() );
-        
+
         // draw back faces of shadow volume
         glCullFace(GL_FRONT);
@@ -974 +974 @@
 
         glDrawArrays( GL_QUADS, 0, _vertices.size() );
-        
+
         state->haveAppliedAttribute(osg::StateAttribute::CULLFACE);
         state->haveAppliedAttribute(osg::StateAttribute::STENCIL);
@@ -982 +982 @@
     {
         osg::State* state = renderInfo.getState();
-        
+
         state->disableAllVertexArrays();
         state->setVertexPointer( 3, GL_FLOAT, 0, &(_vertices.front()) );