Change to CRTP

Author: schaumb

src/base/anim/easinggradient.cpp

@@ -9,7 +9,7 @@
 #include "base/math/segmentedfunc.h"
 #include "base/math/segmentedfunc.tpp"
 
-template struct Math::SegmentedFunction<double>;
+template struct Math::SegmentedFunction<double, Anim::EasingGradient>;
 
 namespace Anim
 {

src/base/anim/easinggradient.h

@@ -9,7 +9,8 @@
 namespace Anim
 {
 
-class EasingGradient : protected Math::SegmentedFunction<double>
+class EasingGradient :
+    protected Math::SegmentedFunction<double, EasingGradient>
 {
 public:
 	friend struct SegmentedFunction;

src/base/gfx/colorgradient.cpp

@@ -10,15 +10,8 @@
 
 #include "color.h"
 
-template struct Math::SegmentedFunction<Gfx::Color>;
-template Gfx::ColorGradient
-Math::SegmentedFunction<Gfx::Color>::operator*<Gfx::ColorGradient>(
-    this const Gfx::ColorGradient &,
-    double value);
-template Gfx::ColorGradient
-Math::SegmentedFunction<Gfx::Color>::operator+<Gfx::ColorGradient>(
-    this const Gfx::ColorGradient &,
-    const Gfx::ColorGradient &);
+template struct Math::SegmentedFunction<Gfx::Color,
+    Gfx::ColorGradient>;
 
 namespace Gfx
 {

src/base/gfx/colorgradient.h

@@ -10,7 +10,7 @@
 namespace Gfx
 {
 
-struct ColorGradient : Math::SegmentedFunction<Color>
+struct ColorGradient : Math::SegmentedFunction<Color, ColorGradient>
 {
 	static ColorGradient HeatMap5Color();
 	static ColorGradient HeatMap7Color();

src/base/math/segmentedfunc.h

@@ -6,7 +6,7 @@
 namespace Math
 {
 
-template <typename T> struct SegmentedFunction
+template <typename T, class CRTP> struct SegmentedFunction
 {
 	struct Stop
 	{
@@ -26,11 +26,41 @@ template <typename T> struct SegmentedFunction
 	    stops(std::move(stops))
 	{}
 
-	template <class Self>
-	[[nodiscard]] Self operator*(this const Self &, double);
+	[[nodiscard]] friend CRTP operator*(const CRTP &self,
+	    double value)
+	{
+		auto res = self;
+		for (auto &stop : res.stops) stop.value = stop.value * value;
+		return res;
+	}
+
+	[[nodiscard]] friend CRTP operator+(const CRTP &self,
+	    const CRTP &other)
+	{
+		CRTP res;
+		auto &stops = self.stops;
 
-	template <class Self>
-	[[nodiscard]] Self operator+(this const Self &, const Self &);
+		for (auto it0 = stops.begin(), it1 = other.stops.begin();
+		     it0 != stops.end() || it1 != other.stops.end();) {
+			if (it1 == other.stops.end() || it0->pos < it1->pos) {
+				res.stops.emplace_back(it0->pos,
+				    it0->value + other(it0->pos));
+				++it0;
+			}
+			else if (it0 == stops.end() || it1->pos < it0->pos) {
+				res.stops.emplace_back(it1->pos,
+				    it1->value + self(it1->pos));
+				++it1;
+			}
+			else {
+				res.stops.emplace_back(it0->pos,
+				    it0->value + it1->value);
+				++it1;
+				++it0;
+			}
+		}
+		return res;
+	}
 
 	[[nodiscard]] bool operator==(
 	    const SegmentedFunction &other) const = default;

src/base/math/segmentedfunc.tpp

@@ -8,8 +8,8 @@
 
 #include "segmentedfunc.h"
 
-template <typename T>
-T Math::SegmentedFunction<T>::operator()(double pos) const
+template <typename T, class CRTP>
+T Math::SegmentedFunction<T, CRTP>::operator()(double pos) const
 {
 	if (stops.empty()) return T();
 	if (stops.size() == 1 || pos < stops.front().pos)
@@ -28,43 +28,4 @@ T Math::SegmentedFunction<T>::operator()(double pos) const
 	return stops.back().value;
 }
 
-template <typename T>
-template <class Self>
-Self Math::SegmentedFunction<T>::operator*(this const Self &self,
-    double value)
-{
-	auto res = self;
-	for (auto &stop : res.stops) stop.value = stop.value * value;
-	return res;
-}
-
-template <typename T>
-template <class Self>
-Self Math::SegmentedFunction<T>::operator+(this const Self &self,
-    const Self &other)
-{
-	Self res;
-	auto &stops = self.stops;
-
-	for (auto it0 = stops.begin(), it1 = other.stops.begin();
-	     it0 != stops.end() || it1 != other.stops.end();) {
-		if (it1 == other.stops.end() || it0->pos < it1->pos) {
-			res.stops.emplace_back(it0->pos,
-			    it0->value + other(it0->pos));
-			++it0;
-		}
-		else if (it0 == stops.end() || it1->pos < it0->pos) {
-			res.stops.emplace_back(it1->pos,
-			    it1->value + self(it1->pos));
-			++it1;
-		}
-		else {
-			res.stops.emplace_back(it0->pos, it0->value + it1->value);
-			++it1;
-			++it0;
-		}
-	}
-	return res;
-}
-
 #endif