From ebe3570b968b4d3a45c2e08fb29ad220c933adf1 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Sat, 8 May 2021 22:01:57 +0300 Subject: [PATCH] Fix geom::intersection --- libs/geom/include/psemek/geom/intersection.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/geom/include/psemek/geom/intersection.hpp b/libs/geom/include/psemek/geom/intersection.hpp index 545bebe5..9af61ace 100644 --- a/libs/geom/include/psemek/geom/intersection.hpp +++ b/libs/geom/include/psemek/geom/intersection.hpp @@ -16,8 +16,8 @@ namespace psemek::geom { - template > - bool intersect(segment const & s0, segment const & s1) + template + bool intersect(segment> const & s0, segment> const & s1) { auto const o00 = orientation(s0[0], s0[1], s1[0]); auto const o01 = orientation(s0[0], s0[1], s1[1]); @@ -28,8 +28,8 @@ namespace psemek::geom } // TODO: robust implementation - template > - std::variant> intersection(segment s0, segment s1) + template + std::variant, segment>> intersection(segment> const & s0, segment> const & s1) { auto const a0 = -det(s1[0] - s0[0], s1[1] - s1[0]); auto const a1 = det(s0[1] - s0[0], s1[0] - s0[0]); @@ -77,7 +77,7 @@ namespace psemek::geom if (r0 == r1) { - Point p; + point p; p[k] = r0; p[1 - k] = s0_is_first ? s0[1][1 - k] : s1[1][1 - k]; return p;