From 15fe4e84ccab723c391bee374cfa1b0708fdee6c Mon Sep 17 00:00:00 2001
From: Christophe Riccio <christophe.riccio@unity3d.com>
Date: Mon, 13 Aug 2018 21:51:47 +0200
Subject: [PATCH] More tests

---
 glm/ext/matrix_transform.hpp                  |  7 +++----
 glm/ext/matrix_transform.inl                  |  4 ----
 glm/ext/quaternion_relational.hpp             |  2 +-
 glm/ext/quaternion_transform.hpp              |  6 ++++--
 test/ext/CMakeLists.txt                       | 10 ++++-----
 test/ext/ext_matrix_transform.cpp             | 21 ++++++++++++++++++-
 ..._vector_bvec1.cpp => ext_vector_bool1.cpp} |  0
 ...ector_dvec1.cpp => ext_vector_double1.cpp} |  0
 ..._vector_vec1.cpp => ext_vector_float1.cpp} |  0
 ...t_vector_ivec1.cpp => ext_vector_int1.cpp} |  0
 ..._vector_uvec1.cpp => ext_vector_uint1.cpp} |  0
 11 files changed, 33 insertions(+), 17 deletions(-)
 rename test/ext/{ext_vector_bvec1.cpp => ext_vector_bool1.cpp} (100%)
 rename test/ext/{ext_vector_dvec1.cpp => ext_vector_double1.cpp} (100%)
 rename test/ext/{ext_vector_vec1.cpp => ext_vector_float1.cpp} (100%)
 rename test/ext/{ext_vector_ivec1.cpp => ext_vector_int1.cpp} (100%)
 rename test/ext/{ext_vector_uvec1.cpp => ext_vector_uint1.cpp} (100%)

diff --git a/glm/ext/matrix_transform.hpp b/glm/ext/matrix_transform.hpp
index 85041394..3e1aaadc 100644
--- a/glm/ext/matrix_transform.hpp
+++ b/glm/ext/matrix_transform.hpp
@@ -19,11 +19,10 @@
 #pragma once
 
 // Dependencies
-#include "../mat4x4.hpp"
-#include "../vec2.hpp"
-#include "../vec3.hpp"
-#include "../vec4.hpp"
 #include "../gtc/constants.hpp"
+#include "../geometric.hpp"
+#include "../trigonometric.hpp"
+#include "../matrix.hpp"
 
 #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_EXT_matrix_transform extension included")
