Show
Ignore:
Timestamp:
04/27/15 21:31:13 (19 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.

Files:
1 modified

Legend:

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

    r13041 r13130  
    464464        getState()->setGraphicsContext( this ); 
    465465 
    466         if (_traits.valid() && _traits->sharedContext ) 
     466        if (_traits.valid() && _traits->sharedContext.valid() ) 
    467467        { 
    468468            getState()->setContextID( _traits->sharedContext->getState()->getContextID() ); 
     
    659659    if (!_initialized) return false; 
    660660 
    661     if ( _traits->sharedContext ) 
    662     { 
    663         GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(_traits->sharedContext); 
     661    if ( _traits->sharedContext.valid() ) 
     662    { 
     663        GraphicsHandleWin32* graphicsHandleWin32 = dynamic_cast<GraphicsHandleWin32*>(_traits->sharedContext.get()); 
    664664        if (graphicsHandleWin32) 
    665665        {