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

Removed redundent _nodePath entry.

Browse Source
This commit is contained in:
Robert Osfield
2005-02-10 21:30:03 +00:00
parent 7fb8dfe5ed
commit 7282adef2b
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/osgUtil/IntersectVisitor
View File

@@ -186,7 +186,6 @@ class OSGUTIL_EXPORT IntersectVisitor : public osg::NodeVisitor
IntersectStateStack _intersectStateStack;
osg::NodePath _nodePath;
LineSegmentHitListMap _segHitList;
LODSelectionMode _lodSelectionMode;

17
src/osgUtil/IntersectVisitor.cpp
View File

@@ -176,7 +176,6 @@ void IntersectVisitor::reset()
// create a empty IntersectState on the the intersectStateStack.
_intersectStateStack.push_back(new IntersectState);
_nodePath.clear();
_segHitList.clear();
}
@@ -300,7 +299,6 @@ bool IntersectVisitor::enterNode(Node& node)
IntersectState::LineSegmentMask sm=0xffffffff;
if (cis->isCulled(bs,sm)) return false;
cis->_segmentMaskStack.push_back(sm);
_nodePath.push_back(&node);
return true;
}
else
@@ -314,7 +312,6 @@ void IntersectVisitor::leaveNode()
{
IntersectState* cis = _intersectStateStack.back().get();
cis->_segmentMaskStack.pop_back();
_nodePath.pop_back();
}
@@ -471,6 +468,13 @@ struct TriangleIntersect
}
Vec3 in = v1*r1+v2*r2+v3*r3;
if (!in.valid())
{
osg::notify(WARN)<<"Warning:: Picked up error in TriangleIntersect"<<std::endl;
osg::notify(WARN)<<" ("<<v1<<",\t"<<v2<<",\t"<<v3<<")"<<std::endl;
osg::notify(WARN)<<" ("<<r1<<",\t"<<r2<<",\t"<<r3<<")"<<std::endl;
return;
}
float d = (in-_s)*_d;
@@ -482,13 +486,6 @@ struct TriangleIntersect
float r = d/_length;
if (!in.valid())
{
osg::notify(WARN)<<"Warning:: Picked up error in TriangleIntersect"<<std::endl;
osg::notify(WARN)<<" ("<<v1<<",\t"<<v2<<",\t"<<v3<<")"<<std::endl;
osg::notify(WARN)<<" ("<<r1<<",\t"<<r2<<",\t"<<r3<<")"<<std::endl;
return;
}
if (treatVertexDataAsTemporary)
{