Changeset 13041 for OpenSceneGraph/trunk/src/osgUtil/CullVisitor.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/osgUtil/CullVisitor.cpp (modified) (76 diffs)

OpenSceneGraph/trunk/src/osgUtil/CullVisitor.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.
 */
@@ -85 +85 @@
 CullVisitor* CullVisitor::create()
 {
-    return CullVisitor::prototype().valid() ? 
+    return CullVisitor::prototype().valid() ?
            CullVisitor::prototype()->clone() :
-           new CullVisitor; 
+           new CullVisitor;
 }
 
@@ -96 +96 @@
     // first unref all referenced objects and then empty the containers.
     //
-    
+
     CullStack::reset();
-    
+
     _renderBinStack.clear();
 
@@ -109 +109 @@
     _computed_znear = FLT_MAX;
     _computed_zfar = -FLT_MAX;
-    
-    
+
+
     osg::Vec3 lookVector(0.0,0.0,-1.0);
-    
+
     _bbCornerFar = (lookVector.x()>=0?1:0) |
                    (lookVector.y()>=0?2:0) |
@@ -118 +118 @@
 
     _bbCornerNear = (~_bbCornerFar)&7;
-    
+
     // Only reset the RenderLeaf objects used last frame.
     for(RenderLeafList::iterator itr=_reuseRenderLeafList.begin(),
@@ -127 +127 @@
         (*itr)->reset();
     }
-    
+
     // reset the resuse lists.
     _currentReuseRenderLeafIndex = 0;
@@ -156 +156 @@
     const Matrix& matrix = *_modelviewStack.back();
     float dist = distance(pos,matrix);
-    
+
     if (withLODScale) return dist*getLODScale();
     else return dist;
@@ -168 +168 @@
 #if 0
         osg::Timer_t start_t = osg::Timer::instance()->tick();
-#endif   
+#endif
         // update near from defferred list of drawables
         unsigned int numTests = 0;
@@ -183 +183 @@
 #if 0
                 OSG_NOTICE<<"   updating znear to "<<d_near<<std::endl;
-#endif          
-            }
-        } 
+#endif
+            }
+        }
 
 #if 0
@@ -222 +222 @@
 #if 0
     OSG_NOTICE<<"  result _computed_znear="<<_computed_znear<<", _computed_zfar="<<_computed_zfar<<std::endl;
-#endif    
+#endif
 }
 
@@ -238 +238 @@
         // so it doesn't cull them out.
         osg::Matrix& projection = *_projectionStack.back();
-        
+
         value_type tmp_znear = _computed_znear;
         value_type tmp_zfar = _computed_zfar;
-        
+
         clampProjectionMatrix(projection, tmp_znear, tmp_zfar);
     }
@@ -264 +264 @@
         return false;
     }
-    
+
     if (zfar<znear+epsilon)
     {
@@ -304 +304 @@
         value_type znearPullRatio = 0.98;
 
-        //znearPullRatio = 0.99; 
+        //znearPullRatio = 0.99;
 
         value_type desired_znear = znear * znearPullRatio;
@@ -362 +362 @@
 
     Comparator                      _comparator;
-    
+
     CullVisitor::value_type         _znear;
     osg::Matrix                     _matrix;
@@ -368 +368 @@
     Polygon                         _polygonOriginal;
     Polygon                         _polygonNew;
-    
+
     Polygon                         _pointCache;
 
@@ -404 +404 @@
             }
             //OSG_NOTICE<<"Point ok w.r.t plane "<<d1<<std::endl;
-        }        
-    
+        }
+
         _znear = n1;
         //OSG_NOTICE<<"Near plane updated "<<_znear<<std::endl;
@@ -455 +455 @@
                 active_mask = active_mask | selector_mask;
             }
-            
+
             //OSG_NOTICE<<"Line ok w.r.t plane "<<d1<<"\t"<<d2<<std::endl;
 
-            selector_mask <<= 1; 
-        }        
-    
+            selector_mask <<= 1;
+        }
+
         if (active_mask==0)
         {
@@ -468 +468 @@
             return;
         }
