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

Removed redudent bool parameter from TriangleFunctor::operator(Vec3, Vec3, Vec3, bool) so it's now simply TriangleFunctor::operator(Vec3, Vec3, Vec3) as the bool was always false in recently OSG versions.

Browse Source
This commit is contained in:
Robert Osfield
2017-04-27 16:18:27 +01:00
parent 48a3fc30f3
commit c9545970ac
10 changed files with 54 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgUtil/LineSegmentIntersector.cpp
View File

@@ -95,7 +95,7 @@ namespace LineSegmentIntersectorUtils
_d /= _length;
}
inline void operator () (const osg::Vec3& v1,const osg::Vec3& v2,const osg::Vec3& v3, bool treatVertexDataAsTemporary)
inline void operator () (const osg::Vec3& v1,const osg::Vec3& v2,const osg::Vec3& v3)
{
++_index;
@@ -194,14 +194,7 @@ namespace LineSegmentIntersectorUtils
value_type r = d/_length;
if (treatVertexDataAsTemporary)
{
_intersections->insert(std::pair<const float,TriangleIntersection>(r,TriangleIntersection(_index-1,normal,r1,0,r2,0,r3,0)));
}
else
{
_intersections->insert(std::pair<const float,TriangleIntersection>(r,TriangleIntersection(_index-1,normal,r1,&v1,r2,&v2,r3,&v3)));
}
_intersections->insert(std::pair<const float,TriangleIntersection>(r,TriangleIntersection(_index-1,normal,r1,&v1,r2,&v2,r3,&v3)));
_hit = true;
}