From e06d009cdbcff920eced66e2a1e1b38327f3e84d Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmat@mail.ru>
Date: Sat, 27 Feb 2021 06:22:33 +0700
Subject: [PATCH] less translate function variants

---
 README.md                       | 12 ------------
 headers/vmath.hpp/vmath_ext.hpp | 28 ++++------------------------
 untests/vmath_fix_tests.cpp     |  4 ----
 3 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/README.md b/README.md
index 24ff266..c6a8cd9 100644
--- a/README.md
+++ b/README.md
@@ -1799,12 +1799,6 @@ qua<T> imag(qua<T> q, const vec<T, 3>& imag);
 ### Matrix Transform 3D
 
 ```cpp
-template < typename T >
-mat<T, 4> translate(T x, T y, T z);
-
-template < typename T >
-mat<T, 4> translate(const mat<T, 4>& m, T x, T y, T z);
-
 template < typename T >
 mat<T, 4> translate(const vec<T, 3>& v);
 
@@ -1869,12 +1863,6 @@ mat<T, 4> look_at_rh(const vec<T, 3>& eye, const vec<T, 3>& at, const vec<T, 3>&
 ### Matrix Transform 2D
 
 ```cpp
-template < typename T >
-mat<T, 3> translate(T x, T y);
-
-template < typename T >
-mat<T, 3> translate(const mat<T, 3>& m, T x, T y);
-
 template < typename T >
 mat<T, 3> translate(const vec<T, 2>& v);
 
diff --git a/headers/vmath.hpp/vmath_ext.hpp b/headers/vmath.hpp/vmath_ext.hpp
index a253aeb..d328b5c 100644
--- a/headers/vmath.hpp/vmath_ext.hpp
+++ b/headers/vmath.hpp/vmath_ext.hpp
@@ -233,7 +233,7 @@ namespace vmath_hpp
     // translate
 
     template < typename T >
-    [[nodiscard]] constexpr mat<T, 4> translate(T x, T y, T z) {
+    [[nodiscard]] constexpr mat<T, 4> translate(const vec<T, 3>& v) {
         /// REFERENCE:
         /// https://en.wikipedia.org/wiki/Translation_(geometry)
 
@@ -241,17 +241,7 @@ namespace vmath_hpp
             { T{1}, T{0}, T{0}, T{0} },
             { T{0}, T{1}, T{0}, T{0} },
             { T{0}, T{0}, T{1}, T{0} },
-            {   x,    y,    z,  T{1} }};
-    }
-
-    template < typename T >
-    [[nodiscard]] constexpr mat<T, 4> translate(const mat<T, 4>& m, T x, T y, T z) {
-        return m * translate(x, y, z);
-    }
-
-    template < typename T >
-    [[nodiscard]] constexpr mat<T, 4> translate(const vec<T, 3>& v) {
-        return translate(v.x, v.y, v.z);
+            { v.x,  v.y,  v.z,  T{1} }};
     }
 
     template < typename T >
@@ -519,24 +509,14 @@ namespace vmath_hpp
     // translate
 
     template < typename T >
-    [[nodiscard]] constexpr mat<T, 3> translate(T x, T y) {
+    [[nodiscard]] constexpr mat<T, 3> translate(const vec<T, 2>& v) {
         /// REFERENCE:
         /// https://en.wikipedia.org/wiki/Translation_(geometry)
 
         return {
             { T{1}, T{0}, T{0} },
             { T{0}, T{1}, T{0} },
-            {   x,    y,  T{1} }};
-    }
-
-    template < typename T >
-    [[nodiscard]] constexpr mat<T, 3> translate(const mat<T, 3>& m, T x, T y) {
-        return m * translate(x, y);
-    }
-
-    template < typename T >
-    [[nodiscard]] constexpr mat<T, 3> translate(const vec<T, 2>& v) {
-        return translate(v.x, v.y);
+            { v.x,  v.y,  T{1} }};
     }
 
     template < typename T >
diff --git a/untests/vmath_fix_tests.cpp b/untests/vmath_fix_tests.cpp
index 33fc7f6..e76fdc8 100644
--- a/untests/vmath_fix_tests.cpp
+++ b/untests/vmath_fix_tests.cpp
@@ -383,8 +383,6 @@ namespace vmath_hpp
 
 namespace vmath_hpp
 {
-    template fix4x4f translate(fix<float> x, fix<float> y, fix<float> z);
-    template fix4x4f translate(const fix4x4f&, fix<float>, fix<float>, fix<float>);
     template fix4x4f translate(const fix3f&);
     template fix4x4f translate(const fix4x4f&, const fix3f&);
 
@@ -420,8 +418,6 @@ namespace vmath_hpp
 
 namespace vmath_hpp
 {
-    template fix3x3f translate(fix<float>, fix<float>);
-    template fix3x3f translate(const fix3x3f&, fix<float>, fix<float>);
     template fix3x3f translate(const fix2f&);
     template fix3x3f translate(const fix3x3f&, const fix2f&);