Rename functions: CreateLerp() => Lerp()

mogemimi · Dec 24, 2015 · e0f19a4 · e0f19a4
1 parent 1ba5c18
commit e0f19a4
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix3x2.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix3x2.hpp
@@ -72,6 +72,14 @@ class POMDOG_EXPORT FloatingPointMatrix3x2 {
     static FloatingPointMatrix3x2
     Invert(FloatingPointMatrix3x2 const& matrix);
 
+    static void
+    Lerp(FloatingPointMatrix3x2 const& source1, FloatingPointMatrix3x2 const& source2,
+        T amount, FloatingPointMatrix3x2 & result) noexcept;
+
+    static FloatingPointMatrix3x2
+    Lerp(FloatingPointMatrix3x2 const& source1, FloatingPointMatrix3x2 const& source2,
+        T amount) noexcept;
+
     static void
     CreateTranslation(FloatingPointVector2<T> const& position, FloatingPointMatrix3x2 & result) noexcept;
 
@@ -102,14 +110,6 @@ class POMDOG_EXPORT FloatingPointMatrix3x2 {
     static FloatingPointMatrix3x2
     CreateSkew(FloatingPointVector2<T> const& skew);
 
-    static void
-    CreateLerp(FloatingPointMatrix3x2 const& source1, FloatingPointMatrix3x2 const& source2,
-        T amount, FloatingPointMatrix3x2 & result) noexcept;
-
-    static FloatingPointMatrix3x2
-    CreateLerp(FloatingPointMatrix3x2 const& source1, FloatingPointMatrix3x2 const& source2,
-        T amount) noexcept;
-
     ///@brief Returns pointer to the first element.
     T const* Data() const noexcept;
 

diff --git a/include/Pomdog/Math/detail/FloatingPointMatrix3x3.hpp b/include/Pomdog/Math/detail/FloatingPointMatrix3x3.hpp
@@ -87,6 +87,14 @@ class POMDOG_EXPORT FloatingPointMatrix3x3 {
     static FloatingPointMatrix3x3
     Invert(FloatingPointMatrix3x3 const& matrix);
 
+    static void
+    Lerp(FloatingPointMatrix3x3 const& source1, FloatingPointMatrix3x3 const& source2,
+        T amount, FloatingPointMatrix3x3 & result) noexcept;
+
+    static FloatingPointMatrix3x3
+    Lerp(FloatingPointMatrix3x3 const& source1, FloatingPointMatrix3x3 const& source2,
+        T amount) noexcept;
+
     static void
     CreateTranslation(FloatingPointVector2<T> const& position, FloatingPointMatrix3x3 & result) noexcept;
 
@@ -129,14 +137,6 @@ class POMDOG_EXPORT FloatingPointMatrix3x3 {
     static FloatingPointMatrix3x3
     CreateFromQuaternion(FloatingPointQuaternion<T> const& quaternion);
 
-    static void
-    CreateLerp(FloatingPointMatrix3x3 const& source1, FloatingPointMatrix3x3 const& source2,
-        T amount, FloatingPointMatrix3x3 & result) noexcept;
-
-    static FloatingPointMatrix3x3
-    CreateLerp(FloatingPointMatrix3x3 const& source1, FloatingPointMatrix3x3 const& source2,
-        T amount) noexcept;
-
     static void
     CreateFromAxisAngle(FloatingPointVector3<T> const& axis, Radian<T> const& angle, FloatingPointMatrix3x3 & result);
 

diff --git a/src/Math/detail/FloatingPointMatrix3x2.cpp b/src/Math/detail/FloatingPointMatrix3x2.cpp
@@ -356,7 +356,7 @@ FloatingPointMatrix3x2<T>::CreateSkew(FloatingPointVector2<T> const& skew)
 //-----------------------------------------------------------------------
 template <typename T>
 void
-FloatingPointMatrix3x2<T>::CreateLerp(FloatingPointMatrix3x2 const& source1,
+FloatingPointMatrix3x2<T>::Lerp(FloatingPointMatrix3x2 const& source1,
     FloatingPointMatrix3x2 const& source2, T amount, FloatingPointMatrix3x2 & result) noexcept
 {
     result.m[0][0] = source1.m[0][0] + ((source2.m[0][0] - source1.m[0][0]) * amount);
@@ -369,11 +369,11 @@ FloatingPointMatrix3x2<T>::CreateLerp(FloatingPointMatrix3x2 const& source1,
 //-----------------------------------------------------------------------
 template <typename T>
 FloatingPointMatrix3x2<T>
-FloatingPointMatrix3x2<T>::CreateLerp(FloatingPointMatrix3x2 const& source1,
+FloatingPointMatrix3x2<T>::Lerp(FloatingPointMatrix3x2 const& source1,
     FloatingPointMatrix3x2 const& source2, T amount) noexcept
 {
     FloatingPointMatrix3x2 result;
-    CreateLerp(source1, source2, amount, result);
+    Lerp(source1, source2, amount, result);
     return std::move(result);
 }
 //-----------------------------------------------------------------------

diff --git a/src/Math/detail/FloatingPointMatrix3x3.cpp b/src/Math/detail/FloatingPointMatrix3x3.cpp
@@ -560,7 +560,7 @@ FloatingPointMatrix3x3<T>::CreateFromQuaternion(FloatingPointQuaternion<T> const
 //-----------------------------------------------------------------------
 template <typename T>
 void
-FloatingPointMatrix3x3<T>::CreateLerp(FloatingPointMatrix3x3 const& source1,
+FloatingPointMatrix3x3<T>::Lerp(FloatingPointMatrix3x3 const& source1,
     FloatingPointMatrix3x3 const& source2, T amount, FloatingPointMatrix3x3 & result) noexcept
 {
     result.m[0][0] = source1.m[0][0] + ((source2.m[0][0] - source1.m[0][0]) * amount);
@@ -576,11 +576,11 @@ FloatingPointMatrix3x3<T>::CreateLerp(FloatingPointMatrix3x3 const& source1,
 //-----------------------------------------------------------------------
 template <typename T>
 FloatingPointMatrix3x3<T>
-FloatingPointMatrix3x3<T>::CreateLerp(FloatingPointMatrix3x3 const& source1,
+FloatingPointMatrix3x3<T>::Lerp(FloatingPointMatrix3x3 const& source1,
     FloatingPointMatrix3x3 const& source2, T amount) noexcept
 {
     FloatingPointMatrix3x3 result;
-    CreateLerp(source1, source2, amount, result);
+    Lerp(source1, source2, amount, result);
     return std::move(result);
 }
 //-----------------------------------------------------------------------