diff --git a/glm/ext/matrix_transform.inl b/glm/ext/matrix_transform.inl
index bf7386eb..85c1eda3 100644
--- a/glm/ext/matrix_transform.inl
+++ b/glm/ext/matrix_transform.inl
@@ -1,7 +1,3 @@
-#include "../geometric.hpp"
-#include "../trigonometric.hpp"
-#include "../matrix.hpp"
-
 namespace glm
 {
 	template<typename genType>
diff --git a/glm/ext/quaternion_relational.hpp b/glm/ext/quaternion_relational.hpp
index 4018ea64..7bd8e610 100644
--- a/glm/ext/quaternion_relational.hpp
+++ b/glm/ext/quaternion_relational.hpp
@@ -2,7 +2,7 @@
 /// @file glm/ext/quaternion_relational.hpp
 ///
 /// @defgroup ext_quaternion_relational GLM_EXT_quaternion_relational
-/// @ingroup gtc
+/// @ingroup ext
 ///
 /// Include <glm/ext/quaternion_relational.hpp> to use the features of this extension.
 ///
diff --git a/glm/ext/quaternion_transform.hpp b/glm/ext/quaternion_transform.hpp
index 7b69ffa2..13727f58 100644
--- a/glm/ext/quaternion_transform.hpp
+++ b/glm/ext/quaternion_transform.hpp
@@ -3,7 +3,7 @@
 ///
 /// @see core (dependence)
 ///
-/// @defgroup ext_quaternion_common GLM_EXT_quaternion_transform
+/// @defgroup ext_quaternion_transform GLM_EXT_quaternion_transform
 /// @ingroup ext
 ///
 /// Include <glm/ext/quaternion_transform.hpp> to use the features of this extension.
@@ -31,7 +31,9 @@ namespace glm
 	/// @param q Source orientation
 	/// @param angle Angle expressed in radians.
 	/// @param axis Axis of the rotation
-	/// @tparam T Floating-point scalar types.
+	///
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
 	///
 	/// @see ext_quaternion_transform
 	template<typename T, qualifier Q>
diff --git a/test/ext/CMakeLists.txt b/test/ext/CMakeLists.txt
index c24faaad..541bbb03 100644
--- a/test/ext/CMakeLists.txt
+++ b/test/ext/CMakeLists.txt
@@ -12,9 +12,9 @@ glmCreateTestGTC(ext_scalar_int_sized)
 glmCreateTestGTC(ext_scalar_uint_sized)
 glmCreateTestGTC(ext_scalar_relational)
 glmCreateTestGTC(ext_vec1)
-glmCreateTestGTC(ext_vector_vec1)
-glmCreateTestGTC(ext_vector_bvec1)
-glmCreateTestGTC(ext_vector_dvec1)
-glmCreateTestGTC(ext_vector_ivec1)
-glmCreateTestGTC(ext_vector_uvec1)
+glmCreateTestGTC(ext_vector_bool1)
+glmCreateTestGTC(ext_vector_float1)
+glmCreateTestGTC(ext_vector_double1)
+glmCreateTestGTC(ext_vector_int1)
+glmCreateTestGTC(ext_vector_uint1)
 glmCreateTestGTC(ext_vector_relational)
diff --git a/test/ext/ext_matrix_transform.cpp b/test/ext/ext_matrix_transform.cpp
index 7fbceb74..19eca356 100644
--- a/test/ext/ext_matrix_transform.cpp
+++ b/test/ext/ext_matrix_transform.cpp
@@ -1,10 +1,29 @@
 #include <glm/ext/matrix_relational.hpp>
-//#include <glm/ext/matrix_transform.hpp>
+#include <glm/ext/matrix_transform.hpp>
+#include <glm/ext/matrix_float4x4.hpp>
+#include <glm/ext/vector_relational.hpp>
+#include <glm/ext/vector_float4.hpp>
+#include <glm/ext/vector_float3.hpp>
+
+static int test_translate()
+{
+	int Error = 0;
+
+	glm::mat4 const M(1.0f);
+	glm::vec3 const V(1.0f);
+
+	glm::mat4 const T = glm::translate(M, V);
+	Error += glm::all(glm::equal(T[3], glm::vec4(1.0f), glm::epsilon<float>())) ? 0 : 1;
+
+	return Error;
+}
+
 
 int main()
 {
 	int Error = 0;
 
+	Error += test_translate();
 
 	return Error;
 }
diff --git a/test/ext/ext_vector_bvec1.cpp b/test/ext/ext_vector_bool1.cpp
similarity index 100%
rename from test/ext/ext_vector_bvec1.cpp
rename to test/ext/ext_vector_bool1.cpp
diff --git a/test/ext/ext_vector_dvec1.cpp b/test/ext/ext_vector_double1.cpp
similarity index 100%
rename from test/ext/ext_vector_dvec1.cpp
rename to test/ext/ext_vector_double1.cpp
diff --git a/test/ext/ext_vector_vec1.cpp b/test/ext/ext_vector_float1.cpp
similarity index 100%
rename from test/ext/ext_vector_vec1.cpp
rename to test/ext/ext_vector_float1.cpp
diff --git a/test/ext/ext_vector_ivec1.cpp b/test/ext/ext_vector_int1.cpp
similarity index 100%
rename from test/ext/ext_vector_ivec1.cpp
rename to test/ext/ext_vector_int1.cpp
diff --git a/test/ext/ext_vector_uvec1.cpp b/test/ext/ext_vector_uint1.cpp
similarity index 100%
rename from test/ext/ext_vector_uvec1.cpp
rename to test/ext/ext_vector_uint1.cpp