-        
+
         //OSG_NOTICE<<"Using brute force method of line cutting frustum walls"<<std::endl;
         DistancePoint p1(0, v1);
         DistancePoint p2(0, v2);
-        
+
         selector_mask = 0x1;
 
@@ -480 +480 @@
         {
             if (active_mask & selector_mask)
-            {    
+            {
                 // clip line to plane
                 const osg::Plane& plane = *pitr;
@@ -497 +497 @@
                         float r = p1.first/(p1.first-p2.first);
                         p2 = DistancePoint(0.0f, p1.second*(1.0f-r) + p2.second*r);
-                        
+
                     }
                 }
@@ -509 +509 @@
                 // The case where both are out was handled above.
             }
-            selector_mask <<= 1; 
+            selector_mask <<= 1;
         }
 
@@ -533 +533 @@
             return;
         }
-      
-        
+
+
         if (n1 < 0.0 &&
             n2 < 0.0 &&
@@ -568 +568 @@
                 active_mask = active_mask | selector_mask;
             }
-            
+
             //OSG_NOTICE<<"Triangle ok w.r.t plane "<<d1<<"\t"<<d2<<"\t"<<d3<<std::endl;
 
-            selector_mask <<= 1; 
-        }        
-    
+            selector_mask <<= 1;
+        }
+
         if (active_mask==0)
         {
@@ -582 +582 @@
             return;
         }
-        
+
         //return;
-    
+
         // numPartiallyInside>0) so we have a triangle cutting an frustum wall,
-        // this means that use brute force methods for dividing up triangle. 
-        
+        // this means that use brute force methods for dividing up triangle.
+
         //OSG_NOTICE<<"Using brute force method of triangle cutting frustum walls"<<std::endl;
         _polygonOriginal.clear();
@@ -593 +593 @@
         _polygonOriginal.push_back(DistancePoint(0,v2));
         _polygonOriginal.push_back(DistancePoint(0,v3));
-        
+
         selector_mask = 0x1;
-        
+
         for(pitr = _planes->begin();
             pitr != _planes->end() && !_polygonOriginal.empty();
@@ -601 +601 @@
         {
             if (active_mask & selector_mask)
-            {    
+            {
                 // polygon bisects plane so need to divide it up.
                 const osg::Plane& plane = *pitr;
@@ -613 +613 @@
                     polyItr->first = plane.distance(polyItr->second);
                 }
-                
-                // create the new polygon by clamping against the 
+
+                // create the new polygon by clamping against the
                 unsigned int psize = _polygonOriginal.size();
 
@@ -624 +624 @@
                     {
                         _polygonNew.push_back(_polygonOriginal[ci]);
-                        
+
                         if (_polygonOriginal[ni].first<0.0f) computeIntersection = true;
                     }
@@ -639 +639 @@
                 _polygonOriginal.swap(_polygonNew);
             }
-            selector_mask <<= 1; 
+            selector_mask <<= 1;
         }
 
@@ -690 +690 @@
     osg::TemplatePrimitiveFunctor<ComputeNearestPointFunctor> cnpf;
     cnpf.set(FLT_MAX, matrix, &planes);
-    
+
     drawable.accept(cnpf);
 
@@ -718 +718 @@
     {
         std::swap(d_near,d_far);
-        if ( !EQUAL_F(d_near, d_far) ) 
+        if ( !EQUAL_F(d_near, d_far) )
         {
             OSG_WARN<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
@@ -745 +745 @@
     if (isBillboard)
     {
-    
-#ifdef TIME_BILLBOARD_NEAR_FAR_CALCULATION    
+
+#ifdef TIME_BILLBOARD_NEAR_FAR_CALCULATION
         static unsigned int lastFrameNumber = getTraversalNumber();
         static unsigned int numBillboards = 0;
@@ -759 +759 @@
         osg::Timer_t start_t = osg::Timer::instance()->tick();
 #endif
-        
+
         osg::Vec3 lookVector(-matrix(0,2),-matrix(1,2),-matrix(2,2));
 
@@ -802 +802 @@
         }
 
-#ifdef TIME_BILLBOARD_NEAR_FAR_CALCULATION    
+#ifdef TIME_BILLBOARD_NEAR_FAR_CALCULATION
         osg::Timer_t end_t = osg::Timer::instance()->tick();
-        
+
         elapsed_time += osg::Timer::instance()->delta_m(start_t,end_t);
         ++numBillboards;
@@ -816 +816 @@
         d_far = distance(bb.corner(_bbCornerFar),matrix);
     }
-    
+
     if (d_near>d_far)
     {
         std::swap(d_near,d_far);
-        if ( !EQUAL_F(d_near, d_far) ) 
+        if ( !EQUAL_F(d_near, d_far) )
         {
             OSG_WARN<<"Warning: CullVisitor::updateCalculatedNearFar(.) near>far in range calculation,"<< std::endl;
@@ -865 +865 @@
                     }
                 }
-                
+
                 // use the far point if its nearer than current znear as this is a conservative estimate of the znear
                 // while the final computation for this drawable is deferred.
@@ -929 +929 @@
     }
 
-    if (d<_computed_znear) 
+    if (d<_computed_znear)
     {
        _computed_znear = d;
@@ -935 +935 @@
     }
     if (d>_computed_zfar) _computed_zfar = d;
-}   
+}
 
 void CullVisitor::apply(Node& node)
