From 44883e022635cd8b3793f5c83c9bf3fa6359c9d8 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Sun, 30 Aug 2020 21:19:16 +0300 Subject: [PATCH] Make segment & triangle aliases instead of subclasses --- libs/geom/include/psemek/geom/contains.hpp | 2 +- libs/geom/include/psemek/geom/simplex.hpp | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/libs/geom/include/psemek/geom/contains.hpp b/libs/geom/include/psemek/geom/contains.hpp index c59eacff..3fb65f00 100644 --- a/libs/geom/include/psemek/geom/contains.hpp +++ b/libs/geom/include/psemek/geom/contains.hpp @@ -25,7 +25,7 @@ namespace psemek::geom } template - bool contains(triangle> const & t, point const & p) + bool contains(simplex, 2> const & t, point const & p) { return true && orientation(t[0], t[1], p) != sign_t::negative diff --git a/libs/geom/include/psemek/geom/simplex.hpp b/libs/geom/include/psemek/geom/simplex.hpp index 977548d5..39483864 100644 --- a/libs/geom/include/psemek/geom/simplex.hpp +++ b/libs/geom/include/psemek/geom/simplex.hpp @@ -29,20 +29,10 @@ namespace psemek::geom simplex(Args ...) -> simplex, sizeof...(Args) - 1>; template - struct segment - : simplex - {}; + using segment = simplex; template - segment(Point, Point) -> segment; - - template - struct triangle - : simplex - {}; - - template - triangle(Point, Point, Point) -> triangle; + using triangle = simplex; template Stream & operator << (Stream & os, simplex const & s)