From 1e4fb66a89b00ec8af49713088b3b5b4e4b8b901 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Thu, 1 Oct 2020 09:44:23 +0300 Subject: [PATCH] Move generic lerp to math.hpp --- libs/geom/include/psemek/geom/math.hpp | 6 ++++++ libs/geom/include/psemek/geom/vector.hpp | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/geom/include/psemek/geom/math.hpp b/libs/geom/include/psemek/geom/math.hpp index d4e7969e..65750306 100644 --- a/libs/geom/include/psemek/geom/math.hpp +++ b/libs/geom/include/psemek/geom/math.hpp @@ -23,4 +23,10 @@ namespace psemek::geom return static_cast((x * pi) / 180); } + template + T lerp(T const & x0, T const & x1, T const & t) + { + return x0 * (T(1) - t) + x1 * t; + } + } diff --git a/libs/geom/include/psemek/geom/vector.hpp b/libs/geom/include/psemek/geom/vector.hpp index 8287b6ff..55ea1e42 100644 --- a/libs/geom/include/psemek/geom/vector.hpp +++ b/libs/geom/include/psemek/geom/vector.hpp @@ -256,12 +256,6 @@ namespace psemek::geom return ort(v0, v1); } - template - T lerp(T const & x0, T const & x1, T const & t) - { - return x0 * (T(1) - t) + x1 * t; - } - template vector lerp(vector const & v0, vector const & v1, T const & t) {