Remove segmentedfunc.tpp

Author: schaumb

src/base/anim/easing.cpp

@@ -16,10 +16,10 @@ Easing::Easing(const std::string &name)
 {
 	if (name.empty()) return;
 
-	auto nameCopy = name;
-	Text::SmartString::trim(nameCopy);
-
-	if (nameCopy == "none") { func = &Easing::none; }
+	if (auto nameCopy = Text::SmartString::trim_view(name);
+	    nameCopy == "none") {
+		func = &Easing::none;
+	}
 	else if (nameCopy == "linear") {
 		func = &Easing::linear;
 	}
@@ -45,7 +45,7 @@ Easing::Easing(const std::string &name)
 		func = EasingGradient::Bezier(Geom::Point{0.42, 0},
 		    Geom::Point{0.58, 1});
 	}
-	else if (const Text::FuncString f(nameCopy);
+	else if (const Text::FuncString f(name);
 	         f.getName() == "cubic-bezier") {
 		if (f.getParams().size() != 4)
 			throw std::logic_error("parameter count missmatch");

src/base/anim/easinggradient.cpp

@@ -6,10 +6,6 @@
 
 #include "base/geom/bezier.h"
 #include "base/geom/point.h"
-#include "base/math/segmentedfunc.h"
-#include "base/math/segmentedfunc.tpp"
-
-template struct Math::SegmentedFunction<double, Anim::EasingGradient>;
 
 namespace Anim
 {

src/base/gfx/color.cpp

@@ -47,24 +47,18 @@ Color Color::fromString(const std::string &string)
 	if (const Text::FuncString f(string); !f.isEmpty()) {
 		using Conv::parse;
 
-		if (f.getName() == "rgb") {
-			auto ps = f.getParams();
-			if (ps.size() != 3)
-				throw std::logic_error("invalid color string");
+		auto &&ps = f.getParams();
+		if (f.getName() == "rgb" && ps.size() == 3) {
 			return RGBA(parse<uint32_t>(ps.at(0)),
 			    parse<uint32_t>(ps.at(1)),
 			    parse<uint32_t>(ps.at(2)));
 		}
-		if (f.getName() == "rgba") {
-			auto ps = f.getParams();
-			if (ps.size() != 4)
-				throw std::logic_error("invalid color string");
+		if (f.getName() == "rgba" && ps.size() == 4) {
 			return RGBA(parse<uint32_t>(ps.at(0)),
 			    parse<uint32_t>(ps.at(1)),
 			    parse<uint32_t>(ps.at(2)),
 			    static_cast<uint8_t>(parse<double>(ps.at(3)) * 255));
 		}
-		throw std::logic_error("invalid color string");
 	}
 	throw std::logic_error("invalid color string");
 }

src/base/gfx/colorgradient.cpp

@@ -4,32 +4,25 @@
 #include <stdexcept>
 #include <string>
 
-#include "base/math/segmentedfunc.h"
-#include "base/math/segmentedfunc.tpp"
 #include "base/text/smartstring.h"
 
 #include "color.h"
 
-template struct Math::SegmentedFunction<Gfx::Color,
-    Gfx::ColorGradient>;
-
 namespace Gfx
 {
 
 ColorGradient::ColorGradient(const std::string &stoplist)
 {
-	auto stopStrings = Text::SmartString::split(stoplist, ',', true);
-	auto pos = 0.0;
-	for (auto &stopString : stopStrings) {
-		auto parts = Text::SmartString::split(stopString, ' ', true);
-		if (parts.size() == 2) {
-			pos = std::stod(parts[1]);
-			stops.emplace_back(pos, Color::fromString(parts[0]));
-		}
+	for (const auto &stopString :
+	    Text::SmartString::split(stoplist, ',', true))
+		if (auto &&parts =
+		        Text::SmartString::split(stopString, ' ', true);
+		    parts.size() == 2)
+			stops.emplace_back(std::stod(parts[1]),
+			    Color::fromString(parts[0]));
 		else
 			throw std::logic_error(
 			    "invalid gradient stop: " + stopString);
-	}
 }
 
 ColorGradient::operator std::string() const

src/base/math/segmentedfunc.h

@@ -3,6 +3,9 @@
 
 #include <vector>
 
+#include "interpolation.h"
+#include "range.h"
+
 namespace Math
 {
 
@@ -65,7 +68,24 @@ template <typename T, class CRTP> struct SegmentedFunction
 	[[nodiscard]] bool operator==(
 	    const SegmentedFunction &other) const = default;
 
-	[[nodiscard]] T operator()(double pos) const;
+	[[nodiscard]] T operator()(double pos) const
+	{
+		if (stops.empty()) return T();
+		if (stops.size() == 1 || pos < stops.front().pos)
+			return stops.front().value;
+
+		if (auto it = std::ranges::adjacent_find(stops,
+		        [pos](auto &&cur, auto &&next)
+		        {
+			        return cur.pos <= pos && pos <= next.pos;
+		        });
+		    it != stops.end())
+			return interpolate(it->value,
+			    std::next(it)->value,
+			    Range{it->pos, std::next(it)->pos}.rescale(pos));
+
+		return stops.back().value;
+	}
 };
 
 }