From fb0d926a73d5e98e8c778b8701f8ee4fa4023da6 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Wed, 23 Sep 2020 22:25:28 +0300 Subject: [PATCH] Fix geom::intersection template argument deduction issues --- libs/geom/include/psemek/geom/intersection.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/geom/include/psemek/geom/intersection.hpp b/libs/geom/include/psemek/geom/intersection.hpp index 81519de3..5cc16b79 100644 --- a/libs/geom/include/psemek/geom/intersection.hpp +++ b/libs/geom/include/psemek/geom/intersection.hpp @@ -79,9 +79,9 @@ namespace psemek::geom return p; } else if (s0_is_first) - return segment{ s1[0], s0[1] }; + return simplex{ s1[0], s0[1] }; 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 (intersect(segment{t0[0], t0[1]}, segment{t1[0], t1[1]})) return true; - if (intersect(segment{t0[0], t0[1]}, segment{t1[1], t1[2]})) return true; - if (intersect(segment{t0[1], t0[2]}, segment{t1[0], t1[1]})) return true; - if (intersect(segment{t0[1], t0[2]}, segment{t1[1], t1[2]})) return true; - if (intersect(segment{t0[2], t0[0]}, segment{t1[0], t1[1]})) return true; - if (intersect(segment{t0[2], t0[0]}, segment{t1[1], t1[2]})) return true; + if (intersect(simplex{t0[0], t0[1]}, simplex{t1[0], t1[1]})) return true; + if (intersect(simplex{t0[0], t0[1]}, simplex{t1[1], t1[2]})) return true; + if (intersect(simplex{t0[1], t0[2]}, simplex{t1[0], t1[1]})) return true; + if (intersect(simplex{t0[1], t0[2]}, simplex{t1[1], t1[2]})) return true; + if (intersect(simplex{t0[2], t0[0]}, simplex{t1[0], t1[1]})) return true; + if (intersect(simplex{t0[2], t0[0]}, simplex{t1[1], t1[2]})) return true; return false; }