Show
Ignore:
Timestamp:
04/27/15 21:31:13 (8 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/osgWrappers/deprecated-dotosg/osg/StateSet.cpp

    r13217 r14044  
    9494            return false; 
    9595        } 
    96              
     96 
    9797    } 
    9898 
     
    445445            if (StateSet_matchModeStr(fr[1].getStr(),value)) 
    446446            { 
    447                 StateAttribute::GLMode mode; 
     447                StateAttribute::GLMode mode=0; 
    448448                if (s_ModesAndNames.getGLModeForName(fr[0].getStr(), mode)) 
    449449                { 
     
    524524                    if (StateSet_matchModeStr(fr[1].getStr(),value)) 
    525525                    { 
    526                         StateAttribute::GLMode mode; 
     526                        StateAttribute::GLMode mode=0; 
    527527                        if (s_ModesAndNames.getGLModeForName(fr[0].getStr(), mode)) 
    528528                        {