Changeset 8559

Show
Ignore:
Timestamp:
07/11/08 18:50:43
Author:
robert
Message:

Tweaked the KdTree? intersection performance testing code block

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/src/osgViewer/View.cpp

    r8550 r8559  
    18271827#else     
    18281828 
    1829     // timing test code paths 
     1829    // timing test code paths for comparing KdTree based intersections vs conventional intersections 
    18301830 
    18311831    iv.setUseKdTreeWhenAvailable(true); 
    …… 
    18331833 
    18341834    const_cast<osg::Camera*>(camera)->accept(iv); 
     1835     
    18351836 
    18361837    osg::Timer_t before = osg::Timer::instance()->tick(); 
    …… 
    18381839 
    18391840    osg::Timer_t after_dummy = osg::Timer::instance()->tick(); 
     1841 
     1842    int intersectsBeforeKdTree = picker->getIntersections().size(); 
    18401843 
    18411844    iv.setDoDummyTraversal(false); 
    …… 
    18431846    osg::Timer_t after_kdTree_2 = osg::Timer::instance()->tick(); 
    18441847 
     1848    int intersectsBeforeConventional = picker->getIntersections().size(); 
     1849 
    18451850    iv.setUseKdTreeWhenAvailable(false); 
    18461851    const_cast<osg::Camera*>(camera)->accept(iv); 
    18471852    osg::Timer_t after = osg::Timer::instance()->tick(); 
    18481853     
     1854    int intersectsAfterConventional = picker->getIntersections().size(); 
     1855 
    18491856    double timeDummy = osg::Timer::instance()->delta_m(before, after_dummy); 
    18501857    double timeKdTree = osg::Timer::instance()->delta_m(after_dummy, after_kdTree_2); 
    …… 
    18521859     
    18531860    osg::notify(osg::NOTICE)<<"Using Dummy                    "<<timeDummy<<std::endl; 
    1854     osg::notify(osg::NOTICE)<<"      KdTrees                  "<<timeKdTree<<std::endl; 
     1861    osg::notify(osg::NOTICE)<<"      KdTrees                  "<<timeKdTree 
     1862                            <<"\tNum intersects = "<<intersectsBeforeConventional-intersectsBeforeKdTree<<std::endl; 
    18551863    osg::notify(osg::NOTICE)<<"      KdTrees - Traversal      "<<timeKdTree-timeDummy<<std::endl; 
    1856     osg::notify(osg::NOTICE)<<"      Conventional             "<<timeConventional<<std::endl; 
     1864    osg::notify(osg::NOTICE)<<"      Conventional             "<<timeConventional 
     1865                            <<"\tNum intersects = "<<intersectsAfterConventional-intersectsBeforeConventional<<std::endl; 
    18571866    osg::notify(osg::NOTICE)<<"      Conventional - Traversal "<<timeConventional-timeDummy<<std::endl; 
    18581867    osg::notify(osg::NOTICE)<<"      Delta                    "<<timeConventional/timeKdTree<<std::endl;