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

Added support for vertex ratios into LineSegmentIntersector.

Browse Source
This commit is contained in:
Robert Osfield
2007-01-10 10:40:12 +00:00
parent 4954262eb0
commit c5082cb85c
4 changed files with 30 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/osgUtil/LineSegmentIntersector.cpp
View File

@@ -324,12 +324,24 @@ void LineSegmentIntersector::intersect(osgUtil::IntersectionVisitor& iv, osg::Dr
if (vertices)
{
osg::Vec3* first = &(vertices->front());
if (triHit._v1) hit.indexList.push_back(triHit._v1-first);
if (triHit._v2) hit.indexList.push_back(triHit._v2-first);
if (triHit._v3) hit.indexList.push_back(triHit._v3-first);
if (triHit._v1)
{
hit.indexList.push_back(triHit._v1-first);
hit.ratioList.push_back(triHit._r1);
}
if (triHit._v2)
{
hit.indexList.push_back(triHit._v2-first);
hit.ratioList.push_back(triHit._r2);
}
if (triHit._v3)
{
hit.indexList.push_back(triHit._v3-first);
hit.ratioList.push_back(triHit._r3);
}
}
}
insertIntersection(hit);
}

2
src/osgViewer/View.cpp
View File

@@ -413,8 +413,6 @@ bool View::computeIntersections(float x,float y, osg::NodePath& nodePath, osgUti
{
if (!_camera.valid()) return false;
osg::notify(osg::NOTICE)<<"View::computeIntersections(x,y,node,intersections) not implemented"<<std::endl;
osg::Matrix matrix = osg::computeWorldToLocal(nodePath) * _camera->getViewMatrix() * _camera->getProjectionMatrix();
double zNear = -1.0;