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

Updated KdTree code to refect new cleaned up API

Browse Source
This commit is contained in:
Robert Osfield 2008-07-11 16:51:11 +00:00
parent 9866eb93f8
commit 61a81d8e06
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/osgUtil/LineSegmentIntersector.cpp
View File

@ -301,6 +301,7 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
if (kdTree) if (kdTree)
{ {
osg::KdTree::LineSegmentIntersections intersections; osg::KdTree::LineSegmentIntersections intersections;
intersections.reserve(4);
if (kdTree->intersect(s,e,intersections)) if (kdTree->intersect(s,e,intersections))
{ {
// osg::notify(osg::NOTICE)<<"Got KdTree intersections"<<std::endl; // osg::notify(osg::NOTICE)<<"Got KdTree intersections"<<std::endl;
@ -308,7 +309,7 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
itr != intersections.end(); itr != intersections.end();
++itr) ++itr)
{ {
osg::KdTree::LineSegmentIntersection& lsi = const_cast<osg::KdTree::LineSegmentIntersection&>(*itr); osg::KdTree::LineSegmentIntersection& lsi = *(itr);
// get ratio in s,e range // get ratio in s,e range
double ratio = lsi.ratio; double ratio = lsi.ratio;
@ -330,11 +331,27 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
hit.localIntersectionNormal = lsi.intersectionNormal; hit.localIntersectionNormal = lsi.intersectionNormal;
hit.indexList.swap(lsi.indexList); hit.indexList.reserve(3);
hit.ratioList.swap(lsi.ratioList); hit.ratioList.reserve(3);
if (lsi.r0!=0.0f)
{
hit.indexList.push_back(lsi.p0);
hit.ratioList.push_back(lsi.r0);
}
if (lsi.r1!=0.0f)
{
hit.indexList.push_back(lsi.p1);
hit.ratioList.push_back(lsi.r1);
}
if (lsi.r2!=0.0f)
{
hit.indexList.push_back(lsi.p2);
hit.ratioList.push_back(lsi.r2);
}
insertIntersection(hit); insertIntersection(hit);
} }
} }