lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix geom::intersection template argument deduction issues

Browse source
This commit is contained in:
Nikita Lisitsa 2020-09-23 22:25:28 +03:00
parent cf99917272
commit fb0d926a73
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/geom/include/psemek/geom/intersection.hpp
View file

@ -79,9 +79,9 @@ namespace psemek::geom
return p; return p;
} }
else if (s0_is_first) else if (s0_is_first)
return segment{ s1[0], s0[1] }; return simplex{ s1[0], s0[1] };
else else
return segment{ s0[0], s1[1] }; return simplex{ s0[0], s1[1] };
} }
} }
@ -92,12 +92,12 @@ namespace psemek::geom
if (contains(t1, t0[0]) || contains(t1, t0[1]) || contains(t1, t0[2])) return true; if (contains(t1, t0[0]) || contains(t1, t0[1]) || contains(t1, t0[2])) return true;
if (intersect(segment{t0[0], t0[1]}, segment{t1[0], t1[1]})) return true; if (intersect(simplex{t0[0], t0[1]}, simplex{t1[0], t1[1]})) return true;
if (intersect(segment{t0[0], t0[1]}, segment{t1[1], t1[2]})) return true; if (intersect(simplex{t0[0], t0[1]}, simplex{t1[1], t1[2]})) return true;
if (intersect(segment{t0[1], t0[2]}, segment{t1[0], t1[1]})) return true; if (intersect(simplex{t0[1], t0[2]}, simplex{t1[0], t1[1]})) return true;
if (intersect(segment{t0[1], t0[2]}, segment{t1[1], t1[2]})) return true; if (intersect(simplex{t0[1], t0[2]}, simplex{t1[1], t1[2]})) return true;
if (intersect(segment{t0[2], t0[0]}, segment{t1[0], t1[1]})) return true; if (intersect(simplex{t0[2], t0[0]}, simplex{t1[0], t1[1]})) return true;
if (intersect(segment{t0[2], t0[0]}, segment{t1[1], t1[2]})) return true; if (intersect(simplex{t0[2], t0[0]}, simplex{t1[1], t1[2]})) return true;
return false; return false;
} }