From bb6678726fe170309c3b1f7fb938af02621245f0 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Wed, 10 Aug 2016 17:42:19 +1000
Subject: [PATCH] matrix: rename translate/rotate to translation/rotation

---
 matrix.cpp |  8 ++++----
 matrix.hpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/matrix.cpp b/matrix.cpp
index 63167538..4471ecbf 100644
--- a/matrix.cpp
+++ b/matrix.cpp
@@ -349,16 +349,16 @@ matrix<S,T>::look_at (util::point<3,T> eye,
 //-----------------------------------------------------------------------------
 template <size_t S, typename T>
 matrix4<T>
-matrix<S,T>::translate (util::vector<2,T> v)
+matrix<S,T>::translation (util::vector<2,T> v)
 {
-    return translate ({v.x, v.y, 0});
+    return translation ({v.x, v.y, 0});
 }
 
 
 //-----------------------------------------------------------------------------
 template <size_t S, typename T>
 matrix4<T>
-matrix<S,T>::translate (util::vector<3,T> v)
+matrix<S,T>::translation (util::vector<3,T> v)
 {
     return { {
         { 1.f, 0.f, 0.f, v.x },
@@ -394,7 +394,7 @@ matrix<S,T>::scale (util::vector<3,T> v)
 //-----------------------------------------------------------------------------
 template <size_t S, typename T>
 matrix4<T>
-matrix<S,T>::rotate (T angle, util::vector<3,T> about)
+matrix<S,T>::rotation (T angle, util::vector<3,T> about)
 {
     about.normalise ();
 
diff --git a/matrix.hpp b/matrix.hpp
index 81d5da50..c87ebcc3 100644
--- a/matrix.hpp
+++ b/matrix.hpp
@@ -70,11 +70,11 @@ namespace util {
         static matrix<4,T> look_at (point<3,T> eye, point<3,T> centre, vector<3,T> up);
 
         // Affine matrices
-        static matrix<4,T> translate (util::vector<2,T>);
-        static matrix<4,T> translate (util::vector<3,T>);
-        static matrix<4,T> scale     (util::vector<3,T>);
-        static matrix<4,T> scale     (T);
-        static matrix<4,T> rotate    (T angle, util::vector<3,T> about);
+        static matrix<4,T> translation (util::vector<2,T>);
+        static matrix<4,T> translation (util::vector<3,T>);
+        static matrix<4,T> scale       (util::vector<3,T>);
+        static matrix<4,T> scale       (T);
+        static matrix<4,T> rotation    (T angle, util::vector<3,T> about);
 
         // Constant matrices
         static const matrix IDENTITY;