Show
Ignore:
Timestamp:
04/27/15 21:31:13 (5 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/osgPlugins/ive/DataInputStream.cpp

    r13041 r13502  
    588588    char c = readChar(); 
    589589 
    590     if (_verboseOutput) std::cout<<"read/writeBinding() ["<<(int)c<<"]"<<std::endl; 
     590    if (_verboseOutput) std::cout<<"readBinding() ["<<(int)c<<"]"<<std::endl; 
    591591 
    592592    switch((int)c){ 
    593593        case 0:    return osg::Geometry::BIND_OFF; 
    594594        case 1: return osg::Geometry::BIND_OVERALL; 
    595         case 2: return osg::Geometry::BIND_PER_PRIMITIVE; 
     595        case 2: return 3 /*osg::Geometry::BIND_PER_PRIMITIVE*/; 
    596596        case 3: return osg::Geometry::BIND_PER_PRIMITIVE_SET; 
    597597        case 4: return osg::Geometry::BIND_PER_VERTEX;