Changeset 8411 for OpenSceneGraph/trunk/examples/osgkdtree/osgkdtree.cpp

Timestamp:

06/05/08 20:52:29 (5 years ago)

Author:

robert

Message:

Added timing code

Files:

• OpenSceneGraph/trunk/examples/osgkdtree/osgkdtree.cpp (modified) (18 diffs)

OpenSceneGraph/trunk/examples/osgkdtree/osgkdtree.cpp

@@ -63 +63 @@
         }
 
-        typedef int value_type;
+        typedef short value_type;
 
         value_type _leftChild;
@@ -234 +234 @@
             osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
             _maxNumLevels(24),
-            _targetNumVerticesPerLeaf(8)            
+            _targetNumVerticesPerLeaf(8),
+            _numVerticesProcessed(0)
         {            
         }
@@ -258 +259 @@
 
         unsigned int _maxNumLevels;
-        unsigned int _targetNumVerticesPerLeaf;        
+        unsigned int _targetNumVerticesPerLeaf;
+        
+        unsigned int _numVerticesProcessed;   
 
 };
@@ -265 +268 @@
 KDTree* KDTreeBuilder::createKDTree(osg::Geometry* geometry)
 {
+#if VERBOSE_OUTPUT    
     osg::notify(osg::NOTICE)<<"osg::KDTreeBuilder::createKDTree()"<<std::endl;
+#endif
 
     osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(geometry->getVertexArray());
@@ -277 +282 @@
     unsigned int estimatedSize = (unsigned int)(float(vertices->size())/float(_targetNumVerticesPerLeaf)*1.5);
 
+#if VERBOSE_OUTPUT    
     osg::notify(osg::NOTICE)<<"kdTree->_kdNodes.reserve()="<<estimatedSize<<std::endl<<std::endl;
+#endif
 
     kdTree->_kdNodes.reserve(estimatedSize);
@@ -284 +291 @@
     computeDivisions(*kdTree);
 
+
+    _numVerticesProcessed += vertices->size();
+
     // create initial leaf list    
-    osg::ref_ptr<KDLeaf> leaf = new KDLeaf;
+    KDLeaf* leaf = new KDLeaf;
     leaf->_vertexIndices.reserve(vertices->size());
     for(unsigned int i=0; i<vertices->size(); ++i)
@@ -294 +304 @@
     osg::BoundingBox bb = kdTree->_bb;
     
-    int leafNum = kdTree->addLeaf(leaf.get());
+    int leafNum = kdTree->addLeaf(leaf);
     int nodeNum = divide(*kdTree, bb, leafNum, 0);
     
+#if VERBOSE_OUTPUT    
     osg::notify(osg::NOTICE)<<"Root nodeNum="<<nodeNum<<std::endl;
-    
+#endif
+    
+#if VERBOSE_OUTPUT    
     
     KDTreeTraverser traverser;
@@ -307 +320 @@
 
     osg::notify(osg::NOTICE)<<"osg::KDTreeBuilder::createKDTree() completed"<<std::endl<<std::endl;
+#endif
 
     return kdTree.release();
@@ -319 +333 @@
                          kdTree._bb.zMax()-kdTree._bb.zMin());
 
+#if VERBOSE_OUTPUT    
     osg::notify(osg::NOTICE)<<"computeDivisions("<<_maxNumLevels<<") "<<dimensions<< " { "<<std::endl;
+#endif
 
     kdTree._axisStack.reserve(_maxNumLevels);
@@ -338 +354 @@
         dimensions[axis] /= 2.0f;
 
+#if VERBOSE_OUTPUT    
         osg::notify(osg::NOTICE)<<"  "<<level<<", "<<dimensions<<", "<<axis<<std::endl;
+#endif
     }
 
+#if VERBOSE_OUTPUT    
     osg::notify(osg::NOTICE)<<"}"<<std::endl;
+#endif
 }
 
@@ -351 +371 @@
     int axis = kdTree._axisStack[level];
 