@@ -943 +943 @@
     // push the culling mode.
     pushCurrentMask();
-    
+
     // push the node's state.
     StateSet* node_state = node.getStateSet();
@@ -950 +950 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
-    
+
     // pop the culling mode.
     popCurrentMask();
@@ -980 +980 @@
             continue;
         }
-        
+
         //else
         {
@@ -987 +987 @@
 
 
-        if (_computeNearFar && bb.valid()) 
+        if (_computeNearFar && bb.valid())
         {
             if (!updateCalculatedNearFar(matrix,*drawable,false)) continue;
@@ -995 +995 @@
         unsigned int numPopStateSetRequired = 0;
 
-        // push the geoset's state on the geostate stack.    
+        // push the geoset's state on the geostate stack.
         StateSet* stateset = drawable->getStateSet();
         if (stateset)
@@ -1020 +1020 @@
 
         float depth = bb.valid() ? distance(bb.center(),matrix) : 0.0f;
-        
+
         if (osg::isNaN(depth))
         {
@@ -1033 +1033 @@
         }
         else
-        {        
+        {
             addDrawableAndDepth(drawable,&matrix,depth);
         }
@@ -1044 +1044 @@
     }
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
 
@@ -1098 +1098 @@
         StateSet* stateset = drawable->getStateSet();
         if (stateset) pushStateSet(stateset);
-        
+
         if (osg::isNaN(depth))
         {
@@ -1111 +1111 @@
         }
         else
-        {        
+        {
             addDrawableAndDepth(drawable,billboard_matrix,depth);
         }
@@ -1119 +1119 @@
     }
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
 
@@ -1148 +1148 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
 }
@@ -1177 +1177 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
 }
@@ -1197 +1197 @@
         addPositionedTextureAttribute(node.getTextureUnit(), 0 ,node.getTexGen());
     }
-    
+
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the geostate stack.    
+    // pop the node's state off the geostate stack.
     if (node_state) popStateSet();
 }
@@ -1217 +1217 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1238 +1238 @@
     node.computeLocalToWorldMatrix(*matrix,this);
     pushModelViewMatrix(matrix.get(), node.getReferenceFrame());
-    
+
     handle_cull_callbacks_and_traverse(node);
 
     popModelViewMatrix();
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1264 +1264 @@
     float previous_znear = _computed_znear;
     float previous_zfar = _computed_zfar;
-    
+
     // take a copy of the current near plane candidates
     DistanceMatrixDrawableMap  previousNearPlaneCandidateMap;
@@ -1278 +1278 @@
     ref_ptr<RefMatrix> matrix = createOrReuseMatrix(node.getMatrix());
     pushProjectionMatrix(matrix.get());
-    
+
     //OSG_INFO<<"Push projection "<<*matrix<<std::endl;
-    
+
     // note do culling check after the frustum has been updated to ensure
     // that the node is not culled prematurely.
