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/examples/osgviewerQt/osgviewerQt.cpp

    r12529 r13482  
    1 #include <QtCore/QTimer> 
    2 #include <QtGui/QApplication> 
    3 #include <QtGui/QGridLayout> 
     1#include <QTimer> 
     2#include <QApplication> 
     3#include <QGridLayout> 
    44 
    55#include <osgViewer/CompositeViewer> 
     
    2020    { 
    2121        setThreadingModel(threadingModel); 
     22         
     23        // disable the default setting of viewer.done() by pressing Escape. 
     24        setKeyEventSetsDone(0); 
    2225 
    2326        QWidget* widget1 = addViewWidget( createCamera(0,0,100,100), osgDB::readNodeFile("cow.osgt") );