Changeset 13430

Show
Ignore:
Timestamp:
04/27/15 21:31:13 (11 hours ago)
Author:
robert
Message:

Renamed LineSegment::intersect(BoundingSphere/Box?, double/float&, double/float&) methods to LineSegment::intersectAndComputeRations(..) to avoid confusion with the change in convention for
the old intersect(BoundingBox?&, float/double&, float/double&) method as it was inconsitent with the rest of the OSG including the intersect(BoundingSphere?) method in how the ratio for the
second intersection was measure from - original from the end point, but now made consistent with other places in the OSG so be based on ration from start to end of segment.

Location:
OpenSceneGraph/trunk/src/osgViewer
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgViewer/CompositeViewer.cpp

    r13429 r13430  
    913913    if (_views.empty()) return; 
    914914 
    915 #if 1 
    916915    double cutOffTime = _frameStamp->getReferenceTime(); 
    917 #else     
    918     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    919 #endif 
    920916 
    921917    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick()); 
  • OpenSceneGraph/trunk/src/osgViewer/Viewer.cpp

    r13429 r13430  
    827827    if (_done) return; 
    828828 
    829 #if 1 
    830829    double cutOffTime = _frameStamp->getReferenceTime(); 
    831 #else     
    832     double cutOffTime = (_runFrameScheme==ON_DEMAND) ? DBL_MAX : _frameStamp->getReferenceTime(); 
    833 #endif 
    834830     
    835831    double beginEventTraversal = osg::Timer::instance()->delta_s(_startTick, osg::Timer::instance()->tick());