@@ -1299 +1299 @@
     previousFarPlaneCandidateMap.swap(_farPlaneCandidateMap);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1325 +1325 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1353 +1353 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1364 +1364 @@
 {
     public:
-    
+
         RenderStageCache() {}
         RenderStageCache(const RenderStageCache&, const osg::CopyOp&) {}
-        
+
         META_Object(osgUtil, RenderStageCache);
-        
+
         void setRenderStage(CullVisitor* cv, RenderStage* rs)
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
             _renderStageMap[cv] = rs;
-        }        
+        }
 
         RenderStage* getRenderStage(osgUtil::CullVisitor* cv)
@@ -1381 +1381 @@
             return _renderStageMap[cv].get();
         }
-        
+
         typedef std::map<CullVisitor*, osg::ref_ptr<RenderStage> > RenderStageMap;
-        
+
         /** Resize any per context GLObject buffers to specified size. */
         virtual void resizeGLObjectBuffers(unsigned int maxSize)
@@ -1479 +1479 @@
             modelview = createOrReuseMatrix(*getModelViewMatrix()*camera.getViewMatrix());
         }
-        else // pre multiply 
+        else // pre multiply
         {
             projection = createOrReuseMatrix(camera.getProjectionMatrix()*(*getProjectionMatrix()));
@@ -1498 +1498 @@
     value_type previous_znear = _computed_znear;
     value_type previous_zfar = _computed_zfar;
-    
+
     // take a copy of the current near plane candidates
     DistanceMatrixDrawableMap  previousNearPlaneCandidateMap;
@@ -1510 +1510 @@
 
     pushProjectionMatrix(projection);
-    pushModelViewMatrix(modelview, camera.getReferenceFrame());    
+    pushModelViewMatrix(modelview, camera.getReferenceFrame());
 
 
@@ -1534 +1534 @@
             camera.setRenderingCache(rsCache.get());
         }
-        
+
         osg::ref_ptr<osgUtil::RenderStage> rtts = rsCache->getRenderStage(this);
         if (!rtts)
         {
             OpenThreads::ScopedLock<OpenThreads::Mutex> lock(*(camera.getDataChangeMutex()));
-        
+
             rtts = new osgUtil::RenderStage;
             rsCache->setRenderStage(this,rtts.get());
@@ -1554 +1554 @@
                 rtts->setDrawBuffer(camera.getDrawBuffer());
             }
-            
+
             if ( camera.getInheritanceMask() & READ_BUFFER )
             {
@@ -1571 +1571 @@
         }
 
-        // set up clera masks/values        
+        // set up clera masks/values
         rtts->setClearDepth(camera.getClearDepth());
         rtts->setClearAccum(camera.getClearAccum());
@@ -1596 +1596 @@
         }
 
-        
+
         // set the color mask.
         osg::ColorMask* colorMask = camera.getColorMask()!=0 ? camera.getColorMask() : previous_stage->getColorMask();
@@ -1604 +1604 @@
         osg::Viewport* viewport = camera.getViewport()!=0 ? camera.getViewport() : previous_stage->getViewport();
         rtts->setViewport( viewport );
-        
+
         // set initial view matrix
         rtts->setInitialViewMatrix(modelview);
@@ -1629 +1629 @@
         // restore the previous renderbin.
         setCurrentRenderBin(previousRenderBin);
-     
+
 
         if (rtts->getStateGraphList().size()==0 && rtts->getRenderBinList().size()==0)
@@ -1651 +1651 @@
 
     }
-    
+
     // restore the previous model view matrix.
     popModelViewMatrix();
@@ -1676 +1676 @@
     setCullSettings(saved_cull_settings);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1686 +1686 @@
     // list, if so disable the appropriate ShadowOccluderVolume
     disableAndPushOccludersCurrentMask(_nodePath);
-    
+
 
     if (isCulled(node))
@@ -1705 +1705 @@
     handle_cull_callbacks_and_traverse(node);
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();
 
@@ -1728 +1728 @@
 
     osg::Camera* camera = getCurrentCamera();
-    
+
     // If previous query indicates visible, then traverse as usual.
     if (node.getPassed( camera, *this ))
@@ -1740 +1740 @@
 
 
-    // pop the node's state off the render graph stack.    
+    // pop the node's state off the render graph stack.
     if (node_state) popStateSet();