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

Improved the handling of KdTree intersections

Browse Source
This commit is contained in:
Robert Osfield
2008-07-07 14:27:58 +00:00
parent d05236bfb4
commit f1db402f2b
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/osgUtil/LineSegmentIntersector.cpp
View File

@@ -311,20 +311,20 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
double ratio = lsi.ratio;
// remap ratio into _start, _end range
ratio = ((s-_start).length() + ratio * (e-s).length() )/(_end-_start).length();
double remap_ratio = ((s-_start).length() + ratio * (e-s).length() )/(_end-_start).length();
Intersection hit;
hit.ratio = lsi.ratio;
hit.ratio = remap_ratio;
hit.matrix = iv.getModelMatrix();
hit.nodePath = iv.getNodePath();
hit.drawable = drawable;
hit.primitiveIndex = lsi.primitiveIndex;
#if 0
hit.localIntersectionPoint = lsi.intersectionPoint;
#else
hit.localIntersectionPoint = s*(1.0f-ratio) + e*ratio;
#endif
hit.localIntersectionPoint = _start*(1.0-remap_ratio) + _end*remap_ratio;
osg::notify(osg::NOTICE)<<"KdTree: ratio="<<hit.ratio<<" ("<<hit.localIntersectionPoint<<")"<<std::endl;
hit.localIntersectionNormal = lsi.intersectionNormal;
hit.indexList.swap(lsi.indexList);
@@ -370,11 +370,10 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
hit.drawable = drawable;
hit.primitiveIndex = triHit._index;
#if 1
hit.localIntersectionPoint = _start*(1.0-remap_ratio) + _end*remap_ratio;
#else
hit.localIntersectionPoint = s*(1.0-ratio) + e*ratio;
#endif
// osg::notify(osg::NOTICE)<<"Conventional: ratio="<<hit.ratio<<" ("<<hit.localIntersectionPoint<<")"<<std::endl;
hit.localIntersectionNormal = triHit._normal;
if (geometry)