Reviews

Author: schaumb

src/base/geom/triangle.cpp

@@ -1,8 +1,11 @@
 #include "triangle.h"
 
+#include <algorithm>
 #include <cmath>
 #include <compare>
 
+#include "base/math/floating.h"
+
 #include "line.h"
 
 namespace Geom
@@ -26,12 +29,16 @@ double Triangle::distance(const Point &point) const
 	using std::is_gteq;
 	using std::is_lteq;
 	using std::is_neq;
-	if (auto r1 = rot_dir(points[0], points[1], point),
-	    r2 = rot_dir(points[1], points[2], point),
-	    r3 = rot_dir(points[2], points[0], point);
-	    (is_neq(r1) || is_neq(r2) || is_neq(r3))
-	    && ((is_lteq(r1) && is_lteq(r2) && is_lteq(r3))
-	        || (is_gteq(r1) && is_gteq(r2) && is_gteq(r3))))
+	const auto r1 = rot_dir(points[0], points[1], point);
+	const auto r2 = rot_dir(points[1], points[2], point);
+	const auto r3 = rot_dir(points[2], points[0], point);
+
+	if (const auto non_singular =
+	        is_neq(r1) || is_neq(r2) || is_neq(r3),
+	    rotate_to_same_dir =
+	        (is_lteq(r1) && is_lteq(r2) && is_lteq(r3))
+	        || (is_gteq(r1) && is_gteq(r2) && is_gteq(r3));
+	    non_singular && rotate_to_same_dir)
 		return 0.0;
 
 	return std::min({Line{points[0], points[1]}.distance(point),

src/chart/animator/planner.cpp

@@ -123,14 +123,13 @@ void Planner::createPlan(const Gen::Plot &source,
 		addMorph(SectionId::coordSystem, std::max(step, posDuration));
 
 		const ::Anim::Easing *geomEasing{&inOut5};
-		if (auto &&targetCircle =
-		        trgOpt->geometry == Gen::ShapeType::circle;
-		    srcOpt->geometry == Gen::ShapeType::circle
-		    || (!targetCircle
-		        && srcOpt->geometry == Gen::ShapeType::line))
+		if (srcOpt->geometry == Gen::ShapeType::circle)
 			geomEasing = &in3;
-		else if (targetCircle
-		         || trgOpt->geometry == Gen::ShapeType::line)
+		else if (trgOpt->geometry == Gen::ShapeType::circle)
+			geomEasing = &out3;
+		else if (srcOpt->geometry == Gen::ShapeType::line)
+			geomEasing = &in3;
+		else if (trgOpt->geometry == Gen::ShapeType::line)
 			geomEasing = &out3;
 
 		addMorph(SectionId::geometry,