-    osg::notify(osg::NOTICE)<<"divide("<<nodeIndex<<", "<<level<< "), axis="<<axis<<std::endl;
+#if VERBOSE_OUTPUT    
+    //osg::notify(osg::NOTICE)<<"divide("<<nodeIndex<<", "<<level<< "), axis="<<axis<<std::endl;
+#endif
 
     if (nodeIndex>=0)
     {
+#if VERBOSE_OUTPUT    
         osg::notify(osg::NOTICE)<<"  divide node"<<std::endl;
+#endif
         KDNode& node = kdTree.getNode(nodeIndex);
         return nodeIndex;
@@ -363 +387 @@
         if (kdTree.getLeaf(nodeIndex)->_vertexIndices.size()<=_targetNumVerticesPerLeaf) return nodeIndex;
     
-        osg::notify(osg::NOTICE)<<"  divide leaf"<<std::endl;
+        //osg::notify(osg::NOTICE)<<"  divide leaf"<<std::endl;
         
         int nodeNum = kdTree.addNode(KDNode());
@@ -382 +406 @@
             osg::Vec3Array* vertices = dynamic_cast<osg::Vec3Array*>(kdTree._geometry->getVertexArray());
 
-            osg::notify(osg::NOTICE)<<"  divide leaf->_vertexIndices.size()="<<leaf->_vertexIndices.size()<<std::endl;
+            //osg::notify(osg::NOTICE)<<"  divide leaf->_vertexIndices.size()="<<leaf->_vertexIndices.size()<<std::endl;
 
             unsigned int estimatedSize = leaf->_vertexIndices.size();
@@ -398 +422 @@
             if (leftLeaf->_vertexIndices.empty())
             {
-                osg::notify(osg::NOTICE)<<"LeftLeaf empty"<<std::endl;
+                //osg::notify(osg::NOTICE)<<"LeftLeaf empty"<<std::endl;
                 kdTree.getNode(nodeNum)._leftChild = 0;
                 kdTree.getNode(nodeNum)._rightChild = kdTree.replaceLeaf(nodeIndex, rightLeaf.get());
@@ -404 +428 @@
             else if (rightLeaf->_vertexIndices.empty())
             {
-                osg::notify(osg::NOTICE)<<"RightLeaf empty"<<std::endl;
+                //osg::notify(osg::NOTICE)<<"RightLeaf empty"<<std::endl;
                 kdTree.getNode(nodeNum)._leftChild = kdTree.replaceLeaf(nodeIndex, leftLeaf.get());
                 kdTree.getNode(nodeNum)._rightChild = 0;
@@ -424 +448 @@
         bb._max[axis] = mid;
 
-        osg::notify(osg::NOTICE)<<"  divide leftLeaf "<<kdTree.getNode(nodeNum)._leftChild<<std::endl;
+        //osg::notify(osg::NOTICE)<<"  divide leftLeaf "<<kdTree.getNode(nodeNum)._leftChild<<std::endl;
         int leftChildIndex = divide(kdTree, bb, originalLeftChildIndex, level+1);
 
@@ -432 +456 @@
         bb._min[axis] = mid;
 
-        osg::notify(osg::NOTICE)<<"  divide rightLeaf "<<kdTree.getNode(nodeNum)._rightChild<<std::endl;
+        //osg::notify(osg::NOTICE)<<"  divide rightLeaf "<<kdTree.getNode(nodeNum)._rightChild<<std::endl;
         int rightChildIndex = divide(kdTree, bb, originalRightChildIndex, level+1);
         
@@ -460 +484 @@
         return 0;
     }
+
+
+    osg::Timer_t start = osg::Timer::instance()->tick();
     
     osg::KDTreeBuilder builder;
     scene->accept(builder);
     
+    osg::Timer_t end = osg::Timer::instance()->tick();
+    double time = osg::Timer::instance()->delta_s(start,end);
+    osg::notify(osg::NOTICE)<<"Time to build "<<time*1000.0<<"ms "<<builder._numVerticesProcessed<<std::endl;
+    osg::notify(osg::NOTICE)<<"build speed "<<(double(builder._numVerticesProcessed)/time)/1000000.0<<"M vertices per second"<<std::endl;