FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed the computePosition so it find intersections more easily.

Browse Source
This commit is contained in:
Robert Osfield 2004-07-12 21:32:33 +00:00
parent 0acbe077fa
commit d57697fefa
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/osgGA/TerrainManipulator.cpp
View File

@ -235,7 +235,7 @@ void TerrainManipulator::setByMatrix(const osg::Matrixd& matrix)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segLookVector.get());
if (!hitList.empty())
{
notify(INFO) << "Hit terrain ok A"<< std::endl;
notify(NOTICE) << "Hit terrain ok A"<< std::endl;
osg::Vec3d ip = hitList.front().getWorldIntersectPoint();
_center = ip;
@ -272,7 +272,7 @@ void TerrainManipulator::setByMatrix(const osg::Matrixd& matrix)
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segLookVector.get());
if (!hitList.empty())
{
notify(INFO) << "Hit terrain ok B"<< std::endl;
notify(NOTICE) << "Hit terrain ok B"<< std::endl;
osg::Vec3d ip = hitList.front().getWorldIntersectPoint();
_center = ip;
@ -311,30 +311,42 @@ void TerrainManipulator::computePosition(const osg::Vec3d& eye,const osg::Vec3d&
_distance = lv.length();
_center = center;
osg::notify(osg::NOTICE) << "In compute"<< std::endl;
if (_node.valid())
{
// compute the itersection with the scene.
osgUtil::IntersectVisitor iv;
osg::ref_ptr<osg::LineSegment> segLookVector = new osg::LineSegment;
segLookVector->set(eye,center);
iv.addLineSegment(segLookVector.get());
_node->accept(iv);
bool hitFound = false;
if (iv.hits())
float distance = lv.length();
float maxDistance = distance+(eye-_node->getBound().center()).length();
osg::Vec3 farPosition = eye+lv*(maxDistance/distance);
osg::Vec3 endPoint = center;
for(int i=0;
!hitFound && i<2;
++i, endPoint = farPosition)
{
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segLookVector.get());
if (!hitList.empty())
// compute the itersection with the scene.
osgUtil::IntersectVisitor iv;
osg::ref_ptr<osg::LineSegment> segLookVector = new osg::LineSegment;
segLookVector->set(eye,endPoint );
iv.addLineSegment(segLookVector.get());
_node->accept(iv);
if (iv.hits())
{
osg::notify(osg::INFO) << "Hit terrain ok C"<< std::endl;
osg::Vec3d ip = hitList.front().getWorldIntersectPoint();
osgUtil::IntersectVisitor::HitList& hitList = iv.getHitList(segLookVector.get());
if (!hitList.empty())
{
osg::notify(osg::INFO) << "Hit terrain ok C"<< std::endl;
osg::Vec3d ip = hitList.front().getWorldIntersectPoint();
_center = ip;
_distance = (ip-eye).length();
_center = ip;
_distance = (ip-eye).length();
hitFound = true;
hitFound = true;
}
}
}
}