126 files changed, 8419 insertions, 6344 deletions

diff --git a/external/include/glm/gtx/associated_min_max.hpp b/external/include/glm/gtx/associated_min_max.hpp
index eb9d721..42ac2eb 100644
--- a/external/include/glm/gtx/associated_min_max.hpp
+++ b/external/include/glm/gtx/associated_min_max.hpp
@@ -6,15 +6,20 @@
 ///
 /// @defgroup gtx_associated_min_max GLM_GTX_associated_min_max
 /// @ingroup gtx
-/// 
+///
+/// Include <glm/gtx/associated_min_max.hpp> to use the features of this extension.
+///
 /// @brief Min and max functions that return associated values not the compared onces.
-/// <glm/gtx/associated_min_max.hpp> need to be included to use these functionalities.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_associated_min_max extension included")
 #endif
@@ -26,29 +31,29 @@ namespace glm
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P>
+	template<typename T, typename U, qualifier Q>
 	GLM_FUNC_DECL U associatedMin(T x, U a, T y, U b);
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL tvec2<U, P> associatedMin(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<2, U, Q> associatedMin(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b);
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		T x, const vecType<U, P>& a,
-		T y, const vecType<U, P>& b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		T x, const vec<L, U, Q>& a,
+		T y, const vec<L, U, Q>& b);
 
 	/// Minimum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		vecType<T, P> const & x, U a,
-		vecType<T, P> const & y, U b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		vec<L, T, Q> const& x, U a,
+		vec<L, T, Q> const& y, U b);
 
 	/// Minimum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
@@ -60,11 +65,11 @@ namespace glm
 
 	/// Minimum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b,
-		vecType<T, P> const & z, vecType<U, P> const & c);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+		vec<L, T, Q> const& z, vec<L, U, Q> const& c);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
@@ -77,30 +82,30 @@ namespace glm
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b,
-		vecType<T, P> const & z, vecType<U, P> const & c,
-		vecType<T, P> const & w, vecType<U, P> const & d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+		vec<L, T, Q> const& z, vec<L, U, Q> const& c,
+		vec<L, T, Q> const& w, vec<L, U, Q> const& d);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		T x, vecType<U, P> const & a,
-		T y, vecType<U, P> const & b,
-		T z, vecType<U, P> const & c,
-		T w, vecType<U, P> const & d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		T x, vec<L, U, Q> const& a,
+		T y, vec<L, U, Q> const& b,
+		T z, vec<L, U, Q> const& c,
+		T w, vec<L, U, Q> const& d);
 
 	/// Minimum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMin(
-		vecType<T, P> const & x, U a,
-		vecType<T, P> const & y, U b,
-		vecType<T, P> const & z, U c,
-		vecType<T, P> const & w, U d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMin(
+		vec<L, T, Q> const& x, U a,
+		vec<L, T, Q> const& y, U b,
+		vec<L, T, Q> const& z, U c,
+		vec<L, T, Q> const& w, U d);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
@@ -109,24 +114,24 @@ namespace glm
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL tvec2<U, P> associatedMax(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<2, U, Q> associatedMax(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> associatedMax(
-		T x, vecType<U, P> const & a,
-		T y, vecType<U, P> const & b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> associatedMax(
+		T x, vec<L, U, Q> const& a,
+		T y, vec<L, U, Q> const& b);
 
 	/// Maximum comparison between 2 variables and returns 2 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		vecType<T, P> const & x, U a,
-		vecType<T, P> const & y, U b);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		vec<L, T, Q> const& x, U a,
+		vec<L, T, Q> const& y, U b);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
@@ -138,27 +143,27 @@ namespace glm
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b,
-		vecType<T, P> const & z, vecType<U, P> const & c);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+		vec<L, T, Q> const& z, vec<L, U, Q> const& c);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> associatedMax(
-		T x, vecType<U, P> const & a,
-		T y, vecType<U, P> const & b,
-		T z, vecType<U, P> const & c);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> associatedMax(
+		T x, vec<L, U, Q> const& a,
+		T y, vec<L, U, Q> const& b,
+		T z, vec<L, U, Q> const& c);
 
 	/// Maximum comparison between 3 variables and returns 3 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		vecType<T, P> const & x, U a,
-		vecType<T, P> const & y, U b,
-		vecType<T, P> const & z, U c);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		vec<L, T, Q> const& x, U a,
+		vec<L, T, Q> const& y, U b,
+		vec<L, T, Q> const& z, U c);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
@@ -171,30 +176,30 @@ namespace glm
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		vecType<T, P> const & x, vecType<U, P> const & a,
-		vecType<T, P> const & y, vecType<U, P> const & b,
-		vecType<T, P> const & z, vecType<U, P> const & c,
-		vecType<T, P> const & w, vecType<U, P> const & d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+		vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+		vec<L, T, Q> const& z, vec<L, U, Q> const& c,
+		vec<L, T, Q> const& w, vec<L, U, Q> const& d);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		T x, vecType<U, P> const & a,
-		T y, vecType<U, P> const & b,
-		T z, vecType<U, P> const & c,
-		T w, vecType<U, P> const & d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		T x, vec<L, U, Q> const& a,
+		T y, vec<L, U, Q> const& b,
+		T z, vec<L, U, Q> const& c,
+		T w, vec<L, U, Q> const& d);
 
 	/// Maximum comparison between 4 variables and returns 4 associated variable values
 	/// @see gtx_associated_min_max
-	template<typename T, typename U, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<U, P> associatedMax(
-		vecType<T, P> const & x, U a,
-		vecType<T, P> const & y, U b,
-		vecType<T, P> const & z, U c,
-		vecType<T, P> const & w, U d);
+	template<length_t L, typename T, typename U, qualifier Q>
+	GLM_FUNC_DECL vec<L, U, Q> associatedMax(
+		vec<L, T, Q> const& x, U a,
+		vec<L, T, Q> const& y, U b,
+		vec<L, T, Q> const& z, U c,
+		vec<L, T, Q> const& w, U d);
 
 	/// @}
 } //namespace glm
diff --git a/external/include/glm/gtx/associated_min_max.inl b/external/include/glm/gtx/associated_min_max.inl
index 6a57d48..d0666cc 100644
--- a/external/include/glm/gtx/associated_min_max.inl
+++ b/external/include/glm/gtx/associated_min_max.inl
@@ -4,46 +4,46 @@
 namespace glm{
 
 // Min comparison between 2 variables
-template<typename T, typename U, precision P>
+template<typename T, typename U, qualifier Q>
 GLM_FUNC_QUALIFIER U associatedMin(T x, U a, T y, U b)
 {
 	return x < y ? a : b;
 }
 
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER tvec2<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<2, U, Q> associatedMin
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? a[i] : b[i];
 	return Result;
 }
 
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	T x, const vecType<U, P>& a,
-	T y, const vecType<U, P>& b
+	T x, const vec<L, U, Q>& a,
+	T y, const vec<L, U, Q>& b
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x < y ? a[i] : b[i];
 	return Result;
 }
 
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	vecType<T, P> const & x, U a,
-	vecType<T, P> const & y, U b
+	vec<L, T, Q> const& x, U a,
+	vec<L, T, Q> const& y, U b
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? a : b;
 	return Result;
@@ -62,15 +62,15 @@ GLM_FUNC_QUALIFIER U associatedMin
 	return Result;
 }
 
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b,
-	vecType<T, P> const & z, vecType<U, P> const & c
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+	vec<L, T, Q> const& z, vec<L, U, Q> const& c
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] < y[i] ? (x[i] < z[i] ? a[i] : c[i]) : (y[i] < z[i] ? b[i] : c[i]);
 	return Result;
@@ -95,16 +95,16 @@ GLM_FUNC_QUALIFIER U associatedMin
 }
 
 // Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b,
-	vecType<T, P> const & z, vecType<U, P> const & c,
-	vecType<T, P> const & w, vecType<U, P> const & d
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+	vec<L, T, Q> const& z, vec<L, U, Q> const& c,
+	vec<L, T, Q> const& w, vec<L, U, Q> const& d
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = min(x[i], y[i]);
@@ -117,19 +117,19 @@ GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
 }
 
 // Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	T x, vecType<U, P> const & a,
-	T y, vecType<U, P> const & b,
-	T z, vecType<U, P> const & c,
-	T w, vecType<U, P> const & d
+	T x, vec<L, U, Q> const& a,
+	T y, vec<L, U, Q> const& b,
+	T z, vec<L, U, Q> const& c,
+	T w, vec<L, U, Q> const& d
 )
 {
 	T Test1 = min(x, y);
 	T Test2 = min(z, w);
 
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		U Result1 = x < y ? a[i] : b[i];
@@ -140,16 +140,16 @@ GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
 }
 
 // Min comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMin
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMin
 (
-	vecType<T, P> const & x, U a,
-	vecType<T, P> const & y, U b,
-	vecType<T, P> const & z, U c,
-	vecType<T, P> const & w, U d
+	vec<L, T, Q> const& x, U a,
+	vec<L, T, Q> const& y, U b,
+	vec<L, T, Q> const& z, U c,
+	vec<L, T, Q> const& w, U d
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = min(x[i], y[i]);
@@ -169,42 +169,42 @@ GLM_FUNC_QUALIFIER U associatedMax(T x, U a, T y, U b)
 }
 
 // Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER tvec2<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<2, U, Q> associatedMax
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? a[i] : b[i];
 	return Result;
 }
 
 // Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<T, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, T, Q> associatedMax
 (
-	T x, vecType<U, P> const & a,
-	T y, vecType<U, P> const & b
+	T x, vec<L, U, Q> const& a,
+	T y, vec<L, U, Q> const& b
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x > y ? a[i] : b[i];
 	return Result;
 }
 
 // Max comparison between 2 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	vecType<T, P> const & x, U a,
-	vecType<T, P> const & y, U b
+	vec<L, T, Q> const& x, U a,
+	vec<L, T, Q> const& y, U b
 )
 {
-	vecType<T, P> Result(uninitialize);
+	vec<L, T, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? a : b;
 	return Result;
@@ -224,45 +224,45 @@ GLM_FUNC_QUALIFIER U associatedMax
 }
 
 // Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b,
-	vecType<T, P> const & z, vecType<U, P> const & c
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+	vec<L, T, Q> const& z, vec<L, U, Q> const& c
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a[i] : c[i]) : (y[i] > z[i] ? b[i] : c[i]);
 	return Result;
 }
 
 // Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<T, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, T, Q> associatedMax
 (
-	T x, vecType<U, P> const & a,
-	T y, vecType<U, P> const & b,
-	T z, vecType<U, P> const & c
+	T x, vec<L, U, Q> const& a,
+	T y, vec<L, U, Q> const& b,
+	T z, vec<L, U, Q> const& c
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x > y ? (x > z ? a[i] : c[i]) : (y > z ? b[i] : c[i]);
 	return Result;
 }
 
 // Max comparison between 3 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	vecType<T, P> const & x, U a,
-	vecType<T, P> const & y, U b,
-	vecType<T, P> const & z, U c
+	vec<L, T, Q> const& x, U a,
+	vec<L, T, Q> const& y, U b,
+	vec<L, T, Q> const& z, U c
 )
 {
-	vecType<T, P> Result(uninitialize);
+	vec<L, T, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 		Result[i] = x[i] > y[i] ? (x[i] > z[i] ? a : c) : (y[i] > z[i] ? b : c);
 	return Result;
@@ -287,16 +287,16 @@ GLM_FUNC_QUALIFIER U associatedMax
 }
 
 // Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	vecType<T, P> const & x, vecType<U, P> const & a,
-	vecType<T, P> const & y, vecType<U, P> const & b,
-	vecType<T, P> const & z, vecType<U, P> const & c,
-	vecType<T, P> const & w, vecType<U, P> const & d
+	vec<L, T, Q> const& x, vec<L, U, Q> const& a,
+	vec<L, T, Q> const& y, vec<L, U, Q> const& b,
+	vec<L, T, Q> const& z, vec<L, U, Q> const& c,
+	vec<L, T, Q> const& w, vec<L, U, Q> const& d
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = max(x[i], y[i]);
@@ -309,19 +309,19 @@ GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
 }
 
 // Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	T x, vecType<U, P> const & a,
-	T y, vecType<U, P> const & b,
-	T z, vecType<U, P> const & c,
-	T w, vecType<U, P> const & d
+	T x, vec<L, U, Q> const& a,
+	T y, vec<L, U, Q> const& b,
+	T z, vec<L, U, Q> const& c,
+	T w, vec<L, U, Q> const& d
 )
 {
 	T Test1 = max(x, y);
 	T Test2 = max(z, w);
 
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		U Result1 = x > y ? a[i] : b[i];
@@ -332,16 +332,16 @@ GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
 }
 
 // Max comparison between 4 variables
-template<typename T, typename U, precision P, template <typename, precision> class vecType>
-GLM_FUNC_QUALIFIER vecType<U, P> associatedMax
+template<length_t L, typename T, typename U, qualifier Q>
+GLM_FUNC_QUALIFIER vec<L, U, Q> associatedMax
 (
-	vecType<T, P> const & x, U a,
-	vecType<T, P> const & y, U b,
-	vecType<T, P> const & z, U c,
-	vecType<T, P> const & w, U d
+	vec<L, T, Q> const& x, U a,
+	vec<L, T, Q> const& y, U b,
+	vec<L, T, Q> const& z, U c,
+	vec<L, T, Q> const& w, U d
 )
 {
-	vecType<U, P> Result(uninitialize);
+	vec<L, U, Q> Result;
 	for(length_t i = 0, n = Result.length(); i < n; ++i)
 	{
 		T Test1 = max(x[i], y[i]);
diff --git a/external/include/glm/gtx/bit.hpp b/external/include/glm/gtx/bit.hpp
index 17378f3..2eb4c26 100644
--- a/external/include/glm/gtx/bit.hpp
+++ b/external/include/glm/gtx/bit.hpp
@@ -2,20 +2,23 @@
 /// @file glm/gtx/bit.hpp
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 ///
 /// @defgroup gtx_bit GLM_GTX_bit
 /// @ingroup gtx
-/// 
-/// @brief Allow to perform bit operations on integer values
-/// 
-/// <glm/gtx/bit.hpp> need to be included to use these functionalities.
+///
+/// Include <glm/gtx/bit.hpp> to use the features of this extension.
+///
+/// Allow to perform bit operations on integer values
 
 #pragma once
 
 // Dependencies
 #include "../gtc/bitfield.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead")
 #endif
@@ -26,25 +29,25 @@ namespace glm
 	/// @{
 
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType highestBitValue(genIUType Value);
 
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_DECL genIUType lowestBitValue(genIUType Value);
 
 	/// Find the highest bit set to 1 in a integer variable and return its value.
 	///
 	/// @see gtx_bit
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> highestBitValue(vecType<T, P> const & value);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> highestBitValue(vec<L, T, Q> const& value);
 
 	/// Return the power of two number which value is just higher the input value.
 	/// Deprecated, use ceilPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoAbove(genIUType Value);
 
 	/// Return the power of two number which value is just higher the input value.
@@ -52,15 +55,15 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoAbove(vecType<T, P> const & value);
+	template<length_t L, typename T, qualifier Q>
+	GLM_DEPRECATED GLM_FUNC_DECL vec<L, T, Q> powerOfTwoAbove(vec<L, T, Q> const& value);
 
 	/// Return the power of two number which value is just lower the input value.
 	/// Deprecated, use floorPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoBelow(genIUType Value);
 
 	/// Return the power of two number which value is just lower the input value.
@@ -68,15 +71,15 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoBelow(vecType<T, P> const & value);
+	template<length_t L, typename T, qualifier Q>
+	GLM_DEPRECATED GLM_FUNC_DECL vec<L, T, Q> powerOfTwoBelow(vec<L, T, Q> const& value);
 
 	/// Return the power of two number which value is the closet to the input value.
 	/// Deprecated, use roundPowerOfTwo from GTC_round instead
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_DEPRECATED GLM_FUNC_DECL genIUType powerOfTwoNearest(genIUType Value);
 
 	/// Return the power of two number which value is the closet to the input value.
@@ -84,8 +87,8 @@ namespace glm
 	///
 	/// @see gtc_round
 	/// @see gtx_bit
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_DEPRECATED GLM_FUNC_DECL vecType<T, P> powerOfTwoNearest(vecType<T, P> const & value);
+	template<length_t L, typename T, qualifier Q>
+	GLM_DEPRECATED GLM_FUNC_DECL vec<L, T, Q> powerOfTwoNearest(vec<L, T, Q> const& value);
 
 	/// @}
 } //namespace glm
diff --git a/external/include/glm/gtx/bit.inl b/external/include/glm/gtx/bit.inl
index 10d5f7f..277aeaa 100644
--- a/external/include/glm/gtx/bit.inl
+++ b/external/include/glm/gtx/bit.inl
@@ -6,7 +6,7 @@ namespace glm
 	///////////////////
 	// highestBitValue
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType highestBitValue(genIUType Value)
 	{
 		genIUType tmp = Value;
@@ -19,61 +19,61 @@ namespace glm
 		return result;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> highestBitValue(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> highestBitValue(vec<L, T, Q> const& v)
 	{
-		return detail::functor1<T, T, P, vecType>::call(highestBitValue, v);
+		return detail::functor1<L, T, T, Q>::call(highestBitValue, v);
 	}
 
 	///////////////////
 	// lowestBitValue
 
-	template <typename genIUType>
+	template<typename genIUType>
 	GLM_FUNC_QUALIFIER genIUType lowestBitValue(genIUType Value)
 	{
 		return (Value & (~Value + 1));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> lowestBitValue(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> lowestBitValue(vec<L, T, Q> const& v)
 	{
-		return detail::functor1<T, T, P, vecType>::call(lowestBitValue, v);
+		return detail::functor1<L, T, T, Q>::call(lowestBitValue, v);
 	}
 
 	///////////////////
 	// powerOfTwoAbove
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoAbove(genType value)
 	{
 		return isPowerOfTwo(value) ? value : highestBitValue(value) << 1;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoAbove(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoAbove(vec<L, T, Q> const& v)
 	{
-		return detail::functor1<T, T, P, vecType>::call(powerOfTwoAbove, v);
+		return detail::functor1<L, T, T, Q>::call(powerOfTwoAbove, v);
 	}
 
 	///////////////////
 	// powerOfTwoBelow
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoBelow(genType value)
 	{
 		return isPowerOfTwo(value) ? value : highestBitValue(value);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoBelow(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoBelow(vec<L, T, Q> const& v)
 	{
-		return detail::functor1<T, T, P, vecType>::call(powerOfTwoBelow, v);
+		return detail::functor1<L, T, T, Q>::call(powerOfTwoBelow, v);
 	}
 
 	/////////////////////
 	// powerOfTwoNearest
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType powerOfTwoNearest(genType value)
 	{
 		if(isPowerOfTwo(value))
@@ -84,10 +84,10 @@ namespace glm
 		return (next - value) < (value - prev) ? next : prev;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> powerOfTwoNearest(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> powerOfTwoNearest(vec<L, T, Q> const& v)
 	{
-		return detail::functor1<T, T, P, vecType>::call(powerOfTwoNearest, v);
+		return detail::functor1<L, T, T, Q>::call(powerOfTwoNearest, v);
 	}
 
 }//namespace glm
diff --git a/external/include/glm/gtx/closest_point.hpp b/external/include/glm/gtx/closest_point.hpp
index 8d435b8..a788299 100644
--- a/external/include/glm/gtx/closest_point.hpp
+++ b/external/include/glm/gtx/closest_point.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_closest_point GLM_GTX_closest_point
 /// @ingroup gtx
 ///
-/// @brief Find the point on a straight line which is the closet of a point.
+/// Include <glm/gtx/closest_point.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/closest_point.hpp> need to be included to use these functionalities.
+/// Find the point on a straight line which is the closet of a point.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_closest_point extension included")
 #endif
@@ -24,20 +28,20 @@ namespace glm
 	/// @addtogroup gtx_closest_point
 	/// @{
 
-	/// Find the point on a straight line which is the closet of a point. 
+	/// Find the point on a straight line which is the closet of a point.
 	/// @see gtx_closest_point
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> closestPointOnLine(
-		tvec3<T, P> const & point,
-		tvec3<T, P> const & a, 
-		tvec3<T, P> const & b);
-	
-	/// 2d lines work as well	
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec2<T, P> closestPointOnLine(
-		tvec2<T, P> const & point,
-		tvec2<T, P> const & a, 
-		tvec2<T, P> const & b);	
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> closestPointOnLine(
+		vec<3, T, Q> const& point,
+		vec<3, T, Q> const& a,
+		vec<3, T, Q> const& b);
+
+	/// 2d lines work as well
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<2, T, Q> closestPointOnLine(
+		vec<2, T, Q> const& point,
+		vec<2, T, Q> const& a,
+		vec<2, T, Q> const& b);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/closest_point.inl b/external/include/glm/gtx/closest_point.inl
index ccda9ab..26d1e38 100644
--- a/external/include/glm/gtx/closest_point.inl
+++ b/external/include/glm/gtx/closest_point.inl
@@ -3,44 +3,44 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> closestPointOnLine
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> closestPointOnLine
 	(
-		tvec3<T, P> const & point,
-		tvec3<T, P> const & a,
-		tvec3<T, P> const & b
+		vec<3, T, Q> const& point,
+		vec<3, T, Q> const& a,
+		vec<3, T, Q> const& b
 	)
 	{
 		T LineLength = distance(a, b);
-		tvec3<T, P> Vector = point - a;
-		tvec3<T, P> LineDirection = (b - a) / LineLength;
+		vec<3, T, Q> Vector = point - a;
+		vec<3, T, Q> LineDirection = (b - a) / LineLength;
 
-		// Project Vector3 to LineDirection to get the distance of point from a
+		// Project Vector to LineDirection to get the distance of point from a
 		T Distance = dot(Vector, LineDirection);
 
 		if(Distance <= T(0)) return a;
 		if(Distance >= LineLength) return b;
 		return a + LineDirection * Distance;
 	}
-	
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<T, P> closestPointOnLine
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, T, Q> closestPointOnLine
 	(
-		tvec2<T, P> const & point,
-		tvec2<T, P> const & a,
-		tvec2<T, P> const & b
+		vec<2, T, Q> const& point,
+		vec<2, T, Q> const& a,
+		vec<2, T, Q> const& b
 	)
 	{
 		T LineLength = distance(a, b);
-		tvec2<T, P> Vector = point - a;
-		tvec2<T, P> LineDirection = (b - a) / LineLength;
+		vec<2, T, Q> Vector = point - a;
+		vec<2, T, Q> LineDirection = (b - a) / LineLength;
 
-		// Project Vector3 to LineDirection to get the distance of point from a
-		T Distance = dot(Vector3, LineDirection);
+		// Project Vector to LineDirection to get the distance of point from a
+		T Distance = dot(Vector, LineDirection);
 
 		if(Distance <= T(0)) return a;
 		if(Distance >= LineLength) return b;
 		return a + LineDirection * Distance;
 	}
-	
+
 }//namespace glm
diff --git a/external/include/glm/gtx/color_encoding.hpp b/external/include/glm/gtx/color_encoding.hpp
new file mode 100644
index 0000000..b57b3be
--- /dev/null
+++ b/external/include/glm/gtx/color_encoding.hpp
@@ -0,0 +1,50 @@
+/// @ref gtx_color_encoding
+/// @file glm/gtx/color_encoding.hpp
+///
+/// @see core (dependence)
+/// @see gtx_color_encoding (dependence)
+///
+/// @defgroup gtx_color_encoding GLM_GTX_color_encoding
+/// @ingroup gtx
+///
+/// Include <glm/gtx/color_encoding.hpp> to use the features of this extension.
+///
+/// @brief Allow to perform bit operations on integer values
+
+#pragma once
+
+// Dependencies
+#include "../detail/setup.hpp"
+#include "../detail/qualifier.hpp"
+#include "../vec3.hpp"
+#include <limits>
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTC_color_encoding extension included")
+#endif
+
+namespace glm
+{
+	/// @addtogroup gtx_color_encoding
+	/// @{
+
+	/// Convert a linear sRGB color to D65 YUV.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> convertLinearSRGBToD65XYZ(vec<3, T, Q> const& ColorLinearSRGB);
+
+	/// Convert a linear sRGB color to D50 YUV.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> convertLinearSRGBToD50XYZ(vec<3, T, Q> const& ColorLinearSRGB);
+
+	/// Convert a D65 YUV color to linear sRGB.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> convertD65XYZToLinearSRGB(vec<3, T, Q> const& ColorD65XYZ);
+
+	/// Convert a D65 YUV color to D50 YUV.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> convertD65XYZToD50XYZ(vec<3, T, Q> const& ColorD65XYZ);
+
+	/// @}
+} //namespace glm
+
+#include "color_encoding.inl"
diff --git a/external/include/glm/gtx/color_encoding.inl b/external/include/glm/gtx/color_encoding.inl
new file mode 100644
index 0000000..8dca67b
--- /dev/null
+++ b/external/include/glm/gtx/color_encoding.inl
@@ -0,0 +1,46 @@
+/// @ref gtx_color_encoding
+/// @file glm/gtx/color_encoding.inl
+
+namespace glm
+{
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> convertLinearSRGBToD65XYZ(vec<3, T, Q> const& ColorLinearSRGB)
+	{
+		vec<3, T, Q> const M(0.490f, 0.17697f, 0.2f);
+		vec<3, T, Q> const N(0.31f,  0.8124f, 0.01063f);
+		vec<3, T, Q> const O(0.490f, 0.01f, 0.99f);
+
+		return (M * ColorLinearSRGB + N * ColorLinearSRGB + O * ColorLinearSRGB) * static_cast<T>(5.650675255693055f);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> convertLinearSRGBToD50XYZ(vec<3, T, Q> const& ColorLinearSRGB)
+	{
+		vec<3, T, Q> const M(0.436030342570117f, 0.222438466210245f, 0.013897440074263f);
+		vec<3, T, Q> const N(0.385101860087134f, 0.716942745571917f, 0.097076381494207f);
+		vec<3, T, Q> const O(0.143067806654203f, 0.060618777416563f, 0.713926257896652f);
+
+		return M * ColorLinearSRGB + N * ColorLinearSRGB + O * ColorLinearSRGB;
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> convertD65XYZToLinearSRGB(vec<3, T, Q> const& ColorD65XYZ)
+	{
+		vec<3, T, Q> const M(0.41847f, -0.091169f, 0.0009209f);
+		vec<3, T, Q> const N(-0.15866f, 0.25243f, 0.015708f);
+		vec<3, T, Q> const O(0.0009209f, -0.0025498f, 0.1786f);
+
+		return M * ColorD65XYZ + N * ColorD65XYZ + O * ColorD65XYZ;
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> convertD65XYZToD50XYZ(vec<3, T, Q> const& ColorD65XYZ)
+	{
+		vec<3, T, Q> const M(+1.047844353856414f, +0.029549007606644f, -0.009250984365223f);
+		vec<3, T, Q> const N(+0.022898981050086f, +0.990508028941971f, +0.015072338237051f);
+		vec<3, T, Q> const O(-0.050206647741605f, -0.017074711360960f, +0.751717835079977f);
+
+		return M * ColorD65XYZ + N * ColorD65XYZ + O * ColorD65XYZ;
+	}
+
+}//namespace glm
diff --git a/external/include/glm/gtx/color_space.hpp b/external/include/glm/gtx/color_space.hpp
index 9ff08dc..9e95eb3 100644
--- a/external/include/glm/gtx/color_space.hpp
+++ b/external/include/glm/gtx/color_space.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_color_space GLM_GTX_color_space
 /// @ingroup gtx
 ///
-/// @brief Related to RGB to HSV conversions and operations.
+/// Include <glm/gtx/color_space.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/color_space.hpp> need to be included to use these functionalities.
+/// Related to RGB to HSV conversions and operations.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_color_space extension included")
 #endif
@@ -26,41 +30,41 @@ namespace glm
 
 	/// Converts a color from HSV color space to its color in RGB color space.
 	/// @see gtx_color_space
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rgbColor(
-		tvec3<T, P> const & hsvValue);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rgbColor(
+		vec<3, T, Q> const& hsvValue);
 
 	/// Converts a color from RGB color space to its color in HSV color space.
 	/// @see gtx_color_space
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> hsvColor(
-		tvec3<T, P> const & rgbValue);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> hsvColor(
+		vec<3, T, Q> const& rgbValue);
+
 	/// Build a saturation matrix.
 	/// @see gtx_color_space
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> saturation(
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> saturation(
 		T const s);
 
 	/// Modify the saturation of a color.
 	/// @see gtx_color_space
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> saturation(
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> saturation(
 		T const s,
-		tvec3<T, P> const & color);
-		
+		vec<3, T, Q> const& color);
+
 	/// Modify the saturation of a color.
 	/// @see gtx_color_space
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> saturation(
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> saturation(
 		T const s,
-		tvec4<T, P> const & color);
-		
+		vec<4, T, Q> const& color);
+
 	/// Compute color luminosity associating ratios (0.33, 0.59, 0.11) to RGB canals.
 	/// @see gtx_color_space
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T luminosity(
-		tvec3<T, P> const & color);
+		vec<3, T, Q> const& color);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/color_space.inl b/external/include/glm/gtx/color_space.inl
index e7cd58d..ff82395 100644
--- a/external/include/glm/gtx/color_space.inl
+++ b/external/include/glm/gtx/color_space.inl
@@ -3,19 +3,19 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rgbColor(const tvec3<T, P>& hsvColor)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rgbColor(const vec<3, T, Q>& hsvColor)
 	{
-		tvec3<T, P> hsv = hsvColor;
-		tvec3<T, P> rgbColor;
+		vec<3, T, Q> hsv = hsvColor;
+		vec<3, T, Q> rgbColor;
 
 		if(hsv.y == static_cast<T>(0))
 			// achromatic (grey)
-			rgbColor = tvec3<T, P>(hsv.z);
+			rgbColor = vec<3, T, Q>(hsv.z);
 		else
 		{
-			T sector = floor(hsv.x / T(60));
-			T frac = (hsv.x / T(60)) - sector;
+			T sector = floor(hsv.x * (T(1) / T(60)));
+			T frac = (hsv.x * (T(1) / T(60))) - sector;
 			// factorial part of h
 			T o = hsv.z * (T(1) - hsv.y);
 			T p = hsv.z * (T(1) - hsv.y * frac);
@@ -45,13 +45,13 @@ namespace glm
 				rgbColor.b = hsv.z;
 				break;
 			case 4:
-				rgbColor.r = q; 
-				rgbColor.g = o; 
+				rgbColor.r = q;
+				rgbColor.g = o;
 				rgbColor.b = hsv.z;
 				break;
 			case 5:
-				rgbColor.r = hsv.z; 
-				rgbColor.g = o; 
+				rgbColor.r = hsv.z;
+				rgbColor.g = o;
 				rgbColor.b = p;
 				break;
 			}
@@ -60,19 +60,19 @@ namespace glm
 		return rgbColor;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> hsvColor(const tvec3<T, P>& rgbColor)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> hsvColor(const vec<3, T, Q>& rgbColor)
 	{
-		tvec3<T, P> hsv = rgbColor;
+		vec<3, T, Q> hsv = rgbColor;
 		float Min   = min(min(rgbColor.r, rgbColor.g), rgbColor.b);
 		float Max   = max(max(rgbColor.r, rgbColor.g), rgbColor.b);
 		float Delta = Max - Min;
 
-		hsv.z = Max;                               
+		hsv.z = Max;
 
 		if(Max != static_cast<T>(0))
 		{
-			hsv.y = Delta / hsv.z;    
+			hsv.y = Delta / hsv.z;
 			T h = static_cast<T>(0);
 
 			if(rgbColor.r == Max)
@@ -85,7 +85,7 @@ namespace glm
 				// between magenta & cyan
 				h = static_cast<T>(240) + T(60) * (rgbColor.r - rgbColor.g) / Delta;
 
-			if(h < T(0)) 
+			if(h < T(0))
 				hsv.x = h + T(360);
 			else
 				hsv.x = h;
@@ -100,14 +100,14 @@ namespace glm
 		return hsv;
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> saturation(T const s)
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> saturation(T const s)
 	{
-		tvec3<T, defaultp> rgbw = tvec3<T, defaultp>(T(0.2126), T(0.7152), T(0.0722));
+		vec<3, T, defaultp> rgbw = vec<3, T, defaultp>(T(0.2126), T(0.7152), T(0.0722));
 
-		tvec3<T, defaultp> const col((T(1) - s) * rgbw);
+		vec<3, T, defaultp> const col((T(1) - s) * rgbw);
 
-		tmat4x4<T, defaultp> result(T(1));
+		mat<4, 4, T, defaultp> result(T(1));
 		result[0][0] = col.x + s;
 		result[0][1] = col.x;
 		result[0][2] = col.x;
@@ -117,25 +117,26 @@ namespace glm
 		result[2][0] = col.z;
 		result[2][1] = col.z;
 		result[2][2] = col.z + s;
+
 		return result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> saturation(const T s, const tvec3<T, P>& color)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> saturation(const T s, const vec<3, T, Q>& color)
 	{
-		return tvec3<T, P>(saturation(s) * tvec4<T, P>(color, T(0)));
+		return vec<3, T, Q>(saturation(s) * vec<4, T, Q>(color, T(0)));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> saturation(const T s, const tvec4<T, P>& color)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> saturation(const T s, const vec<4, T, Q>& color)
 	{
 		return saturation(s) * color;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER T luminosity(const tvec3<T, P>& color)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T luminosity(const vec<3, T, Q>& color)
 	{
-		const tvec3<T, P> tmp = tvec3<T, P>(0.33, 0.59, 0.11);
+		const vec<3, T, Q> tmp = vec<3, T, Q>(0.33, 0.59, 0.11);
 		return dot(color, tmp);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/color_space_YCoCg.hpp b/external/include/glm/gtx/color_space_YCoCg.hpp
index 428ca6d..e82cbd8 100644
--- a/external/include/glm/gtx/color_space_YCoCg.hpp
+++ b/external/include/glm/gtx/color_space_YCoCg.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_color_space_YCoCg GLM_GTX_color_space_YCoCg
 /// @ingroup gtx
 ///
-/// @brief RGB to YCoCg conversions and operations
+/// Include <glm/gtx/color_space_YCoCg.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/color_space_YCoCg.hpp> need to be included to use these functionalities.
+/// RGB to YCoCg conversions and operations
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_color_space_YCoCg extension included")
 #endif
@@ -26,29 +30,29 @@ namespace glm
 
 	/// Convert a color from RGB color space to YCoCg color space.
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rgb2YCoCg(
-		tvec3<T, P> const & rgbColor);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rgb2YCoCg(
+		vec<3, T, Q> const& rgbColor);
 
 	/// Convert a color from YCoCg color space to RGB color space.
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> YCoCg2rgb(
-		tvec3<T, P> const & YCoCgColor);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> YCoCg2rgb(
+		vec<3, T, Q> const& YCoCgColor);
 
 	/// Convert a color from RGB color space to YCoCgR color space.
 	/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rgb2YCoCgR(
-		tvec3<T, P> const & rgbColor);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rgb2YCoCgR(
+		vec<3, T, Q> const& rgbColor);
 
 	/// Convert a color from YCoCgR color space to RGB color space.
 	/// @see "YCoCg-R: A Color Space with RGB Reversibility and Low Dynamic Range"
 	/// @see gtx_color_space_YCoCg
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> YCoCgR2rgb(
-		tvec3<T, P> const & YCoCgColor);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> YCoCgR2rgb(
+		vec<3, T, Q> const& YCoCgColor);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/color_space_YCoCg.inl b/external/include/glm/gtx/color_space_YCoCg.inl
index 1ca2e5b..105a576 100644
--- a/external/include/glm/gtx/color_space_YCoCg.inl
+++ b/external/include/glm/gtx/color_space_YCoCg.inl
@@ -3,70 +3,70 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCg
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rgb2YCoCg
 	(
-		tvec3<T, P> const & rgbColor
+		vec<3, T, Q> const& rgbColor
 	)
 	{
-		tvec3<T, P> result;
+		vec<3, T, Q> result;
 		result.x/*Y */ =   rgbColor.r / T(4) + rgbColor.g / T(2) + rgbColor.b / T(4);
 		result.y/*Co*/ =   rgbColor.r / T(2) + rgbColor.g * T(0) - rgbColor.b / T(2);
 		result.z/*Cg*/ = - rgbColor.r / T(4) + rgbColor.g / T(2) - rgbColor.b / T(4);
 		return result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> YCoCg2rgb
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> YCoCg2rgb
 	(
-		tvec3<T, P> const & YCoCgColor
+		vec<3, T, Q> const& YCoCgColor
 	)
 	{
-		tvec3<T, P> result;
+		vec<3, T, Q> result;
 		result.r = YCoCgColor.x + YCoCgColor.y - YCoCgColor.z;
 		result.g = YCoCgColor.x				   + YCoCgColor.z;
 		result.b = YCoCgColor.x - YCoCgColor.y - YCoCgColor.z;
 		return result;
 	}
 
-	template <typename T, precision P, bool isInteger>
+	template<typename T, qualifier Q, bool isInteger>
 	class compute_YCoCgR {
 	public:
-		static GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR
+		static GLM_FUNC_QUALIFIER vec<3, T, Q> rgb2YCoCgR
 		(
-			tvec3<T, P> const & rgbColor
+			vec<3, T, Q> const& rgbColor
 		)
 		{
-			tvec3<T, P> result;
-			result.x/*Y */ = rgbColor.g / T(2) + (rgbColor.r + rgbColor.b) / T(4);
+			vec<3, T, Q> result;
+			result.x/*Y */ = rgbColor.g * static_cast<T>(0.5) + (rgbColor.r + rgbColor.b) * static_cast<T>(0.25);
 			result.y/*Co*/ = rgbColor.r - rgbColor.b;
-			result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) / T(2);
+			result.z/*Cg*/ = rgbColor.g - (rgbColor.r + rgbColor.b) * static_cast<T>(0.5);
 			return result;
 		}
 
-		static GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb
+		static GLM_FUNC_QUALIFIER vec<3, T, Q> YCoCgR2rgb
 		(
-			tvec3<T, P> const & YCoCgRColor
+			vec<3, T, Q> const& YCoCgRColor
 		)
 		{
-			tvec3<T, P> result;
-			T tmp = YCoCgRColor.x - (YCoCgRColor.z / T(2));
+			vec<3, T, Q> result;
+			T tmp = YCoCgRColor.x - (YCoCgRColor.z * static_cast<T>(0.5));
 			result.g = YCoCgRColor.z + tmp;
-			result.b = tmp - (YCoCgRColor.y / T(2));
+			result.b = tmp - (YCoCgRColor.y * static_cast<T>(0.5));
 			result.r = result.b + YCoCgRColor.y;
 			return result;
 		}
 	};
 
-	template <typename T, precision P>
-	class compute_YCoCgR<T, P, true> {
+	template<typename T, qualifier Q>
+	class compute_YCoCgR<T, Q, true> {
 	public:
-		static GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR
+		static GLM_FUNC_QUALIFIER vec<3, T, Q> rgb2YCoCgR
 		(
-			tvec3<T, P> const & rgbColor
+			vec<3, T, Q> const& rgbColor
 		)
 		{
-			tvec3<T, P> result;
+			vec<3, T, Q> result;
 			result.y/*Co*/ = rgbColor.r - rgbColor.b;
 			T tmp = rgbColor.b + (result.y >> 1);
 			result.z/*Cg*/ = rgbColor.g - tmp;
@@ -74,12 +74,12 @@ namespace glm
 			return result;
 		}
 
-		static GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb
+		static GLM_FUNC_QUALIFIER vec<3, T, Q> YCoCgR2rgb
 		(
-			tvec3<T, P> const & YCoCgRColor
+			vec<3, T, Q> const& YCoCgRColor
 		)
 		{
-			tvec3<T, P> result;
+			vec<3, T, Q> result;
 			T tmp = YCoCgRColor.x - (YCoCgRColor.z >> 1);
 			result.g = YCoCgRColor.z + tmp;
 			result.b = tmp - (YCoCgRColor.y >> 1);
@@ -88,21 +88,21 @@ namespace glm
 		}
 	};
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rgb2YCoCgR
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rgb2YCoCgR
 	(
-		tvec3<T, P> const & rgbColor
+		vec<3, T, Q> const& rgbColor
 	)
 	{
-		return compute_YCoCgR<T, P, std::numeric_limits<T>::is_integer>::rgb2YCoCgR(rgbColor);
+		return compute_YCoCgR<T, Q, std::numeric_limits<T>::is_integer>::rgb2YCoCgR(rgbColor);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> YCoCgR2rgb
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> YCoCgR2rgb
 	(
-		tvec3<T, P> const & YCoCgRColor
+		vec<3, T, Q> const& YCoCgRColor
 	)
 	{
-		return compute_YCoCgR<T, P, std::numeric_limits<T>::is_integer>::YCoCgR2rgb(YCoCgRColor);
+		return compute_YCoCgR<T, Q, std::numeric_limits<T>::is_integer>::YCoCgR2rgb(YCoCgRColor);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/common.hpp b/external/include/glm/gtx/common.hpp
index 6533a54..6eadf48 100644
--- a/external/include/glm/gtx/common.hpp
+++ b/external/include/glm/gtx/common.hpp
@@ -2,14 +2,13 @@
 /// @file glm/gtx/common.hpp
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 ///
 /// @defgroup gtx_common GLM_GTX_common
 /// @ingroup gtx
 ///
-/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
+/// Include <glm/gtx/common.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/common.hpp> need to be included to use these functionalities.
+/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
 
 #pragma once
 
@@ -19,6 +18,10 @@
 #include "../vec4.hpp"
 #include "../gtc/vec1.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_common extension included")
 #endif
@@ -31,21 +34,41 @@ namespace glm
 	/// Returns true if x is a denormalized number
 	/// Numbers whose absolute value is too small to be represented in the normal format are represented in an alternate, denormalized format.
 	/// This format is less precise but can represent values closer to zero.
-	/// 
+	///
 	/// @tparam genType Floating-point scalar or vector types.
 	///
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
 	/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
-	template <typename genType> 
-	GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const& x);
 
 	/// Similar to 'mod' but with a different rounding and integer support.
 	/// Returns 'x - y * trunc(x/y)' instead of 'x - y * floor(x/y)'
-	/// 
+	///
 	/// @see <a href="http://stackoverflow.com/questions/7610631/glsl-mod-vs-hlsl-fmod">GLSL mod vs HLSL fmod</a>
 	/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fmod(vecType<T, P> const & v);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fmod(vec<L, T, Q> const& v);
+
+	/// Returns whether vector components values are within an interval. A open interval excludes its endpoints, and is denoted with square brackets.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point or integer scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see ext_vector_relational
+	template <length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, bool, Q> openBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max);
+
+	/// Returns whether vector components values are within an interval. A closed interval includes its endpoints, and is denoted with square brackets.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point or integer scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see ext_vector_relational
+	template <length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, bool, Q> closeBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/common.inl b/external/include/glm/gtx/common.inl
index 6c9cb65..158eabe 100644
--- a/external/include/glm/gtx/common.inl
+++ b/external/include/glm/gtx/common.inl
@@ -2,89 +2,91 @@
 /// @file glm/gtx/common.inl
 
 #include <cmath>
+#include "../gtc/epsilon.hpp"
+#include "../gtc/constants.hpp"
 
 namespace glm{
 namespace detail
 {
-	template <typename T, precision P, template <class, precision> class vecType, bool isFloat = true>
+	template<length_t L, typename T, qualifier Q, bool isFloat = true>
 	struct compute_fmod
 	{
-		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & a, vecType<T, P> const & b)
+		GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
 		{
-			return detail::functor2<T, P, vecType>::call(std::fmod, a, b);
+			return detail::functor2<L, T, Q>::call(std::fmod, a, b);
 		}
 	};
 
-	template <typename T, precision P, template <class, precision> class vecType>
-	struct compute_fmod<T, P, vecType, false>
+	template<length_t L, typename T, qualifier Q>
+	struct compute_fmod<L, T, Q, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<T, P> const & a, vecType<T, P> const & b)
+		GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
 		{
 			return a % b;
 		}
 	};
 }//namespace detail
 
-	template <typename T> 
-	GLM_FUNC_QUALIFIER bool isdenormal(T const & x)
+	template<typename T>
+	GLM_FUNC_QUALIFIER bool isdenormal(T const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
 
 #		if GLM_HAS_CXX11_STL
 			return std::fpclassify(x) == FP_SUBNORMAL;
 #		else
-			return x != static_cast<T>(0) && std::fabs(x) < std::numeric_limits<T>::min();
+			return epsilonNotEqual(x, static_cast<T>(0), epsilon<T>()) && std::fabs(x) < std::numeric_limits<T>::min();
 #		endif
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tvec1<T, P>::bool_type isdenormal
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename vec<1, T, Q>::bool_type isdenormal
 	(
-		tvec1<T, P> const & x
+		vec<1, T, Q> const& x
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
 
-		return typename tvec1<T, P>::bool_type(
+		return typename vec<1, T, Q>::bool_type(
 			isdenormal(x.x));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tvec2<T, P>::bool_type isdenormal
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename vec<2, T, Q>::bool_type isdenormal
 	(
-		tvec2<T, P> const & x
+		vec<2, T, Q> const& x
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
 
-		return typename tvec2<T, P>::bool_type(
+		return typename vec<2, T, Q>::bool_type(
 			isdenormal(x.x),
 			isdenormal(x.y));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tvec3<T, P>::bool_type isdenormal
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename vec<3, T, Q>::bool_type isdenormal
 	(
-		tvec3<T, P> const & x
+		vec<3, T, Q> const& x
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
 
-		return typename tvec3<T, P>::bool_type(
+		return typename vec<3, T, Q>::bool_type(
 			isdenormal(x.x),
 			isdenormal(x.y),
 			isdenormal(x.z));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tvec4<T, P>::bool_type isdenormal
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename vec<4, T, Q>::bool_type isdenormal
 	(
-		tvec4<T, P> const & x
+		vec<4, T, Q> const& x
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isdenormal' only accept floating-point inputs");
 
-		return typename tvec4<T, P>::bool_type(
+		return typename vec<4, T, Q>::bool_type(
 			isdenormal(x.x),
 			isdenormal(x.y),
 			isdenormal(x.z),
@@ -92,21 +94,33 @@ namespace detail
 	}
 
 	// fmod
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fmod(genType x, genType y)
 	{
-		return fmod(tvec1<genType>(x), y).x;
+		return fmod(vec<1, genType>(x), y).x;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fmod(vecType<T, P> const & x, T y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmod(vec<L, T, Q> const& x, T y)
 	{
-		return detail::compute_fmod<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, vecType<T, P>(y));
+		return detail::compute_fmod<L, T, Q, std::numeric_limits<T>::is_iec559>::call(x, vec<L, T, Q>(y));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fmod(vecType<T, P> const & x, vecType<T, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmod(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
-		return detail::compute_fmod<T, P, vecType, std::numeric_limits<T>::is_iec559>::call(x, y);
+		return detail::compute_fmod<L, T, Q, std::numeric_limits<T>::is_iec559>::call(x, y);
+	}
+
+	template <length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, bool, Q> openBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max)
+	{
+		return greaterThan(Value, Min) && lessThan(Value, Max);
+	}
+
+	template <length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, bool, Q> closeBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max)
+	{
+		return greaterThanEqual(Value, Min) && lessThanEqual(Value, Max);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/compatibility.hpp b/external/include/glm/gtx/compatibility.hpp
index 9f4819a..e5b6039 100644
--- a/external/include/glm/gtx/compatibility.hpp
+++ b/external/include/glm/gtx/compatibility.hpp
@@ -2,14 +2,13 @@
 /// @file glm/gtx/compatibility.hpp
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 ///
 /// @defgroup gtx_compatibility GLM_GTX_compatibility
 /// @ingroup gtx
 ///
-/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
+/// Include <glm/gtx/compatibility.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/compatibility.hpp> need to be included to use these functionalities.
+/// Provide functions to increase the compatibility with Cg and HLSL languages
 
 #pragma once
 
@@ -17,6 +16,10 @@
 #include "../glm.hpp"
 #include "../gtc/quaternion.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_compatibility extension included")
 #endif
@@ -35,94 +38,94 @@ namespace glm
 	/// @addtogroup gtx_compatibility
 	/// @{
 
-	template <typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);}																					//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T> GLM_FUNC_QUALIFIER T lerp(T x, T y, T a){return mix(x, y, a);}																					//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<2, T, Q> lerp(const vec<2, T, Q>& x, const vec<2, T, Q>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> lerp(const tvec2<T, P>& x, const tvec2<T, P>& y, const tvec2<T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> lerp(const tvec3<T, P>& x, const tvec3<T, P>& y, const tvec3<T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> lerp(const tvec4<T, P>& x, const tvec4<T, P>& y, const tvec4<T, P>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<3, T, Q> lerp(const vec<3, T, Q>& x, const vec<3, T, Q>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<4, T, Q> lerp(const vec<4, T, Q>& x, const vec<4, T, Q>& y, T a){return mix(x, y, a);}							//!< \brief Returns x * (1.0 - a) + y * a, i.e., the linear blend of x and y using the floating-point value a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<2, T, Q> lerp(const vec<2, T, Q>& x, const vec<2, T, Q>& y, const vec<2, T, Q>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<3, T, Q> lerp(const vec<3, T, Q>& x, const vec<3, T, Q>& y, const vec<3, T, Q>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<4, T, Q> lerp(const vec<4, T, Q>& x, const vec<4, T, Q>& y, const vec<4, T, Q>& a){return mix(x, y, a);}	//!< \brief Returns the component-wise result of x * (1.0 - a) + y * a, i.e., the linear blend of x and y using vector a. The value for a is not restricted to the range [0, 1]. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));}														//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> saturate(const tvec2<T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> saturate(const tvec3<T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> saturate(const tvec4<T, P>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER T saturate(T x){return clamp(x, T(0), T(1));}														//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<2, T, Q> saturate(const vec<2, T, Q>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<3, T, Q> saturate(const vec<3, T, Q>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<4, T, Q> saturate(const vec<4, T, Q>& x){return clamp(x, T(0), T(1));}					//!< \brief Returns clamp(x, 0, 1) for each component in x. (From GLM_GTX_compatibility)
 
-	template <typename T, precision P> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);}																//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec2<T, P> atan2(const tvec2<T, P>& x, const tvec2<T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec3<T, P> atan2(const tvec3<T, P>& x, const tvec3<T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_QUALIFIER tvec4<T, P> atan2(const tvec4<T, P>& x, const tvec4<T, P>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER T atan2(T x, T y){return atan(x, y);}																//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<2, T, Q> atan2(const vec<2, T, Q>& x, const vec<2, T, Q>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<3, T, Q> atan2(const vec<3, T, Q>& x, const vec<3, T, Q>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_QUALIFIER vec<4, T, Q> atan2(const vec<4, T, Q>& x, const vec<4, T, Q>& y){return atan(x, y);}	//!< \brief Arc tangent. Returns an angle whose tangent is y/x. The signs of x and y are used to determine what quadrant the angle is in. The range of values returned by this function is [-PI, PI]. Results are undefined if x and y are both 0. (From GLM_GTX_compatibility)
 
-	template <typename genType> GLM_FUNC_DECL bool isfinite(genType const & x);											//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL tvec1<bool, P> isfinite(const tvec1<T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL tvec2<bool, P> isfinite(const tvec2<T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL tvec3<bool, P> isfinite(const tvec3<T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
-	template <typename T, precision P> GLM_FUNC_DECL tvec4<bool, P> isfinite(const tvec4<T, P>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename genType> GLM_FUNC_DECL bool isfinite(genType const& x);											//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_DECL vec<1, bool, Q> isfinite(const vec<1, T, Q>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_DECL vec<2, bool, Q> isfinite(const vec<2, T, Q>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_DECL vec<3, bool, Q> isfinite(const vec<3, T, Q>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
+	template<typename T, qualifier Q> GLM_FUNC_DECL vec<4, bool, Q> isfinite(const vec<4, T, Q>& x);				//!< \brief Test whether or not a scalar or each vector component is a finite value. (From GLM_GTX_compatibility)
 
 	typedef bool						bool1;			//!< \brief boolean type with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tvec2<bool, highp>			bool2;			//!< \brief boolean type with 2 components. (From GLM_GTX_compatibility extension)
-	typedef tvec3<bool, highp>			bool3;			//!< \brief boolean type with 3 components. (From GLM_GTX_compatibility extension)
-	typedef tvec4<bool, highp>			bool4;			//!< \brief boolean type with 4 components. (From GLM_GTX_compatibility extension)
+	typedef vec<2, bool, highp>			bool2;			//!< \brief boolean type with 2 components. (From GLM_GTX_compatibility extension)
+	typedef vec<3, bool, highp>			bool3;			//!< \brief boolean type with 3 components. (From GLM_GTX_compatibility extension)
+	typedef vec<4, bool, highp>			bool4;			//!< \brief boolean type with 4 components. (From GLM_GTX_compatibility extension)
 
 	typedef bool						bool1x1;		//!< \brief boolean matrix with 1 x 1 component. (From GLM_GTX_compatibility extension)
-	typedef tmat2x2<bool, highp>		bool2x2;		//!< \brief boolean matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x3<bool, highp>		bool2x3;		//!< \brief boolean matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x4<bool, highp>		bool2x4;		//!< \brief boolean matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x2<bool, highp>		bool3x2;		//!< \brief boolean matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x3<bool, highp>		bool3x3;		//!< \brief boolean matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x4<bool, highp>		bool3x4;		//!< \brief boolean matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x2<bool, highp>		bool4x2;		//!< \brief boolean matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x3<bool, highp>		bool4x3;		//!< \brief boolean matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x4<bool, highp>		bool4x4;		//!< \brief boolean matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 2, bool, highp>		bool2x2;		//!< \brief boolean matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 3, bool, highp>		bool2x3;		//!< \brief boolean matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 4, bool, highp>		bool2x4;		//!< \brief boolean matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 2, bool, highp>		bool3x2;		//!< \brief boolean matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 3, bool, highp>		bool3x3;		//!< \brief boolean matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 4, bool, highp>		bool3x4;		//!< \brief boolean matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 2, bool, highp>		bool4x2;		//!< \brief boolean matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 3, bool, highp>		bool4x3;		//!< \brief boolean matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 4, bool, highp>		bool4x4;		//!< \brief boolean matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
 
 	typedef int							int1;			//!< \brief integer vector with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tvec2<int, highp>			int2;			//!< \brief integer vector with 2 components. (From GLM_GTX_compatibility extension)
-	typedef tvec3<int, highp>			int3;			//!< \brief integer vector with 3 components. (From GLM_GTX_compatibility extension)
-	typedef tvec4<int, highp>			int4;			//!< \brief integer vector with 4 components. (From GLM_GTX_compatibility extension)
+	typedef vec<2, int, highp>			int2;			//!< \brief integer vector with 2 components. (From GLM_GTX_compatibility extension)
+	typedef vec<3, int, highp>			int3;			//!< \brief integer vector with 3 components. (From GLM_GTX_compatibility extension)
+	typedef vec<4, int, highp>			int4;			//!< \brief integer vector with 4 components. (From GLM_GTX_compatibility extension)
 
 	typedef int							int1x1;			//!< \brief integer matrix with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tmat2x2<int, highp>		int2x2;			//!< \brief integer matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x3<int, highp>		int2x3;			//!< \brief integer matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x4<int, highp>		int2x4;			//!< \brief integer matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x2<int, highp>		int3x2;			//!< \brief integer matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x3<int, highp>		int3x3;			//!< \brief integer matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x4<int, highp>		int3x4;			//!< \brief integer matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x2<int, highp>		int4x2;			//!< \brief integer matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x3<int, highp>		int4x3;			//!< \brief integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x4<int, highp>		int4x4;			//!< \brief integer matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
-	typedef float						float1;			//!< \brief single-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tvec2<float, highp>		float2;			//!< \brief single-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
-	typedef tvec3<float, highp>		float3;			//!< \brief single-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
-	typedef tvec4<float, highp>		float4;			//!< \brief single-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
-
-	typedef float						float1x1;		//!< \brief single-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tmat2x2<float, highp>		float2x2;		//!< \brief single-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x3<float, highp>		float2x3;		//!< \brief single-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x4<float, highp>		float2x4;		//!< \brief single-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x2<float, highp>		float3x2;		//!< \brief single-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x3<float, highp>		float3x3;		//!< \brief single-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x4<float, highp>		float3x4;		//!< \brief single-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x2<float, highp>		float4x2;		//!< \brief single-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x3<float, highp>		float4x3;		//!< \brief single-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x4<float, highp>		float4x4;		//!< \brief single-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
-
-	typedef double						double1;		//!< \brief double-precision floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tvec2<double, highp>		double2;		//!< \brief double-precision floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
-	typedef tvec3<double, highp>		double3;		//!< \brief double-precision floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
-	typedef tvec4<double, highp>		double4;		//!< \brief double-precision floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
-
-	typedef double						double1x1;		//!< \brief double-precision floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
-	typedef tmat2x2<double, highp>		double2x2;		//!< \brief double-precision floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x3<double, highp>		double2x3;		//!< \brief double-precision floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat2x4<double, highp>		double2x4;		//!< \brief double-precision floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x2<double, highp>		double3x2;		//!< \brief double-precision floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x3<double, highp>		double3x3;		//!< \brief double-precision floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat3x4<double, highp>		double3x4;		//!< \brief double-precision floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x2<double, highp>		double4x2;		//!< \brief double-precision floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x3<double, highp>		double4x3;		//!< \brief double-precision floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
-	typedef tmat4x4<double, highp>		double4x4;		//!< \brief double-precision floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 2, int, highp>		int2x2;			//!< \brief integer matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 3, int, highp>		int2x3;			//!< \brief integer matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 4, int, highp>		int2x4;			//!< \brief integer matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 2, int, highp>		int3x2;			//!< \brief integer matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 3, int, highp>		int3x3;			//!< \brief integer matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 4, int, highp>		int3x4;			//!< \brief integer matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 2, int, highp>		int4x2;			//!< \brief integer matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 3, int, highp>		int4x3;			//!< \brief integer matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 4, int, highp>		int4x4;			//!< \brief integer matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
+
+	typedef float						float1;			//!< \brief single-qualifier floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
+	typedef vec<2, float, highp>		float2;			//!< \brief single-qualifier floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
+	typedef vec<3, float, highp>		float3;			//!< \brief single-qualifier floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
+	typedef vec<4, float, highp>		float4;			//!< \brief single-qualifier floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
+
+	typedef float						float1x1;		//!< \brief single-qualifier floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 2, float, highp>		float2x2;		//!< \brief single-qualifier floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 3, float, highp>		float2x3;		//!< \brief single-qualifier floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 4, float, highp>		float2x4;		//!< \brief single-qualifier floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 2, float, highp>		float3x2;		//!< \brief single-qualifier floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 3, float, highp>		float3x3;		//!< \brief single-qualifier floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 4, float, highp>		float3x4;		//!< \brief single-qualifier floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 2, float, highp>		float4x2;		//!< \brief single-qualifier floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 3, float, highp>		float4x3;		//!< \brief single-qualifier floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 4, float, highp>		float4x4;		//!< \brief single-qualifier floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
+
+	typedef double						double1;		//!< \brief double-qualifier floating-point vector with 1 component. (From GLM_GTX_compatibility extension)
+	typedef vec<2, double, highp>		double2;		//!< \brief double-qualifier floating-point vector with 2 components. (From GLM_GTX_compatibility extension)
+	typedef vec<3, double, highp>		double3;		//!< \brief double-qualifier floating-point vector with 3 components. (From GLM_GTX_compatibility extension)
+	typedef vec<4, double, highp>		double4;		//!< \brief double-qualifier floating-point vector with 4 components. (From GLM_GTX_compatibility extension)
+
+	typedef double						double1x1;		//!< \brief double-qualifier floating-point matrix with 1 component. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 2, double, highp>		double2x2;		//!< \brief double-qualifier floating-point matrix with 2 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 3, double, highp>		double2x3;		//!< \brief double-qualifier floating-point matrix with 2 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<2, 4, double, highp>		double2x4;		//!< \brief double-qualifier floating-point matrix with 2 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 2, double, highp>		double3x2;		//!< \brief double-qualifier floating-point matrix with 3 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 3, double, highp>		double3x3;		//!< \brief double-qualifier floating-point matrix with 3 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<3, 4, double, highp>		double3x4;		//!< \brief double-qualifier floating-point matrix with 3 x 4 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 2, double, highp>		double4x2;		//!< \brief double-qualifier floating-point matrix with 4 x 2 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 3, double, highp>		double4x3;		//!< \brief double-qualifier floating-point matrix with 4 x 3 components. (From GLM_GTX_compatibility extension)
+	typedef mat<4, 4, double, highp>		double4x4;		//!< \brief double-qualifier floating-point matrix with 4 x 4 components. (From GLM_GTX_compatibility extension)
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/compatibility.inl b/external/include/glm/gtx/compatibility.inl
index 368527a..11affa1 100644
--- a/external/include/glm/gtx/compatibility.inl
+++ b/external/include/glm/gtx/compatibility.inl
@@ -6,9 +6,9 @@
 namespace glm
 {
 	// isfinite
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool isfinite(
-		genType const & x)
+		genType const& x)
 	{
 #		if GLM_HAS_CXX11_STL
 			return std::isfinite(x) != 0;
@@ -24,38 +24,38 @@ namespace glm
 #		endif
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec1<bool, P> isfinite(
-		tvec1<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<1, bool, Q> isfinite(
+		vec<1, T, Q> const& x)
 	{
-		return tvec1<bool, P>(
+		return vec<1, bool, Q>(
 			isfinite(x.x));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<bool, P> isfinite(
-		tvec2<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, bool, Q> isfinite(
+		vec<2, T, Q> const& x)
 	{
-		return tvec2<bool, P>(
+		return vec<2, bool, Q>(
 			isfinite(x.x),
 			isfinite(x.y));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<bool, P> isfinite(
-		tvec3<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, bool, Q> isfinite(
+		vec<3, T, Q> const& x)
 	{
-		return tvec3<bool, P>(
+		return vec<3, bool, Q>(
 			isfinite(x.x),
 			isfinite(x.y),
 			isfinite(x.z));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<bool, P> isfinite(
-		tvec4<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, bool, Q> isfinite(
+		vec<4, T, Q> const& x)
 	{
-		return tvec4<bool, P>(
+		return vec<4, bool, Q>(
 			isfinite(x.x),
 			isfinite(x.y),
 			isfinite(x.z),
diff --git a/external/include/glm/gtx/component_wise.hpp b/external/include/glm/gtx/component_wise.hpp
index c316f9e..6ed7d55 100644
--- a/external/include/glm/gtx/component_wise.hpp
+++ b/external/include/glm/gtx/component_wise.hpp
@@ -2,21 +2,25 @@
 /// @file glm/gtx/component_wise.hpp
 /// @date 2007-05-21 / 2011-06-07
 /// @author Christophe Riccio
-/// 
+///
 /// @see core (dependence)
 ///
 /// @defgroup gtx_component_wise GLM_GTX_component_wise
 /// @ingroup gtx
 ///
-/// @brief Operations between components of a type
+/// Include <glm/gtx/component_wise.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/component_wise.hpp> need to be included to use these functionalities.
+/// Operations between components of a type
 
 #pragma once
 
 // Dependencies
 #include "../detail/setup.hpp"
-#include "../detail/precision.hpp"
+#include "../detail/qualifier.hpp"
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
 
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_component_wise extension included")
@@ -28,36 +32,36 @@ namespace glm
 	/// @{
 
 	/// Convert an integer vector to a normalized float vector.
-	/// If the parameter value type is already a floating precision type, the value is passed through.
+	/// If the parameter value type is already a floating qualifier type, the value is passed through.
 	/// @see gtx_component_wise
-	template <typename floatType, typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<floatType, P> compNormalize(vecType<T, P> const & v);
+	template<typename floatType, length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, floatType, Q> compNormalize(vec<L, T, Q> const& v);
 
 	/// Convert a normalized float vector to an integer vector.
-	/// If the parameter value type is already a floating precision type, the value is passed through.
+	/// If the parameter value type is already a floating qualifier type, the value is passed through.
 	/// @see gtx_component_wise
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> compScale(vecType<floatType, P> const & v);
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> compScale(vec<L, floatType, Q> const& v);
 
-	/// Add all vector components together. 
+	/// Add all vector components together.
 	/// @see gtx_component_wise
-	template <typename genType> 
-	GLM_FUNC_DECL typename genType::value_type compAdd(genType const & v);
+	template<typename genType>
+	GLM_FUNC_DECL typename genType::value_type compAdd(genType const& v);
 
-	/// Multiply all vector components together. 
+	/// Multiply all vector components together.
 	/// @see gtx_component_wise
-	template <typename genType> 
-	GLM_FUNC_DECL typename genType::value_type compMul(genType const & v);
+	template<typename genType>
+	GLM_FUNC_DECL typename genType::value_type compMul(genType const& v);
 
 	/// Find the minimum value between single vector components.
 	/// @see gtx_component_wise
-	template <typename genType> 
-	GLM_FUNC_DECL typename genType::value_type compMin(genType const & v);
+	template<typename genType>
+	GLM_FUNC_DECL typename genType::value_type compMin(genType const& v);
 
 	/// Find the maximum value between single vector components.
 	/// @see gtx_component_wise
-	template <typename genType> 
-	GLM_FUNC_DECL typename genType::value_type compMax(genType const & v);
+	template<typename genType>
+	GLM_FUNC_DECL typename genType::value_type compMax(genType const& v);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/component_wise.inl b/external/include/glm/gtx/component_wise.inl
index add3969..8ca0ca9 100644
--- a/external/include/glm/gtx/component_wise.inl
+++ b/external/include/glm/gtx/component_wise.inl
@@ -6,92 +6,92 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType, bool isInteger, bool signedType>
+	template<length_t L, typename T, typename floatType, qualifier Q, bool isInteger, bool signedType>
 	struct compute_compNormalize
 	{};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compNormalize<T, floatType, P, vecType, true, true>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compNormalize<L, T, floatType, Q, true, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, floatType, Q> call(vec<L, T, Q> const& v)
 		{
 			floatType const Min = static_cast<floatType>(std::numeric_limits<T>::min());
 			floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max());
-			return (vecType<floatType, P>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1);
+			return (vec<L, floatType, Q>(v) - Min) / (Max - Min) * static_cast<floatType>(2) - static_cast<floatType>(1);
 		}
 	};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compNormalize<T, floatType, P, vecType, true, false>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compNormalize<L, T, floatType, Q, true, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, floatType, Q> call(vec<L, T, Q> const& v)
 		{
-			return vecType<floatType, P>(v) / static_cast<floatType>(std::numeric_limits<T>::max());
+			return vec<L, floatType, Q>(v) / static_cast<floatType>(std::numeric_limits<T>::max());
 		}
 	};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compNormalize<T, floatType, P, vecType, false, true>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compNormalize<L, T, floatType, Q, false, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<floatType, P> call(vecType<T, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, floatType, Q> call(vec<L, T, Q> const& v)
 		{
 			return v;
 		}
 	};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType, bool isInteger, bool signedType>
+	template<length_t L, typename T, typename floatType, qualifier Q, bool isInteger, bool signedType>
 	struct compute_compScale
 	{};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compScale<T, floatType, P, vecType, true, true>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compScale<L, T, floatType, Q, true, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, floatType, Q> const& v)
 		{
 			floatType const Max = static_cast<floatType>(std::numeric_limits<T>::max()) + static_cast<floatType>(0.5);
-			vecType<floatType, P> const Scaled(v * Max);
-			vecType<T, P> const Result(Scaled - static_cast<floatType>(0.5));
+			vec<L, floatType, Q> const Scaled(v * Max);
+			vec<L, T, Q> const Result(Scaled - static_cast<floatType>(0.5));
 			return Result;
 		}
 	};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compScale<T, floatType, P, vecType, true, false>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compScale<L, T, floatType, Q, true, false>
 	{
-		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, floatType, Q> const& v)
 		{
-			return vecType<T, P>(vecType<floatType, P>(v) * static_cast<floatType>(std::numeric_limits<T>::max()));
+			return vec<L, T, Q>(vec<L, floatType, Q>(v) * static_cast<floatType>(std::numeric_limits<T>::max()));
 		}
 	};
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	struct compute_compScale<T, floatType, P, vecType, false, true>
+	template<length_t L, typename T, typename floatType, qualifier Q>
+	struct compute_compScale<L, T, floatType, Q, false, true>
 	{
-		GLM_FUNC_QUALIFIER static vecType<T, P> call(vecType<floatType, P> const & v)
+		GLM_FUNC_QUALIFIER static vec<L, T, Q> call(vec<L, floatType, Q> const& v)
 		{
 			return v;
 		}
 	};
 }//namespace detail
 
-	template <typename floatType, typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<floatType, P> compNormalize(vecType<T, P> const & v)
+	template<typename floatType, length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, floatType, Q> compNormalize(vec<L, T, Q> const& v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compNormalize' accepts only floating-point types for 'floatType' template parameter");
 
-		return detail::compute_compNormalize<T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
+		return detail::compute_compNormalize<L, T, floatType, Q, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
 	}
 
-	template <typename T, typename floatType, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> compScale(vecType<floatType, P> const & v)
+	template<typename T, length_t L, typename floatType, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> compScale(vec<L, floatType, Q> const& v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<floatType>::is_iec559, "'compScale' accepts only floating-point types for 'floatType' template parameter");
 
-		return detail::compute_compScale<T, floatType, P, vecType, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
+		return detail::compute_compScale<L, T, floatType, Q, std::numeric_limits<T>::is_integer, std::numeric_limits<T>::is_signed>::call(v);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compAdd(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T compAdd(vec<L, T, Q> const& v)
 	{
 		T Result(0);
 		for(length_t i = 0, n = v.length(); i < n; ++i)
@@ -99,8 +99,8 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMul(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T compMul(vec<L, T, Q> const& v)
 	{
 		T Result(1);
 		for(length_t i = 0, n = v.length(); i < n; ++i)
@@ -108,8 +108,8 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMin(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T compMin(vec<L, T, Q> const& v)
 	{
 		T Result(v[0]);
 		for(length_t i = 1, n = v.length(); i < n; ++i)
@@ -117,8 +117,8 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T compMax(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T compMax(vec<L, T, Q> const& v)
 	{
 		T Result(v[0]);
 		for(length_t i = 1, n = v.length(); i < n; ++i)
diff --git a/external/include/glm/gtx/dual_quaternion.hpp b/external/include/glm/gtx/dual_quaternion.hpp
index 4d7b61e..5544514 100644
--- a/external/include/glm/gtx/dual_quaternion.hpp
+++ b/external/include/glm/gtx/dual_quaternion.hpp
@@ -3,16 +3,15 @@
 /// @author Maksim Vorobiev (msomeone@gmail.com)
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 /// @see gtc_constants (dependence)
 /// @see gtc_quaternion (dependence)
 ///
 /// @defgroup gtx_dual_quaternion GLM_GTX_dual_quaternion
 /// @ingroup gtx
 ///
-/// @brief Defines a templated dual-quaternion type and several dual-quaternion operations.
+/// Include <glm/gtx/dual_quaternion.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/dual_quaternion.hpp> need to be included to use these functionalities.
+/// Defines a templated dual-quaternion type and several dual-quaternion operations.
 
 #pragma once
 
@@ -21,6 +20,10 @@
 #include "../gtc/constants.hpp"
 #include "../gtc/quaternion.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_dual_quaternion extension included")
 #endif
@@ -30,192 +33,197 @@ namespace glm
 	/// @addtogroup gtx_dual_quaternion
 	/// @{
 
-	template <typename T, precision P = defaultp>
+	template<typename T, qualifier Q = defaultp>
 	struct tdualquat
 	{
 		// -- Implementation detail --
 
 		typedef T value_type;
-		typedef glm::tquat<T, P> part_type;
+		typedef glm::tquat<T, Q> part_type;
 
 		// -- Data --
 
-		glm::tquat<T, P> real, dual;
+		glm::tquat<T, Q> real, dual;
 
 		// -- Component accesses --
 
 		typedef length_t length_type;
 		/// Return the count of components of a dual quaternion
-		GLM_FUNC_DECL static length_type length(){return 2;}
+		GLM_FUNC_DECL static GLM_CONSTEXPR length_type length(){return 2;}
 
 		GLM_FUNC_DECL part_type & operator[](length_type i);
-		GLM_FUNC_DECL part_type const & operator[](length_type i) const;
+		GLM_FUNC_DECL part_type const& operator[](length_type i) const;
 
 		// -- Implicit basic constructors --
 
 		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat() GLM_DEFAULT_CTOR;
-		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, P> const & d) GLM_DEFAULT;
-		template <precision Q>
-		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, Q> const & d);
+		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, Q> const& d) GLM_DEFAULT;
+		template<qualifier P>
+		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tdualquat<T, P> const& d);
 
 		// -- Explicit basic constructors --
 
-		GLM_FUNC_DECL GLM_CONSTEXPR_CTOR explicit tdualquat(ctor);
-		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real);
-		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & orientation, tvec3<T, P> const & translation);
-		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, P> const & real, tquat<T, P> const & dual);
+		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, Q> const& real);
+		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, Q> const& orientation, vec<3, T, Q> const& translation);
+		GLM_FUNC_DECL GLM_CONSTEXPR tdualquat(tquat<T, Q> const& real, tquat<T, Q> const& dual);
 
 		// -- Conversion constructors --
 
-		template <typename U, precision Q>
-		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tdualquat<U, Q> const & q);
+		template<typename U, qualifier P>
+		GLM_FUNC_DECL GLM_CONSTEXPR GLM_EXPLICIT tdualquat(tdualquat<U, P> const& q);
 
-		GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat2x4<T, P> const & holder_mat);
-		GLM_FUNC_DECL GLM_EXPLICIT tdualquat(tmat3x4<T, P> const & aug_mat);
+		GLM_FUNC_DECL GLM_EXPLICIT tdualquat(mat<2, 4, T, Q> const& holder_mat);
+		GLM_FUNC_DECL GLM_EXPLICIT tdualquat(mat<3, 4, T, Q> const& aug_mat);
 
 		// -- Unary arithmetic operators --
 
-		GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<T, P> const & m) GLM_DEFAULT;
+		GLM_FUNC_DECL tdualquat<T, Q> & operator=(tdualquat<T, Q> const& m) GLM_DEFAULT;
 
-		template <typename U>
-		GLM_FUNC_DECL tdualquat<T, P> & operator=(tdualquat<U, P> const & m);
-		template <typename U>
-		GLM_FUNC_DECL tdualquat<T, P> & operator*=(U s);
-		template <typename U>
-		GLM_FUNC_DECL tdualquat<T, P> & operator/=(U s);
+		template<typename U>
+		GLM_FUNC_DECL tdualquat<T, Q> & operator=(tdualquat<U, Q> const& m);
+		template<typename U>
+		GLM_FUNC_DECL tdualquat<T, Q> & operator*=(U s);
+		template<typename U>
+		GLM_FUNC_DECL tdualquat<T, Q> & operator/=(U s);
 	};
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator+(tdualquat<T, Q> const& q);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator-(tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator-(tdualquat<T, Q> const& q);
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator+(tdualquat<T, Q> const& q, tdualquat<T, Q> const& p);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, tdualquat<T, P> const & p);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator*(tdualquat<T, Q> const& q, tdualquat<T, Q> const& p);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> operator*(tdualquat<T, P> const & q, tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> operator*(tdualquat<T, Q> const& q, vec<3, T, Q> const& v);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> operator*(tvec3<T, P> const & v, tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> operator*(vec<3, T, Q> const& v, tdualquat<T, Q> const& q);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> operator*(tdualquat<T, P> const & q, tvec4<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> operator*(tdualquat<T, Q> const& q, vec<4, T, Q> const& v);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> operator*(tvec4<T, P> const & v, tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> operator*(vec<4, T, Q> const& v, tdualquat<T, Q> const& q);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator*(tdualquat<T, Q> const& q, T const& s);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator*(T const& s, tdualquat<T, Q> const& q);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> operator/(tdualquat<T, P> const & q, T const & s);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> operator/(tdualquat<T, Q> const& q, T const& s);
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool operator==(tdualquat<T, Q> const& q1, tdualquat<T, Q> const& q2);
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool operator!=(tdualquat<T, Q> const& q1, tdualquat<T, Q> const& q2);
 
-	template <typename T, precision P>
-	GLM_FUNC_DECL bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2);
+	/// Creates an identity dual quaternion.
+	///
+	/// @see gtx_dual_quaternion
+	template <typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> dual_quat_identity();
 
 	/// Returns the normalized quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> normalize(tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> normalize(tdualquat<T, Q> const& q);
 
 	/// Returns the linear interpolation of two dual quaternion.
 	///
 	/// @see gtc_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> lerp(tdualquat<T, Q> const& x, tdualquat<T, Q> const& y, T const& a);
 
 	/// Returns the q inverse.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> inverse(tdualquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> inverse(tdualquat<T, Q> const& q);
 
 	/// Converts a quaternion to a 2 * 4 matrix.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x4<T, P> mat2x4_cast(tdualquat<T, P> const & x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 4, T, Q> mat2x4_cast(tdualquat<T, Q> const& x);
 
 	/// Converts a quaternion to a 3 * 4 matrix.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x4<T, P> mat3x4_cast(tdualquat<T, P> const & x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 4, T, Q> mat3x4_cast(tdualquat<T, Q> const& x);
 
 	/// Converts a 2 * 4 matrix (matrix which holds real and dual parts) to a quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(tmat2x4<T, P> const & x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> dualquat_cast(mat<2, 4, T, Q> const& x);
 
 	/// Converts a 3 * 4 matrix (augmented matrix rotation + translation) to a quaternion.
 	///
 	/// @see gtx_dual_quaternion
-	template <typename T, precision P>
-	GLM_FUNC_DECL tdualquat<T, P> dualquat_cast(tmat3x4<T, P> const & x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tdualquat<T, Q> dualquat_cast(mat<3, 4, T, Q> const& x);
 
 
-	/// Dual-quaternion of low single-precision floating-point numbers.
+	/// Dual-quaternion of low single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, lowp>		lowp_dualquat;
 
-	/// Dual-quaternion of medium single-precision floating-point numbers.
+	/// Dual-quaternion of medium single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, mediump>	mediump_dualquat;
 
-	/// Dual-quaternion of high single-precision floating-point numbers.
+	/// Dual-quaternion of high single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, highp>		highp_dualquat;
 
 
-	/// Dual-quaternion of low single-precision floating-point numbers.
+	/// Dual-quaternion of low single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, lowp>		lowp_fdualquat;
 
-	/// Dual-quaternion of medium single-precision floating-point numbers.
+	/// Dual-quaternion of medium single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, mediump>	mediump_fdualquat;
 
-	/// Dual-quaternion of high single-precision floating-point numbers.
+	/// Dual-quaternion of high single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<float, highp>		highp_fdualquat;
 
 
-	/// Dual-quaternion of low double-precision floating-point numbers.
+	/// Dual-quaternion of low double-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<double, lowp>		lowp_ddualquat;
 
-	/// Dual-quaternion of medium double-precision floating-point numbers.
+	/// Dual-quaternion of medium double-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<double, mediump>	mediump_ddualquat;
 
-	/// Dual-quaternion of high double-precision floating-point numbers.
+	/// Dual-quaternion of high double-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef tdualquat<double, highp>	highp_ddualquat;
@@ -227,7 +235,7 @@ namespace glm
 	/// @see gtx_dual_quaternion
 	typedef highp_fdualquat			dualquat;
 
-	/// Dual-quaternion of single-precision floating-point numbers.
+	/// Dual-quaternion of single-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef highp_fdualquat			fdualquat;
@@ -246,7 +254,7 @@ namespace glm
 
 
 #if(!defined(GLM_PRECISION_HIGHP_DOUBLE) && !defined(GLM_PRECISION_MEDIUMP_DOUBLE) && !defined(GLM_PRECISION_LOWP_DOUBLE))
-	/// Dual-quaternion of default double-precision floating-point numbers.
+	/// Dual-quaternion of default double-qualifier floating-point numbers.
 	///
 	/// @see gtx_dual_quaternion
 	typedef highp_ddualquat			ddualquat;
diff --git a/external/include/glm/gtx/dual_quaternion.inl b/external/include/glm/gtx/dual_quaternion.inl
index c3f2bc6..5c82b88 100644
--- a/external/include/glm/gtx/dual_quaternion.inl
+++ b/external/include/glm/gtx/dual_quaternion.inl
@@ -8,15 +8,15 @@ namespace glm
 {
 	// -- Component accesses --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename tdualquat<T, Q>::part_type & tdualquat<T, Q>::operator[](typename tdualquat<T, Q>::length_type i)
 	{
 		assert(i >= 0 && i < this->length());
 		return (&real)[i];
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER typename tdualquat<T, P>::part_type const & tdualquat<T, P>::operator[](typename tdualquat<T, P>::length_type i) const
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER typename tdualquat<T, Q>::part_type const& tdualquat<T, Q>::operator[](typename tdualquat<T, Q>::length_type i) const
 	{
 		assert(i >= 0 && i < this->length());
 		return (&real)[i];
@@ -24,44 +24,40 @@ namespace glm
 
 	// -- Implicit basic constructors --
 
-#	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-		template <typename T, precision P>
-		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat()
-#			ifndef GLM_FORCE_NO_CTOR_INIT 
-				: real(tquat<T, P>())
-				, dual(tquat<T, P>(0, 0, 0, 0))
+#	if !GLM_HAS_DEFAULTED_FUNCTIONS || defined(GLM_FORCE_CTOR_INIT)
+		template<typename T, qualifier Q>
+		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat()
+#			ifdef GLM_FORCE_CTOR_INIT
+			: real(tquat<T, Q>())
+			, dual(tquat<T, Q>(0, 0, 0, 0))
 #			endif
 		{}
 #	endif
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
-		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, P> const & d)
+		template<typename T, qualifier Q>
+		GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tdualquat<T, Q> const& d)
 			: real(d.real)
 			, dual(d.dual)
 		{}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <precision Q>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<T, Q> const & d)
+	template<typename T, qualifier Q>
+	template<qualifier P>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tdualquat<T, P> const& d)
 		: real(d.real)
 		, dual(d.dual)
 	{}
 
 	// -- Explicit basic constructors --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR_CTOR tdualquat<T, P>::tdualquat(ctor)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tquat<T, Q> const& r)
+		: real(r), dual(tquat<T, Q>(0, 0, 0, 0))
 	{}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r)
-		: real(r), dual(tquat<T, P>(0, 0, 0, 0))
-	{}
-
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & q, tvec3<T, P> const& p)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tquat<T, Q> const& q, vec<3, T, Q> const& p)
 		: real(q), dual(
 			T(-0.5) * ( p.x*q.x + p.y*q.y + p.z*q.z),
 			T(+0.5) * ( p.x*q.w + p.y*q.z - p.z*q.y),
@@ -69,28 +65,28 @@ namespace glm
 			T(+0.5) * ( p.x*q.y - p.y*q.x + p.z*q.w))
 	{}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tquat<T, P> const & r, tquat<T, P> const & d)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tquat<T, Q> const& r, tquat<T, Q> const& d)
 		: real(r), dual(d)
 	{}
 
 	// -- Conversion constructors --
 
-	template <typename T, precision P>
-	template <typename U, precision Q>
-	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, P>::tdualquat(tdualquat<U, Q> const & q)
+	template<typename T, qualifier Q>
+	template<typename U, qualifier P>
+	GLM_FUNC_QUALIFIER GLM_CONSTEXPR tdualquat<T, Q>::tdualquat(tdualquat<U, P> const& q)
 		: real(q.real)
 		, dual(q.dual)
 	{}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat2x4<T, P> const & m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q>::tdualquat(mat<2, 4, T, Q> const& m)
 	{
 		*this = dualquat_cast(m);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P>::tdualquat(tmat3x4<T, P> const & m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q>::tdualquat(mat<3, 4, T, Q> const& m)
 	{
 		*this = dualquat_cast(m);
 	}
@@ -98,8 +94,8 @@ namespace glm
 	// -- Unary arithmetic operators --
 
 #	if !GLM_HAS_DEFAULTED_FUNCTIONS
-		template <typename T, precision P>
-		GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<T, P> const & q)
+		template<typename T, qualifier Q>
+		GLM_FUNC_QUALIFIER tdualquat<T, Q> & tdualquat<T, Q>::operator=(tdualquat<T, Q> const& q)
 		{
 			this->real = q.real;
 			this->dual = q.dual;
@@ -107,27 +103,27 @@ namespace glm
 		}
 #	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator=(tdualquat<U, P> const & q)
+	template<typename T, qualifier Q>
+	template<typename U>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> & tdualquat<T, Q>::operator=(tdualquat<U, Q> const& q)
 	{
 		this->real = q.real;
 		this->dual = q.dual;
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator*=(U s)
+	template<typename T, qualifier Q>
+	template<typename U>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> & tdualquat<T, Q>::operator*=(U s)
 	{
 		this->real *= static_cast<T>(s);
 		this->dual *= static_cast<T>(s);
 		return *this;
 	}
 
-	template <typename T, precision P>
-	template <typename U>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> & tdualquat<T, P>::operator/=(U s)
+	template<typename T, qualifier Q>
+	template<typename U>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> & tdualquat<T, Q>::operator/=(U s)
 	{
 		this->real /= static_cast<T>(s);
 		this->dual /= static_cast<T>(s);
@@ -136,100 +132,108 @@ namespace glm
 
 	// -- Unary bit operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator+(tdualquat<T, Q> const& q)
 	{
 		return q;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator-(tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator-(tdualquat<T, Q> const& q)
 	{
-		return tdualquat<T, P>(-q.real, -q.dual);
+		return tdualquat<T, Q>(-q.real, -q.dual);
 	}
 
 	// -- Binary operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator+(tdualquat<T, P> const & q, tdualquat<T, P> const & p)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator+(tdualquat<T, Q> const& q, tdualquat<T, Q> const& p)
 	{
-		return tdualquat<T, P>(q.real + p.real,q.dual + p.dual);
+		return tdualquat<T, Q>(q.real + p.real,q.dual + p.dual);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & p, tdualquat<T, P> const & o)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator*(tdualquat<T, Q> const& p, tdualquat<T, Q> const& o)
 	{
-		return tdualquat<T, P>(p.real * o.real,p.real * o.dual + p.dual * o.real);
+		return tdualquat<T, Q>(p.real * o.real,p.real * o.dual + p.dual * o.real);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tdualquat<T, P> const & q, tvec3<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> operator*(tdualquat<T, Q> const& q, vec<3, T, Q> const& v)
 	{
-		tvec3<T, P> const real_v3(q.real.x,q.real.y,q.real.z);
-		tvec3<T, P> const dual_v3(q.dual.x,q.dual.y,q.dual.z);
+		vec<3, T, Q> const real_v3(q.real.x,q.real.y,q.real.z);
+		vec<3, T, Q> const dual_v3(q.dual.x,q.dual.y,q.dual.z);
 		return (cross(real_v3, cross(real_v3,v) + v * q.real.w + dual_v3) + dual_v3 * q.real.w - real_v3 * q.dual.w) * T(2) + v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> operator*(tvec3<T, P> const & v,	tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> operator*(vec<3, T, Q> const& v,	tdualquat<T, Q> const& q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tdualquat<T, P> const & q, tvec4<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(tdualquat<T, Q> const& q, vec<4, T, Q> const& v)
 	{
-		return tvec4<T, P>(q * tvec3<T, P>(v), v.w);
+		return vec<4, T, Q>(q * vec<3, T, Q>(v), v.w);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec4<T, P> const & v,	tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> operator*(vec<4, T, Q> const& v,	tdualquat<T, Q> const& q)
 	{
 		return glm::inverse(q) * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(tdualquat<T, P> const & q, T const & s)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator*(tdualquat<T, Q> const& q, T const& s)
 	{
-		return tdualquat<T, P>(q.real * s, q.dual * s);
+		return tdualquat<T, Q>(q.real * s, q.dual * s);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator*(T const & s, tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator*(T const& s, tdualquat<T, Q> const& q)
 	{
 		return q * s;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> operator/(tdualquat<T, P> const & q,	T const & s)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> operator/(tdualquat<T, Q> const& q,	T const& s)
 	{
-		return tdualquat<T, P>(q.real / s, q.dual / s);
+		return tdualquat<T, Q>(q.real / s, q.dual / s);
 	}
 
 	// -- Boolean operators --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER bool operator==(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool operator==(tdualquat<T, Q> const& q1, tdualquat<T, Q> const& q2)
 	{
 		return (q1.real == q2.real) && (q1.dual == q2.dual);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER bool operator!=(tdualquat<T, P> const & q1, tdualquat<T, P> const & q2)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool operator!=(tdualquat<T, Q> const& q1, tdualquat<T, Q> const& q2)
 	{
-		return (q1.real != q2.dual) || (q1.real != q2.dual);
+		return (q1.real != q2.real) || (q1.dual != q2.dual);
 	}
 
 	// -- Operations --
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> normalize(tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> dual_quat_identity()
+	{
+		return tdualquat<T, Q>(
+			tquat<T, Q>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0)),
+			tquat<T, Q>(static_cast<T>(0), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0)));
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> normalize(tdualquat<T, Q> const& q)
 	{
 		return q / length(q.real);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> lerp(tdualquat<T, P> const & x, tdualquat<T, P> const & y, T const & a)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> lerp(tdualquat<T, Q> const& x, tdualquat<T, Q> const& y, T const& a)
 	{
 		// Dual Quaternion Linear blend aka DLB:
 		// Lerp is only defined in [0, 1]
@@ -237,72 +241,72 @@ namespace glm
 		assert(a <= static_cast<T>(1));
 		T const k = dot(x.real,y.real) < static_cast<T>(0) ? -a : a;
 		T const one(1);
-		return tdualquat<T, P>(x * (one - a) + y * k);
+		return tdualquat<T, Q>(x * (one - a) + y * k);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> inverse(tdualquat<T, P> const & q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> inverse(tdualquat<T, Q> const& q)
 	{
-		const glm::tquat<T, P> real = conjugate(q.real);
-		const glm::tquat<T, P> dual = conjugate(q.dual);
-		return tdualquat<T, P>(real, dual + (real * (-2.0f * dot(real,dual))));
+		const glm::tquat<T, Q> real = conjugate(q.real);
+		const glm::tquat<T, Q> dual = conjugate(q.dual);
+		return tdualquat<T, Q>(real, dual + (real * (-2.0f * dot(real,dual))));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat2x4<T, P> mat2x4_cast(tdualquat<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 4, T, Q> mat2x4_cast(tdualquat<T, Q> const& x)
 	{
-		return tmat2x4<T, P>( x[0].x, x[0].y, x[0].z, x[0].w, x[1].x, x[1].y, x[1].z, x[1].w );
+		return mat<2, 4, T, Q>( x[0].x, x[0].y, x[0].z, x[0].w, x[1].x, x[1].y, x[1].z, x[1].w );
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x4<T, P> mat3x4_cast(tdualquat<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 4, T, Q> mat3x4_cast(tdualquat<T, Q> const& x)
 	{
-		tquat<T, P> r = x.real / length2(x.real);
-		
-		tquat<T, P> const rr(r.w * x.real.w, r.x * x.real.x, r.y * x.real.y, r.z * x.real.z);
+		tquat<T, Q> r = x.real / length2(x.real);
+
+		tquat<T, Q> const rr(r.w * x.real.w, r.x * x.real.x, r.y * x.real.y, r.z * x.real.z);
 		r *= static_cast<T>(2);
-		
+
 		T const xy = r.x * x.real.y;
 		T const xz = r.x * x.real.z;
 		T const yz = r.y * x.real.z;
 		T const wx = r.w * x.real.x;
 		T const wy = r.w * x.real.y;
 		T const wz = r.w * x.real.z;
-		
-		tvec4<T, P> const a(
+
+		vec<4, T, Q> const a(
 			rr.w + rr.x - rr.y - rr.z,
 			xy - wz,
 			xz + wy,
 			-(x.dual.w * r.x - x.dual.x * r.w + x.dual.y * r.z - x.dual.z * r.y));
-		
-		tvec4<T, P> const b(
+
+		vec<4, T, Q> const b(
 			xy + wz,
 			rr.w + rr.y - rr.x - rr.z,
 			yz - wx,
 			-(x.dual.w * r.y - x.dual.x * r.z - x.dual.y * r.w + x.dual.z * r.x));
-		
-		tvec4<T, P> const c(
+
+		vec<4, T, Q> const c(
 			xz - wy,
 			yz + wx,
 			rr.w + rr.z - rr.x - rr.y,
 			-(x.dual.w * r.z + x.dual.x * r.y - x.dual.y * r.x - x.dual.z * r.w));
-		
-		return tmat3x4<T, P>(a, b, c);
+
+		return mat<3, 4, T, Q>(a, b, c);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat2x4<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> dualquat_cast(mat<2, 4, T, Q> const& x)
 	{
-		return tdualquat<T, P>(
-			tquat<T, P>( x[0].w, x[0].x, x[0].y, x[0].z ),
-			tquat<T, P>( x[1].w, x[1].x, x[1].y, x[1].z ));
+		return tdualquat<T, Q>(
+			tquat<T, Q>( x[0].w, x[0].x, x[0].y, x[0].z ),
+			tquat<T, Q>( x[1].w, x[1].x, x[1].y, x[1].z ));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tdualquat<T, P> dualquat_cast(tmat3x4<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tdualquat<T, Q> dualquat_cast(mat<3, 4, T, Q> const& x)
 	{
-		tquat<T, P> real(uninitialize);
-		
+		tquat<T, Q> real;
+
 		T const trace = x[0].x + x[1].y + x[2].z;
 		if(trace > static_cast<T>(0))
 		{
@@ -340,12 +344,12 @@ namespace glm
 			real.z = static_cast<T>(0.5) * r;
 			real.w = (x[1].x - x[0].y) * invr;
 		}
-		
-		tquat<T, P> dual(uninitialize);
+
+		tquat<T, Q> dual;
 		dual.x =  static_cast<T>(0.5) * ( x[0].w * real.w + x[1].w * real.z - x[2].w * real.y);
 		dual.y =  static_cast<T>(0.5) * (-x[0].w * real.z + x[1].w * real.w + x[2].w * real.x);
 		dual.z =  static_cast<T>(0.5) * ( x[0].w * real.y - x[1].w * real.x + x[2].w * real.w);
 		dual.w = -static_cast<T>(0.5) * ( x[0].w * real.x + x[1].w * real.y + x[2].w * real.z);
-		return tdualquat<T, P>(real, dual);
+		return tdualquat<T, Q>(real, dual);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/easing.hpp b/external/include/glm/gtx/easing.hpp
new file mode 100644
index 0000000..913ca70
--- /dev/null
+++ b/external/include/glm/gtx/easing.hpp
@@ -0,0 +1,221 @@
+/// @ref gtx_easing
+/// @file glm/gtx/easing.hpp
+/// @author Robert Chisholm
+///
+/// @see core (dependence)
+///
+/// @defgroup gtx_easing GLM_GTX_easing
+/// @ingroup gtx
+///
+/// Include <glm/gtx/easing.hpp> to use the features of this extension.
+///
+/// Easing functions for animations and transitons
+/// All functions take a parameter x in the range [0.0,1.0]
+///
+/// Based on the AHEasing project of Warren Moore (https://github.com/warrenm/AHEasing)
+
+#pragma once
+
+// Dependency:
+#include "../glm.hpp"
+#include "../gtc/constants.hpp"
+#include "../detail/setup.hpp"
+#include "../detail/qualifier.hpp"
+#include "../detail/type_int.hpp"
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_easing is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTX_easing extension included")
+#endif
+
+namespace glm{
+	/// @addtogroup gtx_easing
+	/// @{
+
+	/// Modelled after the line y = x
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType linearInterpolation(genType const & a);
+
+	/// Modelled after the parabola y = x^2
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quadraticEaseIn(genType const & a);
+
+	/// Modelled after the parabola y = -x^2 + 2x
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quadraticEaseOut(genType const & a);
+
+	/// Modelled after the piecewise quadratic
+	/// y = (1/2)((2x)^2)				; [0, 0.5)
+	/// y = -(1/2)((2x-1)*(2x-3) - 1)	; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quadraticEaseInOut(genType const & a);
+
+	/// Modelled after the cubic y = x^3
+	template <typename genType>
+	GLM_FUNC_DECL genType cubicEaseIn(genType const & a);
+
+	/// Modelled after the cubic y = (x - 1)^3 + 1
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType cubicEaseOut(genType const & a);
+
+	/// Modelled after the piecewise cubic
+	/// y = (1/2)((2x)^3)		; [0, 0.5)
+	/// y = (1/2)((2x-2)^3 + 2)	; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType cubicEaseInOut(genType const & a);
+
+	/// Modelled after the quartic x^4
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quarticEaseIn(genType const & a);
+
+	/// Modelled after the quartic y = 1 - (x - 1)^4
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quarticEaseOut(genType const & a);
+
+	/// Modelled after the piecewise quartic
+	/// y = (1/2)((2x)^4)			; [0, 0.5)
+	/// y = -(1/2)((2x-2)^4 - 2)	; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quarticEaseInOut(genType const & a);
+
+	/// Modelled after the quintic y = x^5
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quinticEaseIn(genType const & a);
+
+	/// Modelled after the quintic y = (x - 1)^5 + 1
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quinticEaseOut(genType const & a);
+
+	/// Modelled after the piecewise quintic
+	/// y = (1/2)((2x)^5)		; [0, 0.5)
+	/// y = (1/2)((2x-2)^5 + 2) ; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType quinticEaseInOut(genType const & a);
+
+	/// Modelled after quarter-cycle of sine wave
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType sineEaseIn(genType const & a);
+
+	/// Modelled after quarter-cycle of sine wave (different phase)
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType sineEaseOut(genType const & a);
+
+	/// Modelled after half sine wave
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType sineEaseInOut(genType const & a);
+
+	/// Modelled after shifted quadrant IV of unit circle
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType circularEaseIn(genType const & a);
+
+	/// Modelled after shifted quadrant II of unit circle
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType circularEaseOut(genType const & a);
+
+	/// Modelled after the piecewise circular function
+	/// y = (1/2)(1 - sqrt(1 - 4x^2))			; [0, 0.5)
+	/// y = (1/2)(sqrt(-(2x - 3)*(2x - 1)) + 1) ; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType circularEaseInOut(genType const & a);
+
+	/// Modelled after the exponential function y = 2^(10(x - 1))
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType exponentialEaseIn(genType const & a);
+
+	/// Modelled after the exponential function y = -2^(-10x) + 1
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType exponentialEaseOut(genType const & a);
+
+	/// Modelled after the piecewise exponential
+	/// y = (1/2)2^(10(2x - 1))			; [0,0.5)
+	/// y = -(1/2)*2^(-10(2x - 1))) + 1 ; [0.5,1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType exponentialEaseInOut(genType const & a);
+
+	/// Modelled after the damped sine wave y = sin(13pi/2*x)*pow(2, 10 * (x - 1))
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType elasticEaseIn(genType const & a);
+
+	/// Modelled after the damped sine wave y = sin(-13pi/2*(x + 1))*pow(2, -10x) + 1
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType elasticEaseOut(genType const & a);
+
+	/// Modelled after the piecewise exponentially-damped sine wave:
+	/// y = (1/2)*sin(13pi/2*(2*x))*pow(2, 10 * ((2*x) - 1))		; [0,0.5)
+	/// y = (1/2)*(sin(-13pi/2*((2x-1)+1))*pow(2,-10(2*x-1)) + 2)	; [0.5, 1]
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType elasticEaseInOut(genType const & a);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseIn(genType const& a);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseOut(genType const& a);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseInOut(genType const& a);
+
+	/// @param a parameter
+	/// @param o Optional overshoot modifier
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseIn(genType const& a, genType const& o);
+
+	/// @param a parameter
+	/// @param o Optional overshoot modifier
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseOut(genType const& a, genType const& o);
+
+	/// @param a parameter
+	/// @param o Optional overshoot modifier
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType backEaseInOut(genType const& a, genType const& o);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType bounceEaseIn(genType const& a);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType bounceEaseOut(genType const& a);
+
+	/// @see gtx_easing
+	template <typename genType>
+	GLM_FUNC_DECL genType bounceEaseInOut(genType const& a);
+
+	/// @}
+}//namespace glm
+
+#include "easing.inl"
diff --git a/external/include/glm/gtx/easing.inl b/external/include/glm/gtx/easing.inl
new file mode 100644
index 0000000..b6d7886
--- /dev/null
+++ b/external/include/glm/gtx/easing.inl
@@ -0,0 +1,437 @@
+/// @ref gtx_easing
+/// @file glm/gtx/easing.inl
+
+#include <cmath>
+
+namespace glm{
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType linearInterpolation(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return a;
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quadraticEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return a * a;
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quadraticEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return -(a * (a - static_cast<genType>(2)));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quadraticEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(2) * a * a;
+		}
+		else
+		{
+			return (-static_cast<genType>(2) * a * a) + (4 * a) - one<genType>();
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType cubicEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return a * a * a;
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType cubicEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType const f = a - one<genType>();
+		return f * f * f + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType cubicEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if (a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(4) * a * a * a;
+		}
+		else
+		{
+			genType const f = ((static_cast<genType>(2) * a) - static_cast<genType>(2));
+			return static_cast<genType>(0.5) * f * f * f + one<genType>();
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quarticEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return a * a * a * a;
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quarticEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType const f = (a - one<genType>());
+		return f * f * f * (one<genType>() - a) + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quarticEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(8) * a * a * a * a;
+		}
+		else
+		{
+			genType const f = (a - one<genType>());
+			return -static_cast<genType>(8) * f * f * f * f + one<genType>();
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quinticEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return a * a * a * a * a;
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quinticEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType const f = (a - one<genType>());
+		return f * f * f * f * f + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType quinticEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(16) * a * a * a * a * a;
+		}
+		else
+		{
+			genType const f = ((static_cast<genType>(2) * a) - static_cast<genType>(2));
+			return static_cast<genType>(0.5) * f * f * f * f * f + one<genType>();
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType sineEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return sin((a - one<genType>()) * half_pi<genType>()) + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType sineEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return sin(a * half_pi<genType>());
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType sineEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return static_cast<genType>(0.5) * (one<genType>() - cos(a * pi<genType>()));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType circularEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return one<genType>() - sqrt(one<genType>() - (a * a));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType circularEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return sqrt((static_cast<genType>(2) - a) * a);
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType circularEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(0.5) * (one<genType>() - std::sqrt(one<genType>() - static_cast<genType>(4) * (a * a)));
+		}
+		else
+		{
+			return static_cast<genType>(0.5) * (std::sqrt(-((static_cast<genType>(2) * a) - static_cast<genType>(3)) * ((static_cast<genType>(2) * a) - one<genType>())) + one<genType>());
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType exponentialEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a <= zero<genType>())
+			return a;
+		else
+		{
+			genType const Complementary = a - one<genType>();
+			genType const Two = static_cast<genType>(2);
+			
+			return glm::pow(Two, Complementary * static_cast<genType>(10));
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType exponentialEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a >= one<genType>())
+			return a;
+		else
+		{
+			return one<genType>() - glm::pow(static_cast<genType>(2), -static_cast<genType>(10) * a);
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType exponentialEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+			return static_cast<genType>(0.5) * glm::pow(static_cast<genType>(2), (static_cast<genType>(20) * a) - static_cast<genType>(10));
+		else
+			return -static_cast<genType>(0.5) * glm::pow(static_cast<genType>(2), (-static_cast<genType>(20) * a) + static_cast<genType>(10)) + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType elasticEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return std::sin(static_cast<genType>(13) * half_pi<genType>() * a) * glm::pow(static_cast<genType>(2), static_cast<genType>(10) * (a - one<genType>()));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType elasticEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return std::sin(-static_cast<genType>(13) * half_pi<genType>() * (a + one<genType>())) * glm::pow(static_cast<genType>(2), -static_cast<genType>(10) * a) + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType elasticEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+			return static_cast<genType>(0.5) * std::sin(static_cast<genType>(13) * half_pi<genType>() * (static_cast<genType>(2) * a)) * glm::pow(static_cast<genType>(2), static_cast<genType>(10) * ((static_cast<genType>(2) * a) - one<genType>()));
+		else
+			return static_cast<genType>(0.5) * (std::sin(-static_cast<genType>(13) * half_pi<genType>() * ((static_cast<genType>(2) * a - one<genType>()) + one<genType>())) * glm::pow(static_cast<genType>(2), -static_cast<genType>(10) * (static_cast<genType>(2) * a - one<genType>())) + static_cast<genType>(2));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseIn(genType const& a, genType const& o)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType z = ((o + one<genType>()) * a) - o;
+		return (a * a * z);
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseOut(genType const& a, genType const& o)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType n = a - one<genType>();
+		genType z = ((o + one<genType>()) * n) + o;
+		return (n * n * z) + one<genType>();
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseInOut(genType const& a, genType const& o)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		genType s = o * static_cast<genType>(1.525);
+		genType x = static_cast<genType>(0.5);
+		genType n = a / static_cast<genType>(0.5);
+
+		if (n < static_cast<genType>(1))
+		{
+			genType z = ((s + static_cast<genType>(1)) * n) - s;
+			genType m = n * n * z;
+			return x * m;
+		}
+		else 
+		{
+			n -= static_cast<genType>(2);
+			genType z = ((s + static_cast<genType>(1)) * n) + s;
+			genType m = (n*n*z) + static_cast<genType>(2);
+			return x * m;
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseIn(genType const& a)
+	{
+		return backEaseIn(a, static_cast<genType>(1.70158));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseOut(genType const& a)
+	{
+		return backEaseOut(a, static_cast<genType>(1.70158));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType backEaseInOut(genType const& a)
+	{
+		return backEaseInOut(a, static_cast<genType>(1.70158));
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType bounceEaseOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(4.0 / 11.0))
+		{
+			return (static_cast<genType>(121) * a * a) / static_cast<genType>(16);
+		}
+		else if(a < static_cast<genType>(8.0 / 11.0))
+		{
+			return (static_cast<genType>(363.0 / 40.0) * a * a) - (static_cast<genType>(99.0 / 10.0) * a) + static_cast<genType>(17.0 / 5.0);
+		}
+		else if(a < static_cast<genType>(9.0 / 10.0))
+		{
+			return (static_cast<genType>(4356.0 / 361.0) * a * a) - (static_cast<genType>(35442.0 / 1805.0) * a) + static_cast<genType>(16061.0 / 1805.0);
+		}
+		else
+		{
+			return (static_cast<genType>(54.0 / 5.0) * a * a) - (static_cast<genType>(513.0 / 25.0) * a) + static_cast<genType>(268.0 / 25.0);
+		}
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType bounceEaseIn(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		return one<genType>() - bounceEaseOut(one<genType>() - a);
+	}
+
+	template <typename genType>
+	GLM_FUNC_QUALIFIER genType bounceEaseInOut(genType const& a)
+	{
+		// Only defined in [0, 1]
+		assert(a >= zero<genType>());
+		assert(a <= one<genType>());
+
+		if(a < static_cast<genType>(0.5))
+		{
+			return static_cast<genType>(0.5) * (one<genType>() - bounceEaseOut(a * static_cast<genType>(2)));
+		}
+		else
+		{
+			return static_cast<genType>(0.5) * bounceEaseOut(a * static_cast<genType>(2) - one<genType>()) + static_cast<genType>(0.5);
+		}
+	}
+
+}//namespace glm
diff --git a/external/include/glm/gtx/euler_angles.hpp b/external/include/glm/gtx/euler_angles.hpp
index fdc4f26..dccc621 100644
--- a/external/include/glm/gtx/euler_angles.hpp
+++ b/external/include/glm/gtx/euler_angles.hpp
@@ -2,20 +2,26 @@
 /// @file glm/gtx/euler_angles.hpp
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 ///
 /// @defgroup gtx_euler_angles GLM_GTX_euler_angles
 /// @ingroup gtx
 ///
-/// @brief Build matrices from Euler angles.
+/// Include <glm/gtx/euler_angles.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/euler_angles.hpp> need to be included to use these functionalities.
+/// Build matrices from Euler angles.
+///
+/// Extraction of Euler angles from rotation matrix.
+/// Based on the original paper 2014 Mike Day - Extracting Euler Angles from a Rotation Matrix.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_euler_angles extension included")
 #endif
@@ -27,116 +33,302 @@ namespace glm
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle X.
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleX(
-		T const & angleX);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleX(
+		T const& angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Y.
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleY(
-		T const & angleY);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleY(
+		T const& angleY);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from an euler angle Z.
 	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZ(
+		T const& angleZ);
+
+	/// Creates a 3D 4 * 4 homogeneous derived matrix from the rotation matrix about X-axis.
+	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZ(
-		T const & angleZ);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> derivedEulerAngleX(
+		T const & angleX, T const & angularVelocityX);
 
-	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y).
+	/// Creates a 3D 4 * 4 homogeneous derived matrix from the rotation matrix about Y-axis.
 	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXY(
-		T const & angleX,
-		T const & angleY);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> derivedEulerAngleY(
+		T const & angleY, T const & angularVelocityY);
 
-	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X).
+	/// Creates a 3D 4 * 4 homogeneous derived matrix from the rotation matrix about Z-axis.
 	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYX(
-		T const & angleY,
-		T const & angleX);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> derivedEulerAngleZ(
+		T const & angleZ, T const & angularVelocityZ);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y).
+	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXY(
+		T const& angleX,
+		T const& angleY);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X).
+	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYX(
+		T const& angleY,
+		T const& angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXZ(
-		T const & angleX,
-		T const & angleZ);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXZ(
+		T const& angleX,
+		T const& angleZ);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X).
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZX(
-		T const & angle,
-		T const & angleX);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZX(
+		T const& angle,
+		T const& angleX);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z).
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYZ(
-		T const & angleY,
-		T const & angleZ);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYZ(
+		T const& angleY,
+		T const& angleZ);
 
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y).
 	/// @see gtx_euler_angles
-	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleZY(
-		T const & angleZ,
-		T const & angleY);
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZY(
+		T const& angleZ,
+		T const& angleY);
 
     /// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y * Z).
     /// @see gtx_euler_angles
-    template <typename T>
-    GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleXYZ(
-        T const & t1,
-        T const & t2,
-        T const & t3);
-    
+    template<typename T>
+    GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXYZ(
+        T const& t1,
+        T const& t2,
+        T const& t3);
+
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
 	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYXZ(
+		T const& yaw,
+		T const& pitch,
+		T const& roll);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z * X).
+	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> eulerAngleYXZ(
-		T const & yaw,
-		T const & pitch,
-		T const & roll);
-    
-	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXZX(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Y * X).
 	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat4x4<T, defaultp> yawPitchRoll(
-		T const & yaw,
-		T const & pitch,
-		T const & roll);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXYX(
+		T const & t1,
+		T const & t2,
+		T const & t3);
 
-	/// Creates a 2D 2 * 2 rotation matrix from an euler angle.
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Y).
 	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat2x2<T, defaultp> orientate2(T const & angle);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYXY(
+		T const & t1,
+		T const & t2,
+		T const & t3);
 
-	/// Creates a 2D 4 * 4 homogeneous rotation matrix from an euler angle.
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z * Y).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYZY(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y * Z).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZYZ(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X * Z).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZXZ(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (X * Z * Y).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleXZY(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * Z * X).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleYZX(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * Y * X).
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZYX(
+		T const & t1,
+		T const & t2,
+		T const & t3);
+
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Z * X * Y).
 	/// @see gtx_euler_angles
 	template <typename T>
-	GLM_FUNC_DECL tmat3x3<T, defaultp> orientate3(T const & angle);
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> eulerAngleZXY(
+		T const & t1,
+		T const & t2,
+		T const & t3);
 
-	/// Creates a 3D 3 * 3 rotation matrix from euler angles (Y * X * Z). 
+	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
+	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<4, 4, T, defaultp> yawPitchRoll(
+		T const& yaw,
+		T const& pitch,
+		T const& roll);
+
+	/// Creates a 2D 2 * 2 rotation matrix from an euler angle.
 	/// @see gtx_euler_angles
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> orientate3(tvec3<T, P> const & angles);
-		
+	template<typename T>
+	GLM_FUNC_DECL mat<2, 2, T, defaultp> orientate2(T const& angle);
+
+	/// Creates a 2D 4 * 4 homogeneous rotation matrix from an euler angle.
+	/// @see gtx_euler_angles
+	template<typename T>
+	GLM_FUNC_DECL mat<3, 3, T, defaultp> orientate3(T const& angle);
+
+	/// Creates a 3D 3 * 3 rotation matrix from euler angles (Y * X * Z).
+	/// @see gtx_euler_angles
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> orientate3(vec<3, T, Q> const& angles);
+
 	/// Creates a 3D 4 * 4 homogeneous rotation matrix from euler angles (Y * X * Z).
 	/// @see gtx_euler_angles
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> orientate4(tvec3<T, P> const & angles);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> orientate4(vec<3, T, Q> const& angles);
 
     /// Extracts the (X * Y * Z) Euler angles from the rotation matrix M
     /// @see gtx_euler_angles
-    template <typename T>
-    GLM_FUNC_DECL void extractEulerAngleXYZ(tmat4x4<T, defaultp> const & M,
+    template<typename T>
+    GLM_FUNC_DECL void extractEulerAngleXYZ(mat<4, 4, T, defaultp> const& M,
                                             T & t1,
                                             T & t2,
                                             T & t3);
-    
+
+	/// Extracts the (Y * X * Z) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleYXZ(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (X * Z * X) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleXZX(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (X * Y * X) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleXYX(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Y * X * Y) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleYXY(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Y * Z * Y) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleYZY(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Z * Y * Z) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleZYZ(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Z * X * Z) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleZXZ(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (X * Z * Y) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleXZY(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Y * Z * X) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleYZX(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Z * Y * X) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleZYX(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
+	/// Extracts the (Z * X * Y) Euler angles from the rotation matrix M
+	/// @see gtx_euler_angles
+	template <typename T>
+	GLM_FUNC_DECL void extractEulerAngleZXY(mat<4, 4, T, defaultp> const & M,
+											T & t1,
+											T & t2,
+											T & t3);
+
 	/// @}
 }//namespace glm
 
diff --git a/external/include/glm/gtx/euler_angles.inl b/external/include/glm/gtx/euler_angles.inl
index dbe0a48..8a289d8 100644
--- a/external/include/glm/gtx/euler_angles.inl
+++ b/external/include/glm/gtx/euler_angles.inl
@@ -5,48 +5,48 @@
 
 namespace glm
 {
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleX
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleX
 	(
-		T const & angleX
+		T const& angleX
 	)
 	{
 		T cosX = glm::cos(angleX);
 		T sinX = glm::sin(angleX);
-	
-		return tmat4x4<T, defaultp>(
+
+		return mat<4, 4, T, defaultp>(
 			T(1), T(0), T(0), T(0),
 			T(0), cosX, sinX, T(0),
 			T(0),-sinX, cosX, T(0),
 			T(0), T(0), T(0), T(1));
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleY
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleY
 	(
-		T const & angleY
+		T const& angleY
 	)
 	{
 		T cosY = glm::cos(angleY);
 		T sinY = glm::sin(angleY);
 
-		return tmat4x4<T, defaultp>(
+		return mat<4, 4, T, defaultp>(
 			cosY,	T(0),	-sinY,	T(0),
 			T(0),	T(1),	T(0),	T(0),
 			sinY,	T(0),	cosY,	T(0),
 			T(0),	T(0),	T(0),	T(1));
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZ
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZ
 	(
-		T const & angleZ
+		T const& angleZ
 	)
 	{
 		T cosZ = glm::cos(angleZ);
 		T sinZ = glm::sin(angleZ);
 
-		return tmat4x4<T, defaultp>(
+		return mat<4, 4, T, defaultp>(
 			cosZ,	sinZ,	T(0), T(0),
 			-sinZ,	cosZ,	T(0), T(0),
 			T(0),	T(0),	T(1), T(0),
@@ -54,10 +54,61 @@ namespace glm
 	}
 
 	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXY
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> derivedEulerAngleX
 	(
 		T const & angleX,
-		T const & angleY
+		T const & angularVelocityX
+	)
+	{
+		T cosX = glm::cos(angleX) * angularVelocityX;
+		T sinX = glm::sin(angleX) * angularVelocityX;
+
+		return mat<4, 4, T, defaultp>(
+			T(0), T(0), T(0), T(0),
+			T(0),-sinX, cosX, T(0),
+			T(0),-cosX,-sinX, T(0),
+			T(0), T(0), T(0), T(0));
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> derivedEulerAngleY
+	(
+		T const & angleY,
+		T const & angularVelocityY
+	)
+	{
+		T cosY = glm::cos(angleY) * angularVelocityY;
+		T sinY = glm::sin(angleY) * angularVelocityY;
+
+		return mat<4, 4, T, defaultp>(
+			-sinY, T(0), -cosY, T(0),
+			 T(0), T(0),  T(0), T(0),
+			 cosY, T(0), -sinY, T(0),
+			 T(0), T(0),  T(0), T(0));
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> derivedEulerAngleZ
+	(
+		T const & angleZ,
+		T const & angularVelocityZ
+	)
+	{
+		T cosZ = glm::cos(angleZ) * angularVelocityZ;
+		T sinZ = glm::sin(angleZ) * angularVelocityZ;
+
+		return mat<4, 4, T, defaultp>(
+			-sinZ,  cosZ, T(0), T(0),
+			-cosZ, -sinZ, T(0), T(0),
+			 T(0),  T(0), T(0), T(0),
+			 T(0),  T(0), T(0), T(0));
+	}
+
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXY
+	(
+		T const& angleX,
+		T const& angleY
 	)
 	{
 		T cosX = glm::cos(angleX);
@@ -65,18 +116,18 @@ namespace glm
 		T cosY = glm::cos(angleY);
 		T sinY = glm::sin(angleY);
 
-		return tmat4x4<T, defaultp>(
+		return mat<4, 4, T, defaultp>(
 			cosY,   -sinX * -sinY,  cosX * -sinY,   T(0),
 			T(0),   cosX,           sinX,           T(0),
 			sinY,   -sinX * cosY,   cosX * cosY,    T(0),
 			T(0),   T(0),           T(0),           T(1));
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYX
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYX
 	(
-		T const & angleY,
-		T const & angleX
+		T const& angleY,
+		T const& angleX
 	)
 	{
 		T cosX = glm::cos(angleX);
@@ -84,59 +135,59 @@ namespace glm
 		T cosY = glm::cos(angleY);
 		T sinY = glm::sin(angleY);
 
-		return tmat4x4<T, defaultp>(
+		return mat<4, 4, T, defaultp>(
 			cosY,          0,      -sinY,    T(0),
 			sinY * sinX,  cosX, cosY * sinX, T(0),
 			sinY * cosX, -sinX, cosY * cosX, T(0),
 			T(0),         T(0),     T(0),    T(1));
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXZ
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXZ
 	(
-		T const & angleX,
-		T const & angleZ
+		T const& angleX,
+		T const& angleZ
 	)
 	{
 		return eulerAngleX(angleX) * eulerAngleZ(angleZ);
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZX
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZX
 	(
-		T const & angleZ,
-		T const & angleX
+		T const& angleZ,
+		T const& angleX
 	)
 	{
 		return eulerAngleZ(angleZ) * eulerAngleX(angleX);
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYZ
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYZ
 	(
-		T const & angleY,
-		T const & angleZ
+		T const& angleY,
+		T const& angleZ
 	)
 	{
 		return eulerAngleY(angleY) * eulerAngleZ(angleZ);
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleZY
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZY
 	(
-		T const & angleZ,
-		T const & angleY
+		T const& angleZ,
+		T const& angleY
 	)
 	{
 		return eulerAngleZ(angleZ) * eulerAngleY(angleY);
 	}
-    
-    template <typename T>
-    GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleXYZ
+
+    template<typename T>
+    GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXYZ
     (
-     T const & t1,
-     T const & t2,
-     T const & t3
+     T const& t1,
+     T const& t2,
+     T const& t3
      )
     {
         T c1 = glm::cos(-t1);
@@ -145,8 +196,8 @@ namespace glm
         T s1 = glm::sin(-t1);
         T s2 = glm::sin(-t2);
         T s3 = glm::sin(-t3);
-        
-        tmat4x4<T, defaultp> Result;
+
+        mat<4, 4, T, defaultp> Result;
         Result[0][0] = c2 * c3;
         Result[0][1] =-c1 * s3 + s1 * s2 * c3;
         Result[0][2] = s1 * s3 + c1 * s2 * c3;
@@ -165,13 +216,13 @@ namespace glm
         Result[3][3] = static_cast<T>(1);
         return Result;
     }
-    
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> eulerAngleYXZ
+
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYXZ
 	(
-		T const & yaw,
-		T const & pitch,
-		T const & roll
+		T const& yaw,
+		T const& pitch,
+		T const& roll
 	)
 	{
 		T tmp_ch = glm::cos(yaw);
@@ -181,7 +232,7 @@ namespace glm
 		T tmp_cb = glm::cos(roll);
 		T tmp_sb = glm::sin(roll);
 
-		tmat4x4<T, defaultp> Result;
+		mat<4, 4, T, defaultp> Result;
 		Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
 		Result[0][1] = tmp_sb * tmp_cp;
 		Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
@@ -202,11 +253,361 @@ namespace glm
 	}
 
 	template <typename T>
-	GLM_FUNC_QUALIFIER tmat4x4<T, defaultp> yawPitchRoll
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXZX
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c2;
+		Result[0][1] = c1 * s2;
+		Result[0][2] = s1 * s2;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-c3 * s2;
+		Result[1][1] = c1 * c2 * c3 - s1 * s3;
+		Result[1][2] = c1 * s3 + c2 * c3 * s1;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = s2 * s3;
+		Result[2][1] =-c3 * s1 - c1 * c2 * s3;
+		Result[2][2] = c1 * c3 - c2 * s1 * s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXYX
 	(
-		T const & yaw,
-		T const & pitch,
-		T const & roll
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c2;
+		Result[0][1] = s1 * s2;
+		Result[0][2] =-c1 * s2;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] = s2 * s3;
+		Result[1][1] = c1 * c3 - c2 * s1 * s3;
+		Result[1][2] = c3 * s1 + c1 * c2 * s3;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c3 * s2;
+		Result[2][1] =-c1 * s3 - c2 * c3 * s1;
+		Result[2][2] = c1 * c2 * c3 - s1 * s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYXY
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c3 - c2 * s1 * s3;
+		Result[0][1] = s2* s3;
+		Result[0][2] =-c3 * s1 - c1 * c2 * s3;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] = s1 * s2;
+		Result[1][1] = c2;
+		Result[1][2] = c1 * s2;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c1 * s3 + c2 * c3 * s1;
+		Result[2][1] =-c3 * s2;
+		Result[2][2] = c1 * c2 * c3 - s1 * s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYZY
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c2 * c3 - s1 * s3;
+		Result[0][1] = c3 * s2;
+		Result[0][2] =-c1 * s3 - c2 * c3 * s1;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-c1 * s2;
+		Result[1][1] = c2;
+		Result[1][2] = s1 * s2;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c3 * s1 + c1 * c2 * s3;
+		Result[2][1] = s2 * s3;
+		Result[2][2] = c1 * c3 - c2 * s1 * s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZYZ
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c2 * c3 - s1 * s3;
+		Result[0][1] = c1 * s3 + c2 * c3 * s1;
+		Result[0][2] =-c3 * s2;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-c3 * s1 - c1 * c2 * s3;
+		Result[1][1] = c1 * c3 - c2 * s1 * s3;
+		Result[1][2] = s2 * s3;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c1 * s2;
+		Result[2][1] = s1 * s2;
+		Result[2][2] = c2;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZXZ
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c3 - c2 * s1 * s3;
+		Result[0][1] = c3 * s1 + c1 * c2 * s3;
+		Result[0][2] = s2 *s3;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-c1 * s3 - c2 * c3 * s1;
+		Result[1][1] = c1 * c2 * c3 - s1 * s3;
+		Result[1][2] = c3 * s2;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = s1 * s2;
+		Result[2][1] =-c1 * s2;
+		Result[2][2] = c2;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleXZY
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c2 * c3;
+		Result[0][1] = s1 * s3 + c1 * c3 * s2;
+		Result[0][2] = c3 * s1 * s2 - c1 * s3;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-s2;
+		Result[1][1] = c1 * c2;
+		Result[1][2] = c2 * s1;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c2 * s3;
+		Result[2][1] = c1 * s2 * s3 - c3 * s1;
+		Result[2][2] = c1 * c3 + s1 * s2 *s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleYZX
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c2;
+		Result[0][1] = s2;
+		Result[0][2] =-c2 * s1;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] = s1 * s3 - c1 * c3 * s2;
+		Result[1][1] = c2 * c3;
+		Result[1][2] = c1 * s3 + c3 * s1 * s2;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c3 * s1 + c1 * s2 * s3;
+		Result[2][1] =-c2 * s3;
+		Result[2][2] = c1 * c3 - s1 * s2 * s3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZYX
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c2;
+		Result[0][1] = c2 * s1;
+		Result[0][2] =-s2;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] = c1 * s2 * s3 - c3 * s1;
+		Result[1][1] = c1 * c3 + s1 * s2 * s3;
+		Result[1][2] = c2 * s3;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = s1 * s3 + c1 * c3 * s2;
+		Result[2][1] = c3 * s1 * s2 - c1 * s3;
+		Result[2][2] = c2 * c3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> eulerAngleZXY
+	(
+		T const & t1,
+		T const & t2,
+		T const & t3
+	)
+	{
+		T c1 = glm::cos(t1);
+		T s1 = glm::sin(t1);
+		T c2 = glm::cos(t2);
+		T s2 = glm::sin(t2);
+		T c3 = glm::cos(t3);
+		T s3 = glm::sin(t3);
+
+		mat<4, 4, T, defaultp> Result;
+		Result[0][0] = c1 * c3 - s1 * s2 * s3;
+		Result[0][1] = c3 * s1 + c1 * s2 * s3;
+		Result[0][2] =-c2 * s3;
+		Result[0][3] = static_cast<T>(0);
+		Result[1][0] =-c2 * s1;
+		Result[1][1] = c1 * c2;
+		Result[1][2] = s2;
+		Result[1][3] = static_cast<T>(0);
+		Result[2][0] = c1 * s3 + c3 * s1 * s2;
+		Result[2][1] = s1 * s3 - c1 * c3 * s2;
+		Result[2][2] = c2 * c3;
+		Result[2][3] = static_cast<T>(0);
+		Result[3][0] = static_cast<T>(0);
+		Result[3][1] = static_cast<T>(0);
+		Result[3][2] = static_cast<T>(0);
+		Result[3][3] = static_cast<T>(1);
+		return Result;
+	}
+
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, defaultp> yawPitchRoll
+	(
+		T const& yaw,
+		T const& pitch,
+		T const& roll
 	)
 	{
 		T tmp_ch = glm::cos(yaw);
@@ -216,7 +617,7 @@ namespace glm
 		T tmp_cb = glm::cos(roll);
 		T tmp_sb = glm::sin(roll);
 
-		tmat4x4<T, defaultp> Result;
+		mat<4, 4, T, defaultp> Result;
 		Result[0][0] = tmp_ch * tmp_cb + tmp_sh * tmp_sp * tmp_sb;
 		Result[0][1] = tmp_sb * tmp_cp;
 		Result[0][2] = -tmp_sh * tmp_cb + tmp_ch * tmp_sp * tmp_sb;
@@ -236,16 +637,16 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat2x2<T, defaultp> orientate2
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, defaultp> orientate2
 	(
-		T const & angle
+		T const& angle
 	)
 	{
 		T c = glm::cos(angle);
 		T s = glm::sin(angle);
 
-		tmat2x2<T, defaultp> Result;
+		mat<2, 2, T, defaultp> Result;
 		Result[0][0] = c;
 		Result[0][1] = s;
 		Result[1][0] = -s;
@@ -253,16 +654,16 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T>
-	GLM_FUNC_QUALIFIER tmat3x3<T, defaultp> orientate3
+	template<typename T>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, defaultp> orientate3
 	(
-		T const & angle
+		T const& angle
 	)
 	{
 		T c = glm::cos(angle);
 		T s = glm::sin(angle);
 
-		tmat3x3<T, defaultp> Result;
+		mat<3, 3, T, defaultp> Result;
 		Result[0][0] = c;
 		Result[0][1] = s;
 		Result[0][2] = 0.0f;
@@ -275,26 +676,26 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> orientate3
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> orientate3
 	(
-		tvec3<T, P> const & angles
+		vec<3, T, Q> const& angles
 	)
 	{
-		return tmat3x3<T, P>(yawPitchRoll(angles.z, angles.x, angles.y));
+		return mat<3, 3, T, Q>(yawPitchRoll(angles.z, angles.x, angles.y));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> orientate4
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> orientate4
 	(
-		tvec3<T, P> const & angles
+		vec<3, T, Q> const& angles
 	)
 	{
 		return yawPitchRoll(angles.z, angles.x, angles.y);
 	}
-    
-    template <typename T>
-    GLM_FUNC_DECL void extractEulerAngleXYZ(tmat4x4<T, defaultp> const & M,
+
+    template<typename T>
+    GLM_FUNC_DECL void extractEulerAngleXYZ(mat<4, 4, T, defaultp> const& M,
                                             T & t1,
                                             T & t2,
                                             T & t3)
@@ -309,4 +710,191 @@ namespace glm
         t2 = -T2;
         t3 = -T3;
     }
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleYXZ(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[2][0], M[2][2]);
+		T C2 = glm::sqrt(M[0][1]*M[0][1] + M[1][1]*M[1][1]);
+		T T2 = glm::atan2<T, defaultp>(-M[2][1], C2);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(S1*M[1][2] - C1*M[1][0], C1*M[0][0] - S1*M[0][2]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleXZX(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[0][2], M[0][1]);
+		T S2 = glm::sqrt(M[1][0]*M[1][0] + M[2][0]*M[2][0]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[0][0]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(C1*M[1][2] - S1*M[1][1], C1*M[2][2] - S1*M[2][1]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleXYX(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[0][1], -M[0][2]);
+		T S2 = glm::sqrt(M[1][0]*M[1][0] + M[2][0]*M[2][0]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[0][0]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(-C1*M[2][1] - S1*M[2][2], C1*M[1][1] + S1*M[1][2]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleYXY(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[1][0], M[1][2]);
+		T S2 = glm::sqrt(M[0][1]*M[0][1] + M[2][1]*M[2][1]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[1][1]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(C1*M[2][0] - S1*M[2][2], C1*M[0][0] - S1*M[0][2]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleYZY(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[1][2], -M[1][0]);
+		T S2 = glm::sqrt(M[0][1]*M[0][1] + M[2][1]*M[2][1]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[1][1]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(-S1*M[0][0] - C1*M[0][2], S1*M[2][0] + C1*M[2][2]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleZYZ(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[2][1], M[2][0]);
+		T S2 = glm::sqrt(M[0][2]*M[0][2] + M[1][2]*M[1][2]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[2][2]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(C1*M[0][1] - S1*M[0][0], C1*M[1][1] - S1*M[1][0]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleZXZ(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[2][0], -M[2][1]);
+		T S2 = glm::sqrt(M[0][2]*M[0][2] + M[1][2]*M[1][2]);
+		T T2 = glm::atan2<T, defaultp>(S2, M[2][2]);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(-C1*M[1][0] - S1*M[1][1], C1*M[0][0] + S1*M[0][1]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleXZY(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[1][2], M[1][1]);
+		T C2 = glm::sqrt(M[0][0]*M[0][0] + M[2][0]*M[2][0]);
+		T T2 = glm::atan2<T, defaultp>(-M[1][0], C2);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(S1*M[0][1] - C1*M[0][2], C1*M[2][2] - S1*M[2][1]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleYZX(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(-M[0][2], M[0][0]);
+		T C2 = glm::sqrt(M[1][1]*M[1][1] + M[2][1]*M[2][1]);
+		T T2 = glm::atan2<T, defaultp>(M[0][1], C2);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(S1*M[1][0] + C1*M[1][2], S1*M[2][0] + C1*M[2][2]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleZYX(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(M[0][1], M[0][0]);
+		T C2 = glm::sqrt(M[1][2]*M[1][2] + M[2][2]*M[2][2]);
+		T T2 = glm::atan2<T, defaultp>(-M[0][2], C2);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(S1*M[2][0] - C1*M[2][1], C1*M[1][1] - S1*M[1][0]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
+
+	template <typename T>
+	GLM_FUNC_QUALIFIER void extractEulerAngleZXY(mat<4, 4, T, defaultp> const & M,
+												 T & t1,
+												 T & t2,
+												 T & t3)
+	{
+		T T1 = glm::atan2<T, defaultp>(-M[1][0], M[1][1]);
+		T C2 = glm::sqrt(M[0][2]*M[0][2] + M[2][2]*M[2][2]);
+		T T2 = glm::atan2<T, defaultp>(M[1][2], C2);
+		T S1 = glm::sin(T1);
+		T C1 = glm::cos(T1);
+		T T3 = glm::atan2<T, defaultp>(C1*M[2][0] + S1*M[2][1], C1*M[0][0] + S1*M[0][1]);
+		t1 = T1;
+		t2 = T2;
+		t3 = T3;
+	}
 }//namespace glm
diff --git a/external/include/glm/gtx/extend.hpp b/external/include/glm/gtx/extend.hpp
index 26837a8..c456fae 100644
--- a/external/include/glm/gtx/extend.hpp
+++ b/external/include/glm/gtx/extend.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_extend GLM_GTX_extend
 /// @ingroup gtx
 ///
-/// @brief Extend a position from a source to a position at a defined length.
+/// Include <glm/gtx/extend.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/extend.hpp> need to be included to use these functionalities.
+/// Extend a position from a source to a position at a defined length.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_extend extension included")
 #endif
@@ -26,10 +30,10 @@ namespace glm
 
 	/// Extends of Length the Origin position using the (Source - Origin) direction.
 	/// @see gtx_extend
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType extend(
-		genType const & Origin, 
-		genType const & Source, 
+		genType const& Origin,
+		genType const& Source,
 		typename genType::value_type const Length);
 
 	/// @}
diff --git a/external/include/glm/gtx/extend.inl b/external/include/glm/gtx/extend.inl
index 3155583..9371ee6 100644
--- a/external/include/glm/gtx/extend.inl
+++ b/external/include/glm/gtx/extend.inl
@@ -3,45 +3,45 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType extend
 	(
-		genType const & Origin, 
-		genType const & Source, 
-		genType const & Distance
+		genType const& Origin,
+		genType const& Source,
+		genType const& Distance
 	)
 	{
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<T, P> extend
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, T, Q> extend
 	(
-		tvec2<T, P> const & Origin,
-		tvec2<T, P> const & Source,
-		T const & Distance
+		vec<2, T, Q> const& Origin,
+		vec<2, T, Q> const& Source,
+		T const& Distance
 	)
 	{
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> extend
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> extend
 	(
-		tvec3<T, P> const & Origin,
-		tvec3<T, P> const & Source,
-		T const & Distance
+		vec<3, T, Q> const& Origin,
+		vec<3, T, Q> const& Source,
+		T const& Distance
 	)
 	{
 		return Origin + (Source - Origin) * Distance;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> extend
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> extend
 	(
-		tvec4<T, P> const & Origin,
-		tvec4<T, P> const & Source,
-		T const & Distance
+		vec<4, T, Q> const& Origin,
+		vec<4, T, Q> const& Source,
+		T const& Distance
 	)
 	{
 		return Origin + (Source - Origin) * Distance;
diff --git a/external/include/glm/gtx/extended_min_max.hpp b/external/include/glm/gtx/extended_min_max.hpp
index f4d8859..b061bc8 100644
--- a/external/include/glm/gtx/extended_min_max.hpp
+++ b/external/include/glm/gtx/extended_min_max.hpp
@@ -2,130 +2,223 @@
 /// @file glm/gtx/extended_min_max.hpp
 ///
 /// @see core (dependence)
-/// @see gtx_half_float (dependence)
 ///
-/// @defgroup gtx_extented_min_max GLM_GTX_extented_min_max
+/// @defgroup gtx_extended_min_max GLM_GTX_extented_min_max
 /// @ingroup gtx
 ///
-/// Min and max functions for 3 to 4 parameters.
+/// Include <glm/gtx/extented_min_max.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/extented_min_max.hpp> need to be included to use these functionalities.
+/// Min and max functions for 3 to 4 parameters.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_extented_min_max extension included")
 #endif
 
 namespace glm
 {
-	/// @addtogroup gtx_extented_min_max
+	/// @addtogroup gtx_extended_min_max
 	/// @{
 
-	/// Return the minimum component-wise values of 3 inputs 
+	/// Return the minimum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T min(
-		T const & x, 
-		T const & y, 
-		T const & z);
+		T const& x,
+		T const& y,
+		T const& z);
 
 	/// Return the minimum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z);
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z);
 
-	/// Return the minimum component-wise values of 3 inputs 
+	/// Return the minimum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z);
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z);
 
-	/// Return the minimum component-wise values of 4 inputs 
+	/// Return the minimum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T min(
-		T const & x, 
-		T const & y, 
-		T const & z, 
-		T const & w);
+		T const& x,
+		T const& y,
+		T const& z,
+		T const& w);
 
-	/// Return the minimum component-wise values of 4 inputs 
+	/// Return the minimum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z, 
-		typename C<T>::T const & w);
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z,
+		typename C<T>::T const& w);
 
 	/// Return the minimum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> min(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z,
-		C<T> const & w);
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z,
+		C<T> const& w);
 
-	/// Return the maximum component-wise values of 3 inputs 
+	/// Return the maximum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T max(
-		T const & x, 
-		T const & y, 
-		T const & z);
+		T const& x,
+		T const& y,
+		T const& z);
 
 	/// Return the maximum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z);
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z);
 
-	/// Return the maximum component-wise values of 3 inputs 
+	/// Return the maximum component-wise values of 3 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z);
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z);
 
 	/// Return the maximum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T max(
-		T const & x, 
-		T const & y, 
-		T const & z, 
-		T const & w);
+		T const& x,
+		T const& y,
+		T const& z,
+		T const& w);
 
-	/// Return the maximum component-wise values of 4 inputs 
+	/// Return the maximum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z, 
-		typename C<T>::T const & w);
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z,
+		typename C<T>::T const& w);
 
-	/// Return the maximum component-wise values of 4 inputs 
+	/// Return the maximum component-wise values of 4 inputs
 	/// @see gtx_extented_min_max
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_DECL C<T> max(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z, 
-		C<T> const & w);
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z,
+		C<T> const& w);
+
+	/// Returns y if y < x; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam genType Floating-point or integer; scalar or vector types.
+	///
+	/// @see gtx_extented_min_max
+	template<typename genType>
+	GLM_FUNC_DECL genType fmin(genType x, genType y);
+
+	/// Returns y if y < x; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	/// @see <a href="http://en.cppreference.com/w/cpp/numeric/math/fmin">std::fmin documentation</a>
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fmin(vec<L, T, Q> const& x, T y);
+
+	/// Returns y if y < x; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	/// @see <a href="http://en.cppreference.com/w/cpp/numeric/math/fmin">std::fmin documentation</a>
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fmin(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
+	/// Returns y if x < y; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam genType Floating-point; scalar or vector types.
+	///
+	/// @see gtx_extented_min_max
+	/// @see <a href="http://en.cppreference.com/w/cpp/numeric/math/fmax">std::fmax documentation</a>
+	template<typename genType>
+	GLM_FUNC_DECL genType fmax(genType x, genType y);
+
+	/// Returns y if x < y; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	/// @see <a href="http://en.cppreference.com/w/cpp/numeric/math/fmax">std::fmax documentation</a>
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fmax(vec<L, T, Q> const& x, T y);
+
+	/// Returns y if x < y; otherwise, it returns x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	/// @see <a href="http://en.cppreference.com/w/cpp/numeric/math/fmax">std::fmax documentation</a>
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fmax(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
+
+	/// Returns min(max(x, minVal), maxVal) for each component in x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam genType Floating-point scalar or vector types.
+	///
+	/// @see gtx_extented_min_max
+	template<typename genType>
+	GLM_FUNC_DECL genType fclamp(genType x, genType minVal, genType maxVal);
+
+	/// Returns min(max(x, minVal), maxVal) for each component in x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fclamp(vec<L, T, Q> const& x, T minVal, T maxVal);
+
+	/// Returns min(max(x, minVal), maxVal) for each component in x. If one of the two arguments is NaN, the value of the other argument is returned.
+	///
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see gtx_extented_min_max
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fclamp(vec<L, T, Q> const& x, vec<L, T, Q> const& minVal, vec<L, T, Q> const& maxVal);
+
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/extended_min_max.inl b/external/include/glm/gtx/extended_min_max.inl
index 64ea445..ac3dd64 100644
--- a/external/include/glm/gtx/extended_min_max.inl
+++ b/external/include/glm/gtx/extended_min_max.inl
@@ -3,138 +3,217 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T min(
-		T const & x, 
-		T const & y, 
-		T const & z)
+		T const& x,
+		T const& y,
+		T const& z)
 	{
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z
 	)
 	{
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z
 	)
 	{
 		return glm::min(glm::min(x, y), z);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T min
 	(
-		T const & x, 
-		T const & y, 
-		T const & z, 
-		T const & w
+		T const& x,
+		T const& y,
+		T const& z,
+		T const& w
 	)
 	{
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z, 
-		typename C<T>::T const & w
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z,
+		typename C<T>::T const& w
 	)
 	{
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> min
 	(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z, 
-		C<T> const & w
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z,
+		C<T> const& w
 	)
 	{
 		return glm::min(glm::min(x, y), glm::min(z, w));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T max(
-		T const & x, 
-		T const & y, 
-		T const & z)
+		T const& x,
+		T const& y,
+		T const& z)
 	{
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z
 	)
 	{
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z
 	)
 	{
 		return glm::max(glm::max(x, y), z);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T max
 	(
-		T const & x, 
-		T const & y, 
-		T const & z, 
-		T const & w
+		T const& x,
+		T const& y,
+		T const& z,
+		T const& w
 	)
 	{
 		return glm::max(glm::max(x, y), glm::max(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
-		C<T> const & x, 
-		typename C<T>::T const & y, 
-		typename C<T>::T const & z, 
-		typename C<T>::T const & w
+		C<T> const& x,
+		typename C<T>::T const& y,
+		typename C<T>::T const& z,
+		typename C<T>::T const& w
 	)
 	{
 		return glm::max(glm::max(x, y), glm::max(z, w));
 	}
 
-	template <typename T, template <typename> class C>
+	template<typename T, template<typename> class C>
 	GLM_FUNC_QUALIFIER C<T> max
 	(
-		C<T> const & x, 
-		C<T> const & y, 
-		C<T> const & z, 
-		C<T> const & w
+		C<T> const& x,
+		C<T> const& y,
+		C<T> const& z,
+		C<T> const& w
 	)
 	{
 		return glm::max(glm::max(x, y), glm::max(z, w));
 	}
 
+	// fmin
+#	if GLM_HAS_CXX11_STL
+		using std::fmin;
+#	else
+		template<typename genType>
+		GLM_FUNC_QUALIFIER genType fmin(genType x, genType y)
+		{
+			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmin' only accept floating-point input");
+
+			if (isnan(x))
+				return y;
+			if (isnan(y))
+				return x;
+
+			return min(x, y);
+		}
+#	endif
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmin(vec<L, T, Q> const& a, T b)
+	{
+		return detail::functor2<L, T, Q>::call(fmin, a, vec<L, T, Q>(b));
+	}
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmin(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+	{
+		return detail::functor2<L, T, Q>::call(fmin, a, b);
+	}
+
+	// fmax
+#	if GLM_HAS_CXX11_STL
+		using std::fmax;
+#	else
+		template<typename genType>
+		GLM_FUNC_QUALIFIER genType fmax(genType x, genType y)
+		{
+			GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fmax' only accept floating-point input");
+
+			if (isnan(x))
+				return y;
+			if (isnan(y))
+				return x;
+
+			return max(x, y);
+		}
+#	endif
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmax(vec<L, T, Q> const& a, T b)
+	{
+		return detail::functor2<L, T, Q>::call(fmax, a, vec<L, T, Q>(b));
+	}
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fmax(vec<L, T, Q> const& a, vec<L, T, Q> const& b)
+	{
+		return detail::functor2<L, T, Q>::call(fmax, a, b);
+	}
+
+	// fclamp
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType fclamp(genType x, genType minVal, genType maxVal)
+	{
+		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fclamp' only accept floating-point or integer inputs");
+		return fmin(fmax(x, minVal), maxVal);
+	}
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fclamp(vec<L, T, Q> const& x, T minVal, T maxVal)
+	{
+		return fmin(fmax(x, vec<L, T, Q>(minVal)), vec<L, T, Q>(maxVal));
+	}
+
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fclamp(vec<L, T, Q> const& x, vec<L, T, Q> const& minVal, vec<L, T, Q> const& maxVal)
+	{
+		return fmin(fmax(x, minVal), maxVal);
+	}
 }//namespace glm
diff --git a/external/include/glm/gtx/exterior_product.hpp b/external/include/glm/gtx/exterior_product.hpp
new file mode 100644
index 0000000..4223b65
--- /dev/null
+++ b/external/include/glm/gtx/exterior_product.hpp
@@ -0,0 +1,41 @@
+/// @ref gtx_exterior_product
+/// @file glm/gtx/exterior_product.hpp
+///
+/// @see core (dependence)
+/// @see gtx_exterior_product (dependence)
+///
+/// @defgroup gtx_exterior_product GLM_GTX_exterior_product
+/// @ingroup gtx
+///
+/// Include <glm/gtx/exterior_product.hpp> to use the features of this extension.
+///
+/// @brief Allow to perform bit operations on integer values
+
+#pragma once
+
+// Dependencies
+#include "../detail/setup.hpp"
+#include "../detail/qualifier.hpp"
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTX_exterior_product extension included")
+#endif
+
+namespace glm
+{
+	/// @addtogroup gtx_exterior_product
+	/// @{
+
+	/// Returns the cross product of x and y.
+	///
+	/// @tparam T Floating-point scalar types
+	/// @tparam Q Value from qualifier enum
+	///
+	/// @see <a href="https://en.wikipedia.org/wiki/Exterior_algebra#Cross_and_triple_products">Exterior product</a>
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T cross(vec<2, T, Q> const& v, vec<2, T, Q> const& u);
+
+	/// @}
+} //namespace glm
+
+#include "exterior_product.inl"
diff --git a/external/include/glm/gtx/exterior_product.inl b/external/include/glm/gtx/exterior_product.inl
new file mode 100644
index 0000000..b4b3634
--- /dev/null
+++ b/external/include/glm/gtx/exterior_product.inl
@@ -0,0 +1,27 @@
+/// @ref core
+/// @file glm/detail/func_geometric.inl
+
+#include <limits>
+
+namespace glm {
+namespace detail
+{
+	template<typename T, qualifier Q, bool Aligned>
+	struct compute_cross_vec2
+	{
+		GLM_FUNC_QUALIFIER static T call(vec<2, T, Q> const& v, vec<2, T, Q> const& u)
+		{
+			GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'cross' accepts only floating-point inputs");
+
+			return v.x * u.y - u.x * v.y;
+		}
+	};
+}//namespace detail
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T cross(vec<2, T, Q> const& x, vec<2, T, Q> const& y)
+	{
+		return detail::compute_cross_vec2<T, Q, detail::is_aligned<Q>::value>::call(x, y);
+	}
+}//namespace glm
+
diff --git a/external/include/glm/gtx/fast_exponential.hpp b/external/include/glm/gtx/fast_exponential.hpp
index ed64a27..2d4918e 100644
--- a/external/include/glm/gtx/fast_exponential.hpp
+++ b/external/include/glm/gtx/fast_exponential.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_fast_exponential GLM_GTX_fast_exponential
 /// @ingroup gtx
 ///
-/// @brief Fast but less accurate implementations of exponential based functions.
+/// Include <glm/gtx/fast_exponential.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/fast_exponential.hpp> need to be included to use these functionalities.
+/// Fast but less accurate implementations of exponential based functions.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_fast_exponential extension included")
 #endif
@@ -27,63 +31,63 @@ namespace glm
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastPow(genType x, genType y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastPow(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename genTypeT, typename genTypeU>
+	template<typename genTypeT, typename genTypeU>
 	GLM_FUNC_DECL genTypeT fastPow(genTypeT x, genTypeU y);
 
 	/// Faster than the common pow function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastPow(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastPow(vec<L, T, Q> const& x);
 
 	/// Faster than the common exp function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastExp(T x);
 
 	/// Faster than the common exp function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastExp(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastExp(vec<L, T, Q> const& x);
 
 	/// Faster than the common log function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastLog(T x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastLog(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastLog(vec<L, T, Q> const& x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastExp2(T x);
 
 	/// Faster than the common exp2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastExp2(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastExp2(vec<L, T, Q> const& x);
 
 	/// Faster than the common log2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastLog2(T x);
 
 	/// Faster than the common log2 function but less accurate.
 	/// @see gtx_fast_exponential
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastLog2(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastLog2(vec<L, T, Q> const& x);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/fast_exponential.inl b/external/include/glm/gtx/fast_exponential.inl
index 72f9f8f..9dfb109 100644
--- a/external/include/glm/gtx/fast_exponential.inl
+++ b/external/include/glm/gtx/fast_exponential.inl
@@ -4,19 +4,19 @@
 namespace glm
 {
 	// fastPow:
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastPow(genType x, genType y)
 	{
 		return exp(y * log(x));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<T, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastPow(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
 		return exp(y * log(x));
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastPow(T x, int y)
 	{
 		T f = static_cast<T>(1);
@@ -25,10 +25,10 @@ namespace glm
 		return f;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastPow(vecType<T, P> const & x, vecType<int, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastPow(vec<L, T, Q> const& x, vec<L, int, Q> const& y)
 	{
-		vecType<T, P> Result(uninitialize);
+		vec<L, T, Q> Result;
 		for(length_t i = 0, n = x.length(); i < n; ++i)
 			Result[i] = fastPow(x[i], y[i]);
 		return Result;
@@ -36,7 +36,7 @@ namespace glm
 
 	// fastExp
 	// Note: This function provides accurate results only for value between -1 and 1, else avoid it.
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastExp(T x)
 	{
 		// This has a better looking and same performance in release mode than the following code. However, in debug mode it's slower.
@@ -81,14 +81,14 @@ namespace glm
 	}
 	*/
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastExp(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastExp(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastExp, x);
+		return detail::functor1<L, T, T, Q>::call(fastExp, x);
 	}
 
 	// fastLog
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLog(genType x)
 	{
 		return std::log(x);
@@ -103,35 +103,35 @@ namespace glm
 	}
 	*/
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastLog(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastLog(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastLog, x);
+		return detail::functor1<L, T, T, Q>::call(fastLog, x);
 	}
 
 	//fastExp2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastExp2(genType x)
 	{
 		return fastExp(0.69314718055994530941723212145818f * x);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastExp2(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastExp2(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastExp2, x);
+		return detail::functor1<L, T, T, Q>::call(fastExp2, x);
 	}
 
 	// fastLog2, ln2 = 0.69314718055994530941723212145818f
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLog2(genType x)
 	{
 		return fastLog(x) / 0.69314718055994530941723212145818f;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastLog2(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastLog2(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastLog2, x);
+		return detail::functor1<L, T, T, Q>::call(fastLog2, x);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/fast_square_root.hpp b/external/include/glm/gtx/fast_square_root.hpp
index 35aa7f3..9e15cb0 100644
--- a/external/include/glm/gtx/fast_square_root.hpp
+++ b/external/include/glm/gtx/fast_square_root.hpp
@@ -6,11 +6,11 @@
 /// @defgroup gtx_fast_square_root GLM_GTX_fast_square_root
 /// @ingroup gtx
 ///
-/// @brief Fast but less accurate implementations of square root based functions.
-/// - Sqrt optimisation based on Newton's method, 
-/// www.gamedev.net/community/forums/topic.asp?topic id=139956
+/// Include <glm/gtx/fast_square_root.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/fast_square_root.hpp> need to be included to use these functionalities.
+/// Fast but less accurate implementations of square root based functions.
+/// - Sqrt optimisation based on Newton's method,
+/// www.gamedev.net/community/forums/topic.asp?topic id=139956
 
 #pragma once
 
@@ -19,6 +19,10 @@
 #include "../exponential.hpp"
 #include "../geometric.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_fast_square_root extension included")
 #endif
@@ -31,56 +35,56 @@ namespace glm
 	/// Faster than the common sqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType fastSqrt(genType x);
 
 	/// Faster than the common sqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastSqrt(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastSqrt(vec<L, T, Q> const& x);
 
 	/// Faster than the common inversesqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType fastInverseSqrt(genType x);
 
 	/// Faster than the common inversesqrt function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> fastInverseSqrt(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> fastInverseSqrt(vec<L, T, Q> const& x);
 
 	/// Faster than the common length function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastLength(genType x);
 
 	/// Faster than the common length function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T fastLength(vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T fastLength(vec<L, T, Q> const& x);
 
 	/// Faster than the common distance function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType fastDistance(genType x, genType y);
 
 	/// Faster than the common distance function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T fastDistance(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
 
 	/// Faster than the common normalize function but less accurate.
 	///
 	/// @see gtx_fast_square_root extension.
-	template <typename genType> 
-	GLM_FUNC_DECL genType fastNormalize(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL genType fastNormalize(genType const& x);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/fast_square_root.inl b/external/include/glm/gtx/fast_square_root.inl
index 73950ae..e988987 100644
--- a/external/include/glm/gtx/fast_square_root.inl
+++ b/external/include/glm/gtx/fast_square_root.inl
@@ -4,7 +4,7 @@
 namespace glm
 {
 	// fastSqrt
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastSqrt(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastSqrt' only accept floating-point input");
@@ -12,32 +12,32 @@ namespace glm
 		return genType(1) / fastInverseSqrt(x);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastSqrt(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastSqrt(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastSqrt, x);
+		return detail::functor1<L, T, T, Q>::call(fastSqrt, x);
 	}
 
 	// fastInversesqrt
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastInverseSqrt(genType x)
 	{
 #		ifdef __CUDACC__ // Wordaround for a CUDA compiler bug up to CUDA6
-			tvec1<T, P> tmp(detail::compute_inversesqrt<tvec1, genType, lowp, detail::is_aligned<lowp>::value>::call(tvec1<genType, lowp>(x)));
+			vec<1, T, Q> tmp(detail::compute_inversesqrt<tvec1, genType, lowp, detail::is_aligned<lowp>::value>::call(vec<1, genType, lowp>(x)));
 			return tmp.x;
 #		else
-			return detail::compute_inversesqrt<tvec1, genType, highp, detail::is_aligned<highp>::value>::call(tvec1<genType, lowp>(x)).x;
+			return detail::compute_inversesqrt<1, genType, lowp, detail::is_aligned<lowp>::value>::call(vec<1, genType, lowp>(x)).x;
 #		endif
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastInverseSqrt(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastInverseSqrt(vec<L, T, Q> const& x)
 	{
-		return detail::compute_inversesqrt<vecType, T, P, detail::is_aligned<P>::value>::call(x);
+		return detail::compute_inversesqrt<L, T, Q, detail::is_aligned<Q>::value>::call(x);
 	}
 
 	// fastLength
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastLength(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'fastLength' only accept floating-point inputs");
@@ -45,8 +45,8 @@ namespace glm
 		return abs(x);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastLength(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T fastLength(vec<L, T, Q> const& x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'fastLength' only accept floating-point inputs");
 
@@ -54,27 +54,27 @@ namespace glm
 	}
 
 	// fastDistance
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastDistance(genType x, genType y)
 	{
 		return fastLength(y - x);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastDistance(vecType<T, P> const & x, vecType<T, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T fastDistance(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
 		return fastLength(y - x);
 	}
 
 	// fastNormalize
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType fastNormalize(genType x)
 	{
 		return x > genType(0) ? genType(1) : -genType(1);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastNormalize(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastNormalize(vec<L, T, Q> const& x)
 	{
 		return x * fastInverseSqrt(dot(x, x));
 	}
diff --git a/external/include/glm/gtx/fast_trigonometry.hpp b/external/include/glm/gtx/fast_trigonometry.hpp
index ccb1d22..4ec87c3 100644
--- a/external/include/glm/gtx/fast_trigonometry.hpp
+++ b/external/include/glm/gtx/fast_trigonometry.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_fast_trigonometry GLM_GTX_fast_trigonometry
 /// @ingroup gtx
 ///
-/// @brief Fast but less accurate implementations of trigonometric functions.
+/// Include <glm/gtx/fast_trigonometry.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/fast_trigonometry.hpp> need to be included to use these functionalities.
+/// Fast but less accurate implementations of trigonometric functions.
 
 #pragma once
 
 // Dependency:
 #include "../gtc/constants.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_fast_trigonometry extension included")
 #endif
@@ -26,47 +30,47 @@ namespace glm
 
 	/// Wrap an angle to [0 2pi[
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T wrapAngle(T angle);
 
 	/// Faster than the common sin function but less accurate.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_DECL T fastSin(T angle);
 
 	/// Faster than the common cos function but less accurate.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastCos(T angle);
 
-	/// Faster than the common tan function but less accurate. 
-	/// Defined between -2pi and 2pi. 
+	/// Faster than the common tan function but less accurate.
+	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastTan(T angle);
 
-	/// Faster than the common asin function but less accurate. 
+	/// Faster than the common asin function but less accurate.
 	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastAsin(T angle);
 
-	/// Faster than the common acos function but less accurate. 
-	/// Defined between -2pi and 2pi. 
+	/// Faster than the common acos function but less accurate.
+	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastAcos(T angle);
 
 	/// Faster than the common atan function but less accurate.
-	/// Defined between -2pi and 2pi. 
+	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastAtan(T y, T x);
 
-	/// Faster than the common atan function but less accurate. 
+	/// Faster than the common atan function but less accurate.
 	/// Defined between -2pi and 2pi.
 	/// From GLM_GTX_fast_trigonometry extension.
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_DECL T fastAtan(T angle);
 
 	/// @}
diff --git a/external/include/glm/gtx/fast_trigonometry.inl b/external/include/glm/gtx/fast_trigonometry.inl
index f576c17..a733160 100644
--- a/external/include/glm/gtx/fast_trigonometry.inl
+++ b/external/include/glm/gtx/fast_trigonometry.inl
@@ -4,45 +4,45 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> taylorCos(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> taylorCos(vec<L, T, Q> const& x)
 	{
 		return static_cast<T>(1)
-			- (x * x) / 2.f
-			+ (x * x * x * x) / 24.f
-			- (x * x * x * x * x * x) / 720.f
-			+ (x * x * x * x * x * x * x * x) / 40320.f;
+			- (x * x) * (1.f / 2.f)
+			+ ((x * x) * (x * x)) * (1.f / 24.f)
+			- (((x * x) * (x * x)) * (x * x)) * (1.f / 720.f)
+			+ (((x * x) * (x * x)) * ((x * x) * (x * x))) * (1.f / 40320.f);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T cos_52s(T x)
 	{
 		T const xx(x * x);
 		return (T(0.9999932946) + xx * (T(-0.4999124376) + xx * (T(0.0414877472) + xx * T(-0.0012712095))));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> cos_52s(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> cos_52s(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(cos_52s, x);
+		return detail::functor1<L, T, T, Q>::call(cos_52s, x);
 	}
 }//namespace detail
 
 	// wrapAngle
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T wrapAngle(T angle)
 	{
 		return abs<T>(mod<T>(angle, two_pi<T>()));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> wrapAngle(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> wrapAngle(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(wrapAngle, x);
+		return detail::functor1<L, T, T, Q>::call(wrapAngle, x);
 	}
 
 	// cos
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastCos(T x)
 	{
 		T const angle(wrapAngle<T>(x));
@@ -57,87 +57,87 @@ namespace detail
 		return detail::cos_52s(two_pi<T>() - angle);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastCos(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastCos(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastCos, x);
+		return detail::functor1<L, T, T, Q>::call(fastCos, x);
 	}
 
 	// sin
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastSin(T x)
 	{
 		return fastCos<T>(half_pi<T>() - x);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastSin(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastSin(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastSin, x);
+		return detail::functor1<L, T, T, Q>::call(fastSin, x);
 	}
 
 	// tan
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastTan(T x)
 	{
 		return x + (x * x * x * T(0.3333333333)) + (x * x * x * x * x * T(0.1333333333333)) + (x * x * x * x * x * x * x * T(0.0539682539));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastTan(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastTan(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastTan, x);
+		return detail::functor1<L, T, T, Q>::call(fastTan, x);
 	}
 
 	// asin
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastAsin(T x)
 	{
 		return x + (x * x * x * T(0.166666667)) + (x * x * x * x * x * T(0.075)) + (x * x * x * x * x * x * x * T(0.0446428571)) + (x * x * x * x * x * x * x * x * x * T(0.0303819444));// + (x * x * x * x * x * x * x * x * x * x * x * T(0.022372159));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastAsin(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastAsin(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastAsin, x);
+		return detail::functor1<L, T, T, Q>::call(fastAsin, x);
 	}
 
 	// acos
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastAcos(T x)
 	{
 		return T(1.5707963267948966192313216916398) - fastAsin(x); //(PI / 2)
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastAcos(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastAcos(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastAcos, x);
+		return detail::functor1<L, T, T, Q>::call(fastAcos, x);
 	}
 
 	// atan
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastAtan(T y, T x)
 	{
 		T sgn = sign(y) * sign(x);
 		return abs(fastAtan(y / x)) * sgn;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & y, vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastAtan(vec<L, T, Q> const& y, vec<L, T, Q> const& x)
 	{
-		return detail::functor2<T, P, vecType>::call(fastAtan, y, x);
+		return detail::functor2<L, T, Q>::call(fastAtan, y, x);
 	}
 
-	template <typename T> 
+	template<typename T>
 	GLM_FUNC_QUALIFIER T fastAtan(T x)
 	{
 		return x - (x * x * x * T(0.333333333333)) + (x * x * x * x * x * T(0.2)) - (x * x * x * x * x * x * x * T(0.1428571429)) + (x * x * x * x * x * x * x * x * x * T(0.111111111111)) - (x * x * x * x * x * x * x * x * x * x * x * T(0.0909090909));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> fastAtan(vecType<T, P> const & x)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> fastAtan(vec<L, T, Q> const& x)
 	{
-		return detail::functor1<T, T, P, vecType>::call(fastAtan, x);
+		return detail::functor1<L, T, T, Q>::call(fastAtan, x);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/float_notmalize.inl b/external/include/glm/gtx/float_notmalize.inl
index 4dde025..bceab10 100644
--- a/external/include/glm/gtx/float_notmalize.inl
+++ b/external/include/glm/gtx/float_notmalize.inl
@@ -5,10 +5,10 @@
 
 namespace glm
 {
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<float, P> floatNormalize(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, float, Q> floatNormalize(vec<L, T, Q> const& v)
 	{
-		return vecType<float, P>(v) / static_cast<float>(std::numeric_limits<T>::max());
+		return vec<L, float, Q>(v) / static_cast<float>(std::numeric_limits<T>::max());
 	}
 
 }//namespace glm
diff --git a/external/include/glm/gtx/functions.hpp b/external/include/glm/gtx/functions.hpp
new file mode 100644
index 0000000..98b50d8
--- /dev/null
+++ b/external/include/glm/gtx/functions.hpp
@@ -0,0 +1,52 @@
+/// @ref gtx_functions
+/// @file glm/gtx/functions.hpp
+///
+/// @see core (dependence)
+/// @see gtc_quaternion (dependence)
+///
+/// @defgroup gtx_functions GLM_GTX_functions
+/// @ingroup gtx
+///
+/// Include <glm/gtx/functions.hpp> to use the features of this extension.
+///
+/// List of useful common functions.
+
+#pragma once
+
+// Dependencies
+#include "../detail/setup.hpp"
+#include "../detail/qualifier.hpp"
+#include "../detail/type_vec2.hpp"
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTX_functions extension included")
+#endif
+
+namespace glm
+{
+	/// @addtogroup gtx_functions
+	/// @{
+
+	/// 1D gauss function
+	///
+	/// @see gtc_epsilon
+	template<typename T>
+	GLM_FUNC_DECL T gauss(
+		T x,
+		T ExpectedValue,
+		T StandardDeviation);
+
+	/// 2D gauss function
+	///
+	/// @see gtc_epsilon
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T gauss(
+		vec<2, T, Q> const& Coord,
+		vec<2, T, Q> const& ExpectedValue,
+		vec<2, T, Q> const& StandardDeviation);
+
+	/// @}
+}//namespace glm
+
+#include "functions.inl"
+
diff --git a/external/include/glm/gtc/functions.inl b/external/include/glm/gtx/functions.inl
index 1dbc496..ac1e112 100644
--- a/external/include/glm/gtc/functions.inl
+++ b/external/include/glm/gtx/functions.inl
@@ -1,11 +1,11 @@
-/// @ref gtc_functions
-/// @file glm/gtc/functions.inl
+/// @ref gtx_functions
+/// @file glm/gtx/functions.inl
 
-#include "../detail/func_exponential.hpp"
+#include "../exponential.hpp"
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T gauss
 	(
 		T x,
@@ -16,15 +16,15 @@ namespace glm
 		return exp(-((x - ExpectedValue) * (x - ExpectedValue)) / (static_cast<T>(2) * StandardDeviation * StandardDeviation)) / (StandardDeviation * sqrt(static_cast<T>(6.28318530717958647692528676655900576)));
 	}
 
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER T gauss
 	(
-		tvec2<T, P> const& Coord,
-		tvec2<T, P> const& ExpectedValue,
-		tvec2<T, P> const& StandardDeviation
+		vec<2, T, Q> const& Coord,
+		vec<2, T, Q> const& ExpectedValue,
+		vec<2, T, Q> const& StandardDeviation
 	)
 	{
-		tvec2<T, P> const Squared = ((Coord - ExpectedValue) * (Coord - ExpectedValue)) / (static_cast<T>(2) * StandardDeviation * StandardDeviation);
+		vec<2, T, Q> const Squared = ((Coord - ExpectedValue) * (Coord - ExpectedValue)) / (static_cast<T>(2) * StandardDeviation * StandardDeviation);
 		return exp(-(Squared.x + Squared.y));
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/gradient_paint.hpp b/external/include/glm/gtx/gradient_paint.hpp
index de1f18d..2713cec 100644
--- a/external/include/glm/gtx/gradient_paint.hpp
+++ b/external/include/glm/gtx/gradient_paint.hpp
@@ -7,8 +7,9 @@
 /// @defgroup gtx_gradient_paint GLM_GTX_gradient_paint
 /// @ingroup gtx
 ///
-/// @brief Functions that return the color of procedural gradient for specific coordinates.
-/// <glm/gtx/gradient_paint.hpp> need to be included to use these functionalities.
+/// Include <glm/gtx/gradient_paint.hpp> to use the features of this extension.
+///
+/// Functions that return the color of procedural gradient for specific coordinates.
 
 #pragma once
 
@@ -16,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/optimum_pow.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_gradient_paint extension included")
 #endif
@@ -27,20 +32,20 @@ namespace glm
 
 	/// Return a color from a radial gradient.
 	/// @see - gtx_gradient_paint
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T radialGradient(
-		tvec2<T, P> const & Center,
-		T const & Radius,
-		tvec2<T, P> const & Focal,
-		tvec2<T, P> const & Position);
+		vec<2, T, Q> const& Center,
+		T const& Radius,
+		vec<2, T, Q> const& Focal,
+		vec<2, T, Q> const& Position);
 
 	/// Return a color from a linear gradient.
 	/// @see - gtx_gradient_paint
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T linearGradient(
-		tvec2<T, P> const & Point0,
-		tvec2<T, P> const & Point1,
-		tvec2<T, P> const & Position);
+		vec<2, T, Q> const& Point0,
+		vec<2, T, Q> const& Point1,
+		vec<2, T, Q> const& Position);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/gradient_paint.inl b/external/include/glm/gtx/gradient_paint.inl
index aaa5ce1..e2e92b5 100644
--- a/external/include/glm/gtx/gradient_paint.inl
+++ b/external/include/glm/gtx/gradient_paint.inl
@@ -3,17 +3,17 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER T radialGradient
 	(
-		tvec2<T, P> const & Center,
-		T const & Radius,
-		tvec2<T, P> const & Focal,
-		tvec2<T, P> const & Position
+		vec<2, T, Q> const& Center,
+		T const& Radius,
+		vec<2, T, Q> const& Focal,
+		vec<2, T, Q> const& Position
 	)
 	{
-		tvec2<T, P> F = Focal - Center;
-		tvec2<T, P> D = Position - Focal;
+		vec<2, T, Q> F = Focal - Center;
+		vec<2, T, Q> D = Position - Focal;
 		T Radius2 = pow2(Radius);
 		T Fx2 = pow2(F.x);
 		T Fy2 = pow2(F.y);
@@ -23,15 +23,15 @@ namespace glm
 		return Numerator / Denominator;
 	}
 
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER T linearGradient
 	(
-		tvec2<T, P> const & Point0,
-		tvec2<T, P> const & Point1,
-		tvec2<T, P> const & Position
+		vec<2, T, Q> const& Point0,
+		vec<2, T, Q> const& Point1,
+		vec<2, T, Q> const& Position
 	)
 	{
-		tvec2<T, P> Dist = Point1 - Point0;
+		vec<2, T, Q> Dist = Point1 - Point0;
 		return (Dist.x * (Position.x - Point0.x) + Dist.y * (Position.y - Point0.y)) / glm::dot(Dist, Dist);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/handed_coordinate_space.hpp b/external/include/glm/gtx/handed_coordinate_space.hpp
index 2ee5175..1d0d410 100644
--- a/external/include/glm/gtx/handed_coordinate_space.hpp
+++ b/external/include/glm/gtx/handed_coordinate_space.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_handed_coordinate_space GLM_GTX_handed_coordinate_space
 /// @ingroup gtx
 ///
-/// @brief To know if a set of three basis vectors defines a right or left-handed coordinate system.
+/// Include <glm/gtx/handed_coordinate_system.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/handed_coordinate_system.hpp> need to be included to use these functionalities.
+/// To know if a set of three basis vectors defines a right or left-handed coordinate system.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_handed_coordinate_space extension included")
 #endif
@@ -26,19 +30,19 @@ namespace glm
 
 	//! Return if a trihedron right handed or not.
 	//! From GLM_GTX_handed_coordinate_space extension.
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL bool rightHanded(
-		tvec3<T, P> const & tangent,
-		tvec3<T, P> const & binormal,
-		tvec3<T, P> const & normal);
+		vec<3, T, Q> const& tangent,
+		vec<3, T, Q> const& binormal,
+		vec<3, T, Q> const& normal);
 
 	//! Return if a trihedron left handed or not.
 	//! From GLM_GTX_handed_coordinate_space extension.
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL bool leftHanded(
-		tvec3<T, P> const & tangent,
-		tvec3<T, P> const & binormal,
-		tvec3<T, P> const & normal);
+		vec<3, T, Q> const& tangent,
+		vec<3, T, Q> const& binormal,
+		vec<3, T, Q> const& normal);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/handed_coordinate_space.inl b/external/include/glm/gtx/handed_coordinate_space.inl
index 2e55653..1639245 100644
--- a/external/include/glm/gtx/handed_coordinate_space.inl
+++ b/external/include/glm/gtx/handed_coordinate_space.inl
@@ -3,23 +3,23 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER bool rightHanded
 	(
-		tvec3<T, P> const & tangent,
-		tvec3<T, P> const & binormal,
-		tvec3<T, P> const & normal
+		vec<3, T, Q> const& tangent,
+		vec<3, T, Q> const& binormal,
+		vec<3, T, Q> const& normal
 	)
 	{
 		return dot(cross(normal, tangent), binormal) > T(0);
 	}
 
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER bool leftHanded
 	(
-		tvec3<T, P> const & tangent,
-		tvec3<T, P> const & binormal,
-		tvec3<T, P> const & normal
+		vec<3, T, Q> const& tangent,
+		vec<3, T, Q> const& binormal,
+		vec<3, T, Q> const& normal
 	)
 	{
 		return dot(cross(normal, tangent), binormal) < T(0);
diff --git a/external/include/glm/gtx/hash.hpp b/external/include/glm/gtx/hash.hpp
index 2262618..3196be7 100644
--- a/external/include/glm/gtx/hash.hpp
+++ b/external/include/glm/gtx/hash.hpp
@@ -5,13 +5,17 @@
 ///
 /// @defgroup gtx_hash GLM_GTX_hash
 /// @ingroup gtx
-/// 
-/// @brief Add std::hash support for glm types
-/// 
-/// <glm/gtx/hash.hpp> need to be included to use these functionalities.
+///
+/// Include <glm/gtx/hash.hpp> to use the features of this extension.
+///
+/// Add std::hash support for glm types
 
 #pragma once
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #include <functional>
 
 #include "../vec2.hpp"
@@ -40,94 +44,94 @@
 
 namespace std
 {
-	template <typename T, glm::precision P>
-	struct hash<glm::tvec1<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::vec<1, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tvec1<T, P> const & v) const;
+		GLM_FUNC_DECL size_t operator()(glm::vec<1, T, Q> const& v) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tvec2<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::vec<2, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tvec2<T, P> const & v) const;
+		GLM_FUNC_DECL size_t operator()(glm::vec<2, T, Q> const& v) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tvec3<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::vec<3, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tvec3<T, P> const & v) const;
+		GLM_FUNC_DECL size_t operator()(glm::vec<3, T, Q> const& v) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tvec4<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::vec<4, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tvec4<T, P> const & v) const;
+		GLM_FUNC_DECL size_t operator()(glm::vec<4, T, Q> const& v) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tquat<T,P>>
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::tquat<T,Q>>
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tquat<T, P> const & q) const;
+		GLM_FUNC_DECL size_t operator()(glm::tquat<T, Q> const& q) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tdualquat<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::tdualquat<T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tdualquat<T,P> const & q) const;
+		GLM_FUNC_DECL size_t operator()(glm::tdualquat<T,Q> const& q) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat2x2<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<2, 2, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat2x2<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<2, 2, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat2x3<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<2, 3, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat2x3<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<2, 3, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat2x4<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<2, 4, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat2x4<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<2, 4, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat3x2<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<3, 2, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat3x2<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<3, 2, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat3x3<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<3, 3, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat3x3<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<3, 3, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat3x4<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<3, 4, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat3x4<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<3, 4, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat4x2<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<4, 2, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat4x2<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<4, 2, T,Q> const& m) const;
 	};
-	
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat4x3<T,P> >
+
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<4, 3, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat4x3<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<4, 3, T,Q> const& m) const;
 	};
 
-	template <typename T, glm::precision P>
-	struct hash<glm::tmat4x4<T,P> >
+	template<typename T, glm::qualifier Q>
+	struct hash<glm::mat<4, 4, T,Q> >
 	{
-		GLM_FUNC_DECL size_t operator()(glm::tmat4x4<T,P> const & m) const;
+		GLM_FUNC_DECL size_t operator()(glm::mat<4, 4, T,Q> const& m) const;
 	};
 } // namespace std
 
diff --git a/external/include/glm/gtx/hash.inl b/external/include/glm/gtx/hash.inl
index c42f4f0..32e7f12 100644
--- a/external/include/glm/gtx/hash.inl
+++ b/external/include/glm/gtx/hash.inl
@@ -8,7 +8,7 @@
 ///
 /// @brief Add std::hash support for glm types
 ///
-/// <glm/gtx/hash.inl> need to be included to use these functionalities.
+/// <glm/gtx/hash.inl> need to be included to use the features of this extension.
 
 namespace glm {
 namespace detail
@@ -22,15 +22,15 @@ namespace detail
 
 namespace std
 {
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tvec1<T, P>>::operator()(glm::tvec1<T, P> const & v) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::vec<1, T, Q>>::operator()(glm::vec<1, T, Q> const& v) const
 	{
 		hash<T> hasher;
 		return hasher(v.x);
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tvec2<T, P>>::operator()(glm::tvec2<T, P> const & v) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::vec<2, T, Q>>::operator()(glm::vec<2, T, Q> const& v) const
 	{
 		size_t seed = 0;
 		hash<T> hasher;
@@ -39,8 +39,8 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tvec3<T, P>>::operator()(glm::tvec3<T, P> const & v) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::vec<3, T, Q>>::operator()(glm::vec<3, T, Q> const& v) const
 	{
 		size_t seed = 0;
 		hash<T> hasher;
@@ -50,8 +50,8 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tvec4<T, P>>::operator()(glm::tvec4<T, P> const & v) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::vec<4, T, Q>>::operator()(glm::vec<4, T, Q> const& v) const
 	{
 		size_t seed = 0;
 		hash<T> hasher;
@@ -62,8 +62,8 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, P>>::operator()(glm::tquat<T,P> const & q) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::tquat<T, Q>>::operator()(glm::tquat<T,Q> const& q) const
 	{
 		size_t seed = 0;
 		hash<T> hasher;
@@ -74,84 +74,84 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, P>>::operator()(glm::tdualquat<T, P> const & q) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::tdualquat<T, Q>>::operator()(glm::tdualquat<T, Q> const& q) const
 	{
 		size_t seed = 0;
-		hash<glm::tquat<T, P>> hasher;
+		hash<glm::tquat<T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(q.real));
 		glm::detail::hash_combine(seed, hasher(q.dual));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x2<T, P>>::operator()(glm::tmat2x2<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 2, T, Q>>::operator()(glm::mat<2, 2, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec2<T, P>> hasher;
+		hash<glm::vec<2, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x3<T, P>>::operator()(glm::tmat2x3<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 3, T, Q>>::operator()(glm::mat<2, 3, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec3<T, P>> hasher;
+		hash<glm::vec<3, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat2x4<T, P>>::operator()(glm::tmat2x4<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<2, 4, T, Q>>::operator()(glm::mat<2, 4, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec4<T, P>> hasher;
+		hash<glm::vec<4, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x2<T, P>>::operator()(glm::tmat3x2<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 2, T, Q>>::operator()(glm::mat<3, 2, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec2<T, P>> hasher;
+		hash<glm::vec<2, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x3<T, P>>::operator()(glm::tmat3x3<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 3, T, Q>>::operator()(glm::mat<3, 3, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec3<T, P>> hasher;
+		hash<glm::vec<3, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat3x4<T, P>>::operator()(glm::tmat3x4<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<3, 4, T, Q>>::operator()(glm::mat<3, 4, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec4<T, P>> hasher;
+		hash<glm::vec<4, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x2<T,P>>::operator()(glm::tmat4x2<T,P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 2, T,Q>>::operator()(glm::mat<4, 2, T,Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec2<T, P>> hasher;
+		hash<glm::vec<2, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -159,11 +159,11 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x3<T,P>>::operator()(glm::tmat4x3<T,P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 3, T,Q>>::operator()(glm::mat<4, 3, T,Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec3<T, P>> hasher;
+		hash<glm::vec<3, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
@@ -171,11 +171,11 @@ namespace std
 		return seed;
 	}
 
-	template <typename T, glm::precision P>
-	GLM_FUNC_QUALIFIER size_t hash<glm::tmat4x4<T,P>>::operator()(glm::tmat4x4<T, P> const & m) const
+	template<typename T, glm::qualifier Q>
+	GLM_FUNC_QUALIFIER size_t hash<glm::mat<4, 4, T,Q>>::operator()(glm::mat<4, 4, T, Q> const& m) const
 	{
 		size_t seed = 0;
-		hash<glm::tvec4<T, P>> hasher;
+		hash<glm::vec<4, T, Q>> hasher;
 		glm::detail::hash_combine(seed, hasher(m[0]));
 		glm::detail::hash_combine(seed, hasher(m[1]));
 		glm::detail::hash_combine(seed, hasher(m[2]));
diff --git a/external/include/glm/gtx/integer.hpp b/external/include/glm/gtx/integer.hpp
index 1173a58..7b80209 100644
--- a/external/include/glm/gtx/integer.hpp
+++ b/external/include/glm/gtx/integer.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_integer GLM_GTX_integer
 /// @ingroup gtx
 ///
-/// @brief Add support for integer for core functions
+/// Include <glm/gtx/integer.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/integer.hpp> need to be included to use these functionalities.
+/// Add support for integer for core functions
 
 #pragma once
 
@@ -16,6 +16,10 @@
 #include "../glm.hpp"
 #include "../gtc/integer.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_integer extension included")
 #endif
@@ -25,9 +29,9 @@ namespace glm
 	/// @addtogroup gtx_integer
 	/// @{
 
-	//! Returns x raised to the y power. 
+	//! Returns x raised to the y power.
 	//! From GLM_GTX_integer extension.
-	GLM_FUNC_DECL int pow(int x, int y);
+	GLM_FUNC_DECL int pow(int x, uint y);
 
 	//! Returns the positive square root of x.
 	//! From GLM_GTX_integer extension.
@@ -43,10 +47,10 @@ namespace glm
 
 	//! Return the factorial value of a number (!12 max, integer only)
 	//! From GLM_GTX_integer extension.
-	template <typename genType> 
-	GLM_FUNC_DECL genType factorial(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL genType factorial(genType const& x);
 
-	//! 32bit signed integer. 
+	//! 32bit signed integer.
 	//! From GLM_GTX_integer extension.
 	typedef signed int					sint;
 
@@ -54,7 +58,7 @@ namespace glm
 	//! From GLM_GTX_integer extension.
 	GLM_FUNC_DECL uint pow(uint x, uint y);
 
-	//! Returns the positive square root of x. 
+	//! Returns the positive square root of x.
 	//! From GLM_GTX_integer extension.
 	GLM_FUNC_DECL uint sqrt(uint x);
 
diff --git a/external/include/glm/gtx/integer.inl b/external/include/glm/gtx/integer.inl
index 3a479e6..c9fcb4e 100644
--- a/external/include/glm/gtx/integer.inl
+++ b/external/include/glm/gtx/integer.inl
@@ -4,12 +4,13 @@
 namespace glm
 {
 	// pow
-	GLM_FUNC_QUALIFIER int pow(int x, int y)
+	GLM_FUNC_QUALIFIER int pow(int x, uint y)
 	{
 		if(y == 0)
-			return 1;
+			return x >= 0 ? 1 : -1;
+
 		int result = x;
-		for(int i = 1; i < y; ++i)
+		for(uint i = 1; i < y; ++i)
 			result *= x;
 		return result;
 	}
@@ -69,8 +70,8 @@ namespace detail
 	}
 
 	// factorial (!12 max, integer only)
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType factorial(genType const & x)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType factorial(genType const& x)
 	{
 		genType Temp = x;
 		genType Result;
@@ -79,30 +80,30 @@ namespace detail
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<T, P> factorial(
-		tvec2<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, T, Q> factorial(
+		vec<2, T, Q> const& x)
 	{
-		return tvec2<T, P>(
+		return vec<2, T, Q>(
 			factorial(x.x),
 			factorial(x.y));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> factorial(
-		tvec3<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> factorial(
+		vec<3, T, Q> const& x)
 	{
-		return tvec3<T, P>(
+		return vec<3, T, Q>(
 			factorial(x.x),
 			factorial(x.y),
 			factorial(x.z));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> factorial(
-		tvec4<T, P> const & x)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> factorial(
+		vec<4, T, Q> const& x)
 	{
-		return tvec4<T, P>(
+		return vec<4, T, Q>(
 			factorial(x.x),
 			factorial(x.y),
 			factorial(x.z),
@@ -111,6 +112,9 @@ namespace detail
 
 	GLM_FUNC_QUALIFIER uint pow(uint x, uint y)
 	{
+		if (y == 0)
+			return 1u;
+
 		uint result = x;
 		for(uint i = 1; i < y; ++i)
 			result *= x;
@@ -140,7 +144,7 @@ namespace detail
 
 #if(GLM_COMPILER & (GLM_COMPILER_VC | GLM_COMPILER_GCC))
 
-	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
+	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x)
 	{
 		return 31u - findMSB(x);
 	}
@@ -148,7 +152,7 @@ namespace detail
 #else
 
 	// Hackers Delight: http://www.hackersdelight.org/HDcode/nlz.c.txt
-	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x) 
+	GLM_FUNC_QUALIFIER unsigned int nlz(unsigned int x)
 	{
 		int y, m, n;
 
diff --git a/external/include/glm/gtx/intersect.hpp b/external/include/glm/gtx/intersect.hpp
index 33b6e99..cc7f929 100644
--- a/external/include/glm/gtx/intersect.hpp
+++ b/external/include/glm/gtx/intersect.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_intersect GLM_GTX_intersect
 /// @ingroup gtx
 ///
-/// @brief Add intersection functions
+/// Include <glm/gtx/intersect.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/intersect.hpp> need to be included to use these functionalities.
+/// Add intersection functions
 
 #pragma once
 
@@ -21,6 +21,10 @@
 #include "../gtx/closest_point.hpp"
 #include "../gtx/vector_query.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_closest_point extension included")
 #endif
@@ -33,52 +37,53 @@ namespace glm
 	//! Compute the intersection of a ray and a plane.
 	//! Ray direction and plane normal must be unit length.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRayPlane(
-		genType const & orig, genType const & dir,
-		genType const & planeOrig, genType const & planeNormal,
+		genType const& orig, genType const& dir,
+		genType const& planeOrig, genType const& planeNormal,
 		typename genType::value_type & intersectionDistance);
 
 	//! Compute the intersection of a ray and a triangle.
+	/// Based om Tomas Möller implementation http://fileadmin.cs.lth.se/cs/Personal/Tomas_Akenine-Moller/raytri/
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL bool intersectRayTriangle(
-		genType const & orig, genType const & dir,
-		genType const & vert0, genType const & vert1, genType const & vert2,
-		genType & baryPosition);
+		vec<3, T, Q> const& orig, vec<3, T, Q> const& dir,
+		vec<3, T, Q> const& v0, vec<3, T, Q> const& v1, vec<3, T, Q> const& v2,
+		vec<2, T, Q>& baryPosition, T& distance);
 
 	//! Compute the intersection of a line and a triangle.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectLineTriangle(
-		genType const & orig, genType const & dir,
-		genType const & vert0, genType const & vert1, genType const & vert2,
+		genType const& orig, genType const& dir,
+		genType const& vert0, genType const& vert1, genType const& vert2,
 		genType & position);
 
-	//! Compute the intersection distance of a ray and a sphere. 
+	//! Compute the intersection distance of a ray and a sphere.
 	//! The ray direction vector is unit length.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRaySphere(
-		genType const & rayStarting, genType const & rayNormalizedDirection,
-		genType const & sphereCenter, typename genType::value_type const sphereRadiusSquered,
+		genType const& rayStarting, genType const& rayNormalizedDirection,
+		genType const& sphereCenter, typename genType::value_type const sphereRadiusSquered,
 		typename genType::value_type & intersectionDistance);
 
 	//! Compute the intersection of a ray and a sphere.
 	//! From GLM_GTX_intersect extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectRaySphere(
-		genType const & rayStarting, genType const & rayNormalizedDirection,
-		genType const & sphereCenter, const typename genType::value_type sphereRadius,
+		genType const& rayStarting, genType const& rayNormalizedDirection,
+		genType const& sphereCenter, const typename genType::value_type sphereRadius,
 		genType & intersectionPosition, genType & intersectionNormal);
 
 	//! Compute the intersection of a line and a sphere.
 	//! From GLM_GTX_intersect extension
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL bool intersectLineSphere(
-		genType const & point0, genType const & point1,
-		genType const & sphereCenter, typename genType::value_type sphereRadius,
-		genType & intersectionPosition1, genType & intersectionNormal1, 
+		genType const& point0, genType const& point1,
+		genType const& sphereCenter, typename genType::value_type sphereRadius,
+		genType & intersectionPosition1, genType & intersectionNormal1,
 		genType & intersectionPosition2 = genType(), genType & intersectionNormal2 = genType());
 
 	/// @}
diff --git a/external/include/glm/gtx/intersect.inl b/external/include/glm/gtx/intersect.inl
index 904d6cc..d10d65b 100644
--- a/external/include/glm/gtx/intersect.inl
+++ b/external/include/glm/gtx/intersect.inl
@@ -3,11 +3,11 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRayPlane
 	(
-		genType const & orig, genType const & dir,
-		genType const & planeOrig, genType const & planeNormal,
+		genType const& orig, genType const& dir,
+		genType const& planeOrig, genType const& planeNormal,
 		typename genType::value_type & intersectionDistance
 	)
 	{
@@ -23,21 +23,75 @@ namespace glm
 		return false;
 	}
 
-	template <typename genType>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER bool intersectRayTriangle
 	(
-		genType const & orig, genType const & dir,
-		genType const & v0, genType const & v1, genType const & v2,
-		genType & baryPosition
+		vec<3, T, Q> const& orig, vec<3, T, Q> const& dir,
+		vec<3, T, Q> const& vert0, vec<3, T, Q> const& vert1, vec<3, T, Q> const& vert2,
+		vec<2, T, Q>& baryPosition, T& distance
 	)
 	{
-		genType e1 = v1 - v0;
-		genType e2 = v2 - v0;
+		// find vectors for two edges sharing vert0
+		vec<3, T, Q> const edge1 = vert1 - vert0;
+		vec<3, T, Q> const edge2 = vert2 - vert0;
 
-		genType p = glm::cross(dir, e2);
+		// begin calculating determinant - also used to calculate U parameter
+		vec<3, T, Q> const p = glm::cross(dir, edge2);
 
-		typename genType::value_type a = glm::dot(e1, p);
+		// if determinant is near zero, ray lies in plane of triangle
+		T const det = glm::dot(edge1, p);
 
+		vec<3, T, Q> qvec;
+
+		if(det > std::numeric_limits<T>::epsilon())
+		{
+			// calculate distance from vert0 to ray origin
+			vec<3, T, Q> const tvec = orig - vert0;
+
+			// calculate U parameter and test bounds
+			baryPosition.x = glm::dot(tvec, p);
+			if(baryPosition.x < static_cast<T>(0) || baryPosition.x > det)
+				return false;
+
+			// prepare to test V parameter
+			qvec = glm::cross(tvec, edge1);
+
+			// calculate V parameter and test bounds
+			baryPosition.y = glm::dot(dir, qvec);
+			if((baryPosition.y < static_cast<T>(0)) || ((baryPosition.x + baryPosition.y) > det))
+				return false;
+		}
+		else if(det < -std::numeric_limits<T>::epsilon())
+		{
+			// calculate distance from vert0 to ray origin
+			vec<3, T, Q> const tvec = orig - vert0;
+
+			// calculate U parameter and test bounds
+			baryPosition.x = glm::dot(tvec, p);
+			if((baryPosition.x > static_cast<T>(0)) || (baryPosition.x < det))
+				return false;
+
+			// prepare to test V parameter
+			qvec = glm::cross(tvec, edge1);
+
+			// calculate V parameter and test bounds
+			baryPosition.y = glm::dot(dir, qvec);
+			if((baryPosition.y > static_cast<T>(0)) || (baryPosition.x + baryPosition.y < det))
+				return false;
+		}
+		else
+			return false; // ray is parallel to the plane of the triangle
+
+		T inv_det = static_cast<T>(1) / det;
+
+		// calculate distance, ray intersects triangle
+		distance = glm::dot(edge2, qvec) * inv_det;
+		baryPosition *= inv_det;
+
+		return true;
+	}
+
+/*
 		typename genType::value_type Epsilon = std::numeric_limits<typename genType::value_type>::epsilon();
 		if(a < Epsilon && a > -Epsilon)
 			return false;
@@ -62,12 +116,13 @@ namespace glm
 
 		return baryPosition.z >= typename genType::value_type(0.0f);
 	}
+*/
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectLineTriangle
 	(
-		genType const & orig, genType const & dir,
-		genType const & vert0, genType const & vert1, genType const & vert2,
+		genType const& orig, genType const& dir,
+		genType const& vert0, genType const& vert1, genType const& vert2,
 		genType & position
 	)
 	{
@@ -101,11 +156,11 @@ namespace glm
 		return true;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRaySphere
 	(
-		genType const & rayStarting, genType const & rayNormalizedDirection,
-		genType const & sphereCenter, const typename genType::value_type sphereRadiusSquered,
+		genType const& rayStarting, genType const& rayNormalizedDirection,
+		genType const& sphereCenter, const typename genType::value_type sphereRadiusSquered,
 		typename genType::value_type & intersectionDistance
 	)
 	{
@@ -122,11 +177,11 @@ namespace glm
 		return intersectionDistance > Epsilon;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectRaySphere
 	(
-		genType const & rayStarting, genType const & rayNormalizedDirection,
-		genType const & sphereCenter, const typename genType::value_type sphereRadius,
+		genType const& rayStarting, genType const& rayNormalizedDirection,
+		genType const& sphereCenter, const typename genType::value_type sphereRadius,
 		genType & intersectionPosition, genType & intersectionNormal
 	)
 	{
@@ -140,12 +195,12 @@ namespace glm
 		return false;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER bool intersectLineSphere
 	(
-		genType const & point0, genType const & point1,
-		genType const & sphereCenter, typename genType::value_type sphereRadius,
-		genType & intersectionPoint1, genType & intersectionNormal1, 
+		genType const& point0, genType const& point1,
+		genType const& sphereCenter, typename genType::value_type sphereRadius,
+		genType & intersectionPoint1, genType & intersectionNormal1,
 		genType & intersectionPoint2, genType & intersectionNormal2
 	)
 	{
diff --git a/external/include/glm/gtx/io.hpp b/external/include/glm/gtx/io.hpp
index 6aa8415..93db75a 100644
--- a/external/include/glm/gtx/io.hpp
+++ b/external/include/glm/gtx/io.hpp
@@ -8,14 +8,14 @@
 ///
 /// @defgroup gtx_io GLM_GTX_io
 /// @ingroup gtx
-/// 
-/// @brief std::[w]ostream support for glm types
 ///
-/// std::[w]ostream support for glm types + precision/width/etc. manipulators
+/// Include <glm/gtx/io.hpp> to use the features of this extension.
+///
+/// std::[w]ostream support for glm types
+///
+/// std::[w]ostream support for glm types + qualifier/width/etc. manipulators
 /// based on howard hinnant's std::chrono io proposal
 /// [http://home.roadrunner.com/~hinnant/bloomington/chrono_io.html]
-///
-/// <glm/gtx/io.hpp> needs to be included to use these functionalities.
 
 #pragma once
 
@@ -23,6 +23,10 @@
 #include "../glm.hpp"
 #include "../gtx/quaternion.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 # pragma message("GLM: GLM_GTX_io extension included")
 #endif
@@ -40,7 +44,7 @@ namespace glm
 	{
 		enum order_type { column_major, row_major};
 
-		template <typename CTy>
+		template<typename CTy>
 		class format_punct : public std::locale::facet
 		{
 			typedef CTy char_type;
@@ -63,7 +67,7 @@ namespace glm
 			GLM_FUNC_DECL explicit format_punct(format_punct const&);
 		};
 
-		template <typename CTy, typename CTr = std::char_traits<CTy> >
+		template<typename CTy, typename CTr = std::char_traits<CTy> >
 		class basic_state_saver {
 
 		public:
@@ -92,7 +96,7 @@ namespace glm
 		typedef basic_state_saver<char>     state_saver;
 		typedef basic_state_saver<wchar_t> wstate_saver;
 
-		template <typename CTy, typename CTr = std::char_traits<CTy> >
+		template<typename CTy, typename CTr = std::char_traits<CTy> >
 		class basic_format_saver
 		{
 		public:
@@ -124,7 +128,7 @@ namespace glm
 			GLM_FUNC_DECL explicit width(unsigned);
 		};
 
-		template <typename CTy>
+		template<typename CTy>
 		struct delimeter
 		{
 			CTy value[3];
@@ -141,55 +145,55 @@ namespace glm
 
 		// functions, inlined (inline)
 
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		FTy const& get_facet(std::basic_ios<CTy,CTr>&);
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>&);
-		template <typename FTy, typename CTy, typename CTr>
+		template<typename FTy, typename CTy, typename CTr>
 		std::basic_ios<CTy,CTr>& unformattet(std::basic_ios<CTy,CTr>&);
 
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, precision const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, width const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&);
-		template <typename CTy, typename CTr>
+		template<typename CTy, typename CTr>
 		std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&);
 	}//namespace io
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec1<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec2<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec3<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tvec4<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x2<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x3<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat2x4<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x2<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x3<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat3x4<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x2<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x3<T,P> const&);
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&);
-
-  template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<1, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<2, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<3, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, vec<4, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 2, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 3, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<2, 4, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 2, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 3, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<3, 4, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 2, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 3, T, Q> const&);
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, mat<4, 4, T, Q> const&);
+
+  template<typename CTy, typename CTr, typename T, qualifier Q>
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr> &,
-                                                         std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const &);
+                                                         std::pair<mat<4, 4, T, Q> const, mat<4, 4, T, Q> const> const&);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/io.inl b/external/include/glm/gtx/io.inl
index 9b70a5f..edb76bf 100644
--- a/external/include/glm/gtx/io.inl
+++ b/external/include/glm/gtx/io.inl
@@ -10,7 +10,7 @@
 namespace glm{
 namespace io
 {
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(size_t a)
 		: std::locale::facet(a)
 		, formatted(true)
@@ -24,7 +24,7 @@ namespace io
 		, order(column_major)
 	{}
 
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER format_punct<CTy>::format_punct(format_punct const& a)
 		: std::locale::facet(0)
 		, formatted(a.formatted)
@@ -38,9 +38,9 @@ namespace io
 		, order(a.order)
 	{}
 
-	template <typename CTy> std::locale::id format_punct<CTy>::id;
+	template<typename CTy> std::locale::id format_punct<CTy>::id;
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::basic_state_saver(std::basic_ios<CTy, CTr>& a)
 		: state_(a)
 		, flags_(a.flags())
@@ -50,7 +50,7 @@ namespace io
 		, locale_(a.getloc())
 	{}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_state_saver<CTy, CTr>::~basic_state_saver()
 	{
 		state_.imbue(locale_);
@@ -60,14 +60,14 @@ namespace io
 		state_.flags(flags_);
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER basic_format_saver<CTy, CTr>::basic_format_saver(std::basic_ios<CTy, CTr>& a)
 		: bss_(a)
 	{
 		a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a))));
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER
 	basic_format_saver<CTy, CTr>::~basic_format_saver()
 	{}
@@ -80,7 +80,7 @@ namespace io
 		: value(a)
 	{}
 
-	template <typename CTy>
+	template<typename CTy>
 	GLM_FUNC_QUALIFIER delimeter<CTy>::delimeter(CTy a, CTy b, CTy c)
 		: value()
 	{
@@ -93,7 +93,7 @@ namespace io
 		: value(a)
 	{}
 
-	template <typename FTy, typename CTy, typename CTr>
+	template<typename FTy, typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy, CTr>& ios)
 	{
 		if(!std::has_facet<FTy>(ios.getloc()))
@@ -102,35 +102,35 @@ namespace io
 		return std::use_facet<FTy>(ios.getloc());
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& formatted(std::basic_ios<CTy, CTr>& ios)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true;
 		return ios;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& unformatted(std::basic_ios<CTy, CTr>& ios)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false;
 		return ios;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value;
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, width const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value;
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER  std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
 	{
 		format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
@@ -142,7 +142,7 @@ namespace io
 		return os;
 	}
 
-	template <typename CTy, typename CTr>
+	template<typename CTy, typename CTr>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
 	{
 		const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value;
@@ -152,17 +152,17 @@ namespace io
 
 namespace detail
 {
-	template <typename CTy, typename CTr, template <typename, precision> class V, typename T, precision P>
+	template<typename CTy, typename CTr, typename V>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>&
-	print_vector_on(std::basic_ostream<CTy, CTr>& os, V<T,P> const& a)
+	print_vector_on(std::basic_ostream<CTy, CTr>& os, V const& a)
 	{
 		typename std::basic_ostream<CTy, CTr>::sentry const cerberus(os);
 
 		if(cerberus)
 		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
+			io::format_punct<CTy> const& fmt(io::get_facet<io::format_punct<CTy> >(os));
 
-			length_t const& components(type<V, T, P>::components);
+			length_t const& components(type<V>::components);
 
 			if(fmt.formatted)
 			{
@@ -195,49 +195,49 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T, Q> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec1<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<1, T, Q> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec2<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<2, T, Q> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec3<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<3, T, Q> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, vec<4, T, Q> const& a)
 	{
 		return detail::print_vector_on(os, a);
 	}
 
 namespace detail
 {
-	template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<T,P> const& a)
+	template<typename CTy, typename CTr, template<length_t, length_t, typename, qualifier> class M, length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_on(std::basic_ostream<CTy, CTr>& os, M<C, R, T, Q> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
 		if(cerberus)
 		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
+			io::format_punct<CTy> const& fmt(io::get_facet<io::format_punct<CTy> >(os));
 
-			length_t const& cols(type<M, T, P>::cols);
-			length_t const& rows(type<M, T, P>::rows);
+			length_t const& cols(type<M<C, R, T, Q> >::cols);
+			length_t const& rows(type<M<C, R, T, Q> >::rows);
 
 			if(fmt.formatted)
 			{
@@ -313,74 +313,74 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x2<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 2, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x3<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 3, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x4<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<2, 4, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x2<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 2, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x3<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 3, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x4<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<3, 4, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 2, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 3, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<T,P> const& a)
+	template<typename CTy, typename CTr, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, mat<4, 4, T, Q> const& a)
 	{
 		return detail::print_matrix_on(os, a);
 	}
 
 namespace detail
 {
-	template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<T, P> const, M<T, P> const> const& a)
+	template<typename CTy, typename CTr, template<length_t, length_t, typename, qualifier> class M, length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& print_matrix_pair_on(std::basic_ostream<CTy, CTr>& os, std::pair<M<C, R, T, Q> const, M<C, R, T, Q> const> const& a)
 	{
 		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
 		if(cerberus)
 		{
 			io::format_punct<CTy> const& fmt(io::get_facet<io::format_punct<CTy> >(os));
-			M<T,P> const& ml(a.first);
-			M<T,P> const& mr(a.second);
-			length_t const& cols(type<M, T, P>::cols);
-			length_t const& rows(type<M, T, P>::rows);
+			M<C, R, T, Q> const& ml(a.first);
+			M<C, R, T, Q> const& mr(a.second);
+			length_t const& cols(type<M<C, R, T, Q> >::cols);
+			length_t const& rows(type<M<C, R, T, Q> >::rows);
 
 			if(fmt.formatted)
 			{
@@ -409,7 +409,7 @@ namespace detail
 							if(0 != i)
 								os << fmt.space;
 
-								os << column(ml, i) << ((cols-1 != i) ? fmt.space : fmt.delim_right) << fmt.space << ((0 != i) ? fmt.space : fmt.delim_left) << column(mr, i);
+							os << column(ml, i) << ((cols-1 != i) ? fmt.space : fmt.delim_right) << fmt.space << ((0 != i) ? fmt.space : fmt.delim_left) << column(mr, i);
 
 							if(cols-1 != i)
 								os << fmt.newline;
@@ -430,11 +430,11 @@ namespace detail
 	}
 }//namespace detail
 
-	template <typename CTy, typename CTr, typename T, precision P>
+	template<typename CTy, typename CTr, typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(
 		std::basic_ostream<CTy, CTr> & os,
-		std::pair<tmat4x4<T, P> const,
-		tmat4x4<T, P> const> const& a)
+		std::pair<mat<4, 4, T, Q> const,
+		mat<4, 4, T, Q> const> const& a)
 	{
 		return detail::print_matrix_pair_on(os, a);
 	}
diff --git a/external/include/glm/gtx/log_base.hpp b/external/include/glm/gtx/log_base.hpp
index 7958fc3..e873e35 100644
--- a/external/include/glm/gtx/log_base.hpp
+++ b/external/include/glm/gtx/log_base.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_log_base GLM_GTX_log_base
 /// @ingroup gtx
 ///
-/// @brief Logarithm for any base. base can be a vector or a scalar.
+/// Include <glm/gtx/log_base.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/log_base.hpp> need to be included to use these functionalities.
+/// Logarithm for any base. base can be a vector or a scalar.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_log_base extension included")
 #endif
@@ -26,17 +30,17 @@ namespace glm
 
 	/// Logarithm for any base.
 	/// From GLM_GTX_log_base.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType log(
-		genType const & x,
-		genType const & base);
+		genType const& x,
+		genType const& base);
 
 	/// Logarithm for any base.
 	/// From GLM_GTX_log_base.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<T, P> sign(
-		vecType<T, P> const & x,
-		vecType<T, P> const & base);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, T, Q> sign(
+		vec<L, T, Q> const& x,
+		vec<L, T, Q> const& base);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/log_base.inl b/external/include/glm/gtx/log_base.inl
index 8005d1b..981bacc 100644
--- a/external/include/glm/gtx/log_base.inl
+++ b/external/include/glm/gtx/log_base.inl
@@ -3,15 +3,15 @@
 
 namespace glm
 {
-	template <typename genType> 
-	GLM_FUNC_QUALIFIER genType log(genType const & x, genType const & base)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType log(genType const& x, genType const& base)
 	{
-		assert(x != genType(0));
+		assert(!detail::compute_equal<genType>::call(x, static_cast<genType>(0)));
 		return glm::log(x) / glm::log(base);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> log(vecType<T, P> const & x, vecType<T, P> const & base)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> log(vec<L, T, Q> const& x, vec<L, T, Q> const& base)
 	{
 		return glm::log(x) / glm::log(base);
 	}
diff --git a/external/include/glm/gtx/matrix_cross_product.hpp b/external/include/glm/gtx/matrix_cross_product.hpp
index d920f4e..dfad8c1 100644
--- a/external/include/glm/gtx/matrix_cross_product.hpp
+++ b/external/include/glm/gtx/matrix_cross_product.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_matrix_cross_product GLM_GTX_matrix_cross_product
 /// @ingroup gtx
 ///
-/// @brief Build cross product matrices
+/// Include <glm/gtx/matrix_cross_product.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_cross_product.hpp> need to be included to use these functionalities.
+/// Build cross product matrices
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_cross_product extension included")
 #endif
@@ -27,15 +31,15 @@ namespace glm
 
 	//! Build a cross product matrix.
 	//! From GLM_GTX_matrix_cross_product extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> matrixCross3(
-		tvec3<T, P> const & x);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> matrixCross3(
+		vec<3, T, Q> const& x);
+
 	//! Build a cross product matrix.
 	//! From GLM_GTX_matrix_cross_product extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> matrixCross4(
-		tvec3<T, P> const & x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> matrixCross4(
+		vec<3, T, Q> const& x);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_cross_product.inl b/external/include/glm/gtx/matrix_cross_product.inl
index 16f07e9..d8ec11f 100644
--- a/external/include/glm/gtx/matrix_cross_product.inl
+++ b/external/include/glm/gtx/matrix_cross_product.inl
@@ -3,13 +3,13 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> matrixCross3
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> matrixCross3
 	(
-		tvec3<T, P> const & x
+		vec<3, T, Q> const& x
 	)
 	{
-		tmat3x3<T, P> Result(T(0));
+		mat<3, 3, T, Q> Result(T(0));
 		Result[0][1] = x.z;
 		Result[1][0] = -x.z;
 		Result[0][2] = -x.y;
@@ -19,13 +19,13 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> matrixCross4
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> matrixCross4
 	(
-		tvec3<T, P> const & x
+		vec<3, T, Q> const& x
 	)
 	{
-		tmat4x4<T, P> Result(T(0));
+		mat<4, 4, T, Q> Result(T(0));
 		Result[0][1] = x.z;
 		Result[1][0] = -x.z;
 		Result[0][2] = -x.y;
diff --git a/external/include/glm/gtx/matrix_decompose.hpp b/external/include/glm/gtx/matrix_decompose.hpp
index e163f5a..85bb289 100644
--- a/external/include/glm/gtx/matrix_decompose.hpp
+++ b/external/include/glm/gtx/matrix_decompose.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_matrix_decompose GLM_GTX_matrix_decompose
 /// @ingroup gtx
 ///
-/// @brief Decomposes a model matrix to translations, rotation and scale components
+/// Include <glm/gtx/matrix_decompose.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_decompose.hpp> need to be included to use these functionalities.
+/// Decomposes a model matrix to translations, rotation and scale components
 
 #pragma once
 
@@ -20,6 +20,10 @@
 #include "../gtc/quaternion.hpp"
 #include "../gtc/matrix_transform.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_decompose extension included")
 #endif
@@ -29,12 +33,12 @@ namespace glm
 	/// @addtogroup gtx_matrix_decompose
 	/// @{
 
-	/// Decomposes a model matrix to translations, rotation and scale components 
+	/// Decomposes a model matrix to translations, rotation and scale components
 	/// @see gtx_matrix_decompose
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL bool decompose(
-		tmat4x4<T, P> const & modelMatrix,
-		tvec3<T, P> & scale, tquat<T, P> & orientation, tvec3<T, P> & translation, tvec3<T, P> & skew, tvec4<T, P> & perspective);
+		mat<4, 4, T, Q> const& modelMatrix,
+		vec<3, T, Q> & scale, tquat<T, Q> & orientation, vec<3, T, Q> & translation, vec<3, T, Q> & skew, vec<4, T, Q> & perspective);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_decompose.inl b/external/include/glm/gtx/matrix_decompose.inl
index 7194e9d..02a5acc 100644
--- a/external/include/glm/gtx/matrix_decompose.inl
+++ b/external/include/glm/gtx/matrix_decompose.inl
@@ -1,22 +1,25 @@
 /// @ref gtx_matrix_decompose
 /// @file glm/gtx/matrix_decompose.inl
 
+#include "../gtc/constants.hpp"
+#include "../gtc/epsilon.hpp"
+
 namespace glm{
 namespace detail
 {
 	/// Make a linear combination of two vectors and return the result.
 	// result = (a * ascl) + (b * bscl)
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> combine(
-		tvec3<T, P> const & a, 
-		tvec3<T, P> const & b,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> combine(
+		vec<3, T, Q> const& a,
+		vec<3, T, Q> const& b,
 		T ascl, T bscl)
 	{
 		return (a * ascl) + (b * bscl);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> scale(tvec3<T, P> const& v, T desiredLength)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> scale(vec<3, T, Q> const& v, T desiredLength)
 	{
 		return v * desiredLength / length(v);
 	}
@@ -26,13 +29,13 @@ namespace detail
 	// http://www.opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
 	// Decomposes the mode matrix to translations,rotation scale components
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER bool decompose(tmat4x4<T, P> const & ModelMatrix, tvec3<T, P> & Scale, tquat<T, P> & Orientation, tvec3<T, P> & Translation, tvec3<T, P> & Skew, tvec4<T, P> & Perspective)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool decompose(mat<4, 4, T, Q> const& ModelMatrix, vec<3, T, Q> & Scale, tquat<T, Q> & Orientation, vec<3, T, Q> & Translation, vec<3, T, Q> & Skew, vec<4, T, Q> & Perspective)
 	{
-		tmat4x4<T, P> LocalMatrix(ModelMatrix);
+		mat<4, 4, T, Q> LocalMatrix(ModelMatrix);
 
 		// Normalize the matrix.
-		if(LocalMatrix[3][3] == static_cast<T>(0))
+		if(epsilonEqual(LocalMatrix[3][3], static_cast<T>(0), epsilon<T>()))
 			return false;
 
 		for(length_t i = 0; i < 4; ++i)
@@ -41,21 +44,24 @@ namespace detail
 
 		// perspectiveMatrix is used to solve for perspective, but it also provides
 		// an easy way to test for singularity of the upper 3x3 component.
-		tmat4x4<T, P> PerspectiveMatrix(LocalMatrix);
+		mat<4, 4, T, Q> PerspectiveMatrix(LocalMatrix);
 
 		for(length_t i = 0; i < 3; i++)
 			PerspectiveMatrix[i][3] = static_cast<T>(0);
 		PerspectiveMatrix[3][3] = static_cast<T>(1);
 
 		/// TODO: Fixme!
-		if(determinant(PerspectiveMatrix) == static_cast<T>(0))
+		if(epsilonEqual(determinant(PerspectiveMatrix), static_cast<T>(0), epsilon<T>()))
 			return false;
 
 		// First, isolate perspective.  This is the messiest.
-		if(LocalMatrix[0][3] != static_cast<T>(0) || LocalMatrix[1][3] != static_cast<T>(0) || LocalMatrix[2][3] != static_cast<T>(0))
+		if(
+			epsilonNotEqual(LocalMatrix[0][3], static_cast<T>(0), epsilon<T>()) ||
+			epsilonNotEqual(LocalMatrix[1][3], static_cast<T>(0), epsilon<T>()) ||
+			epsilonNotEqual(LocalMatrix[2][3], static_cast<T>(0), epsilon<T>()))
 		{
 			// rightHandSide is the right hand side of the equation.
-			tvec4<T, P> RightHandSide;
+			vec<4, T, Q> RightHandSide;
 			RightHandSide[0] = LocalMatrix[0][3];
 			RightHandSide[1] = LocalMatrix[1][3];
 			RightHandSide[2] = LocalMatrix[2][3];
@@ -64,8 +70,8 @@ namespace detail
 			// Solve the equation by inverting PerspectiveMatrix and multiplying
 			// rightHandSide by the inverse.  (This is the easiest way, not
 			// necessarily the best.)
-			tmat4x4<T, P> InversePerspectiveMatrix = glm::inverse(PerspectiveMatrix);//   inverse(PerspectiveMatrix, inversePerspectiveMatrix);
-			tmat4x4<T, P> TransposedInversePerspectiveMatrix = glm::transpose(InversePerspectiveMatrix);//   transposeMatrix4(inversePerspectiveMatrix, transposedInversePerspectiveMatrix);
+			mat<4, 4, T, Q> InversePerspectiveMatrix = glm::inverse(PerspectiveMatrix);//   inverse(PerspectiveMatrix, inversePerspectiveMatrix);
+			mat<4, 4, T, Q> TransposedInversePerspectiveMatrix = glm::transpose(InversePerspectiveMatrix);//   transposeMatrix4(inversePerspectiveMatrix, transposedInversePerspectiveMatrix);
 
 			Perspective = TransposedInversePerspectiveMatrix * RightHandSide;
 			//  v4MulPointByMatrix(rightHandSide, transposedInversePerspectiveMatrix, perspectivePoint);
@@ -77,19 +83,19 @@ namespace detail
 		else
 		{
 			// No perspective.
-			Perspective = tvec4<T, P>(0, 0, 0, 1);
+			Perspective = vec<4, T, Q>(0, 0, 0, 1);
 		}
 
 		// Next take care of translation (easy).
-		Translation = tvec3<T, P>(LocalMatrix[3]);
-		LocalMatrix[3] = tvec4<T, P>(0, 0, 0, LocalMatrix[3].w);
+		Translation = vec<3, T, Q>(LocalMatrix[3]);
+		LocalMatrix[3] = vec<4, T, Q>(0, 0, 0, LocalMatrix[3].w);
 
-		tvec3<T, P> Row[3], Pdum3;
+		vec<3, T, Q> Row[3], Pdum3;
 
 		// Now get scale and shear.
 		for(length_t i = 0; i < 3; ++i)
-			for(int j = 0; j < 3; ++j)
-				Row[i][j] = LocalMatrix[i][j];
+		for(length_t j = 0; j < 3; ++j)
+			Row[i][j] = LocalMatrix[i][j];
 
 		// Compute X scale factor and normalize first row.
 		Scale.x = length(Row[0]);// v3Length(Row[0]);
@@ -147,47 +153,34 @@ namespace detail
 		//     ret.rotateZ = 0;
 		// }
 
-		T s, t, x, y, z, w;
-
-		t = Row[0][0] + Row[1][1] + Row[2][2] + static_cast<T>(1);
-
-		if(t > static_cast<T>(1e-4))
+		int i, j, k = 0;
+		float root, trace = Row[0].x + Row[1].y + Row[2].z;
+		if(trace > static_cast<T>(0))
 		{
-			s = static_cast<T>(0.5) / sqrt(t);
-			w = static_cast<T>(0.25) / s;
-			x = (Row[2][1] - Row[1][2]) * s;
-			y = (Row[0][2] - Row[2][0]) * s;
-			z = (Row[1][0] - Row[0][1]) * s;
-		}
-		else if(Row[0][0] > Row[1][1] && Row[0][0] > Row[2][2])
-		{ 
-			s = sqrt (static_cast<T>(1) + Row[0][0] - Row[1][1] - Row[2][2]) * static_cast<T>(2); // S=4*qx 
-			x = static_cast<T>(0.25) * s;
-			y = (Row[0][1] + Row[1][0]) / s; 
-			z = (Row[0][2] + Row[2][0]) / s; 
-			w = (Row[2][1] - Row[1][2]) / s;
-		}
-		else if(Row[1][1] > Row[2][2])
-		{ 
-			s = sqrt (static_cast<T>(1) + Row[1][1] - Row[0][0] - Row[2][2]) * static_cast<T>(2); // S=4*qy
-			x = (Row[0][1] + Row[1][0]) / s; 
-			y = static_cast<T>(0.25) * s;
-			z = (Row[1][2] + Row[2][1]) / s; 
-			w = (Row[0][2] - Row[2][0]) / s;
-		}
+			root = sqrt(trace + static_cast<T>(1.0));
+			Orientation.w = static_cast<T>(0.5) * root;
+			root = static_cast<T>(0.5) / root;
+			Orientation.x = root * (Row[1].z - Row[2].y);
+			Orientation.y = root * (Row[2].x - Row[0].z);
+			Orientation.z = root * (Row[0].y - Row[1].x);
+		} // End if > 0
 		else
-		{ 
-			s = sqrt(static_cast<T>(1) + Row[2][2] - Row[0][0] - Row[1][1]) * static_cast<T>(2); // S=4*qz
-			x = (Row[0][2] + Row[2][0]) / s;
-			y = (Row[1][2] + Row[2][1]) / s; 
-			z = static_cast<T>(0.25) * s;
-			w = (Row[1][0] - Row[0][1]) / s;
-		}
-
-		Orientation.x = x;
-		Orientation.y = y;
-		Orientation.z = z;
-		Orientation.w = w;
+		{
+			static int Next[3] = {1, 2, 0};
+			i = 0;
+			if(Row[1].y > Row[0].x) i = 1;
+			if(Row[2].z > Row[i][i]) i = 2;
+			j = Next[i];
+			k = Next[j];
+
+			root = sqrt(Row[i][i] - Row[j][j] - Row[k][k] + static_cast<T>(1.0));
+
+			Orientation[i] = static_cast<T>(0.5) * root;
+			root = static_cast<T>(0.5) / root;
+			Orientation[j] = root * (Row[i][j] + Row[j][i]);
+			Orientation[k] = root * (Row[i][k] + Row[k][i]);
+			Orientation.w = root * (Row[j][k] - Row[k][j]);
+		} // End if <= 0
 
 		return true;
 	}
diff --git a/external/include/glm/gtx/matrix_factorisation.hpp b/external/include/glm/gtx/matrix_factorisation.hpp
new file mode 100644
index 0000000..e30a774
--- /dev/null
+++ b/external/include/glm/gtx/matrix_factorisation.hpp
@@ -0,0 +1,69 @@
+/// @ref gtx_matrix_factorisation
+/// @file glm/gtx/matrix_factorisation.hpp
+///
+/// @see core (dependence)
+///
+/// @defgroup gtx_matrix_factorisation GLM_GTX_matrix_factorisation
+/// @ingroup gtx
+///
+/// Include <glm/gtx/matrix_factorisation.hpp> to use the features of this extension.
+///
+/// Functions to factor matrices in various forms
+
+#pragma once
+
+// Dependency:
+#include "../glm.hpp"
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTX_matrix_factorisation extension included")
+#endif
+
+/*
+Suggestions:
+ - Move helper functions flipud and fliplr to another file: They may be helpful in more general circumstances.
+ - Implement other types of matrix factorisation, such as: QL and LQ, L(D)U, eigendecompositions, etc...
+*/
+
+namespace glm
+{
+	/// @addtogroup gtx_matrix_factorisation
+	/// @{
+
+	/// Flips the matrix rows up and down.
+	///
+	/// From GLM_GTX_matrix_factorisation extension.
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_DECL mat<C, R, T, Q> flipud(mat<C, R, T, Q> const& in);
+
+	/// Flips the matrix columns right and left.
+	///
+	/// From GLM_GTX_matrix_factorisation extension.
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_DECL mat<C, R, T, Q> fliplr(mat<C, R, T, Q> const& in);
+
+	/// Performs QR factorisation of a matrix.
+	/// Returns 2 matrices, q and r, such that the columns of q are orthonormal and span the same subspace than those of the input matrix, r is an upper triangular matrix, and q*r=in.
+	/// Given an n-by-m input matrix, q has dimensions min(n,m)-by-m, and r has dimensions n-by-min(n,m).
+	///
+	/// From GLM_GTX_matrix_factorisation extension.
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_DECL void qr_decompose(mat<C, R, T, Q> const& in, mat<(C < R ? C : R), R, T, Q>& q, mat<C, (C < R ? C : R), T, Q>& r);
+
+	/// Performs RQ factorisation of a matrix.
+	/// Returns 2 matrices, r and q, such that r is an upper triangular matrix, the rows of q are orthonormal and span the same subspace than those of the input matrix, and r*q=in.
+	/// Note that in the context of RQ factorisation, the diagonal is seen as starting in the lower-right corner of the matrix, instead of the usual upper-left.
+	/// Given an n-by-m input matrix, r has dimensions min(n,m)-by-m, and q has dimensions n-by-min(n,m).
+	///
+	/// From GLM_GTX_matrix_factorisation extension.
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_DECL void rq_decompose(mat<C, R, T, Q> const& in, mat<(C < R ? C : R), R, T, Q>& r, mat<C, (C < R ? C : R), T, Q>& q);
+
+	/// @}
+}
+
+#include "matrix_factorisation.inl"
diff --git a/external/include/glm/gtx/matrix_factorisation.inl b/external/include/glm/gtx/matrix_factorisation.inl
new file mode 100644
index 0000000..f0d9560
--- /dev/null
+++ b/external/include/glm/gtx/matrix_factorisation.inl
@@ -0,0 +1,85 @@
+/// @ref gtx_matrix_factorisation
+/// @file glm/gtx/matrix_factorisation.inl
+
+namespace glm
+{
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<C, R, T, Q> flipud(mat<C, R, T, Q> const& in)
+	{
+		mat<R, C, T, Q> tin = transpose(in);
+		tin = fliplr(tin);
+		mat<C, R, T, Q> out = transpose(tin);
+
+		return out;
+	}
+
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<C, R, T, Q> fliplr(mat<C, R, T, Q> const& in)
+	{
+		mat<C, R, T, Q> out;
+		for (length_t i = 0; i < C; i++)
+		{
+			out[i] = in[(C - i) - 1];
+		}
+
+		return out;
+	}
+
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER void qr_decompose(mat<C, R, T, Q> const& in, mat<(C < R ? C : R), R, T, Q>& q, mat<C, (C < R ? C : R), T, Q>& r)
+	{
+		// Uses modified Gram-Schmidt method
+		// Source: https://en.wikipedia.org/wiki/Gram–Schmidt_process
+		// And https://en.wikipedia.org/wiki/QR_decomposition
+
+		//For all the linearly independs columns of the input...
+		// (there can be no more linearly independents columns than there are rows.)
+		for (length_t i = 0; i < (C < R ? C : R); i++)
+		{
+			//Copy in Q the input's i-th column.
+			q[i] = in[i];
+
+			//j = [0,i[
+			// Make that column orthogonal to all the previous ones by substracting to it the non-orthogonal projection of all the previous columns.
+			// Also: Fill the zero elements of R
+			for (length_t j = 0; j < i; j++)
+			{
+				q[i] -= dot(q[i], q[j])*q[j];
+				r[j][i] = 0;
+			}
+
+			//Now, Q i-th column is orthogonal to all the previous columns. Normalize it.
+			q[i] = normalize(q[i]);
+
+			//j = [i,C[
+			//Finally, compute the corresponding coefficients of R by computing the projection of the resulting column on the other columns of the input.
+			for (length_t j = i; j < C; j++)
+			{
+				r[j][i] = dot(in[j], q[i]);
+			}
+		}
+	}
+
+	template <length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER void rq_decompose(mat<C, R, T, Q> const& in, mat<(C < R ? C : R), R, T, Q>& r, mat<C, (C < R ? C : R), T, Q>& q)
+	{
+		// From https://en.wikipedia.org/wiki/QR_decomposition:
+		// The RQ decomposition transforms a matrix A into the product of an upper triangular matrix R (also known as right-triangular) and an orthogonal matrix Q. The only difference from QR decomposition is the order of these matrices.
+		// QR decomposition is Gram–Schmidt orthogonalization of columns of A, started from the first column.
+		// RQ decomposition is Gram–Schmidt orthogonalization of rows of A, started from the last row.
+
+		mat<R, C, T, Q> tin = transpose(in);
+		tin = fliplr(tin);
+
+		mat<R, (C < R ? C : R), T, Q> tr;
+		mat<(C < R ? C : R), C, T, Q> tq;
+		qr_decompose(tin, tq, tr);
+
+		tr = fliplr(tr);
+		r = transpose(tr);
+		r = fliplr(r);
+
+		tq = fliplr(tq);
+		q = transpose(tq);
+	}
+} //namespace glm
diff --git a/external/include/glm/gtx/matrix_interpolation.hpp b/external/include/glm/gtx/matrix_interpolation.hpp
index 77a69ea..89c4596 100644
--- a/external/include/glm/gtx/matrix_interpolation.hpp
+++ b/external/include/glm/gtx/matrix_interpolation.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_matrix_interpolation GLM_GTX_matrix_interpolation
 /// @ingroup gtx
 ///
-/// @brief Allows to directly interpolate two exiciting matrices.
+/// Include <glm/gtx/matrix_interpolation.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_interpolation.hpp> need to be included to use these functionalities.
+/// Allows to directly interpolate two matrices.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_interpolation extension included")
 #endif
@@ -27,32 +31,32 @@ namespace glm
 
 	/// Get the axis and angle of the rotation from a matrix.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL void axisAngle(
-		tmat4x4<T, P> const & mat,
-		tvec3<T, P> & axis,
+		mat<4, 4, T, Q> const& mat,
+		vec<3, T, Q> & axis,
 		T & angle);
 
 	/// Build a matrix from axis and angle.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> axisAngleMatrix(
-		tvec3<T, P> const & axis,
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> axisAngleMatrix(
+		vec<3, T, Q> const& axis,
 		T const angle);
 
 	/// Extracts the rotation part of a matrix.
 	/// From GLM_GTX_matrix_interpolation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> extractMatrixRotation(
-		tmat4x4<T, P> const & mat);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> extractMatrixRotation(
+		mat<4, 4, T, Q> const& mat);
 
 	/// Build a interpolation of 4 * 4 matrixes.
 	/// From GLM_GTX_matrix_interpolation extension.
 	/// Warning! works only with rotation and/or translation matrixes, scale will generate unexpected results.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> interpolate(
-		tmat4x4<T, P> const & m1,
-		tmat4x4<T, P> const & m2,
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> interpolate(
+		mat<4, 4, T, Q> const& m1,
+		mat<4, 4, T, Q> const& m2,
 		T const delta);
 
 	/// @}
diff --git a/external/include/glm/gtx/matrix_interpolation.inl b/external/include/glm/gtx/matrix_interpolation.inl
index 8645f96..1f2915a 100644
--- a/external/include/glm/gtx/matrix_interpolation.inl
+++ b/external/include/glm/gtx/matrix_interpolation.inl
@@ -1,43 +1,43 @@
 /// @ref gtx_matrix_interpolation
 /// @file glm/gtx/matrix_interpolation.hpp
 
+#include "../gtc/constants.hpp"
+
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER void axisAngle
-	(
-		tmat4x4<T, P> const & mat,
-		tvec3<T, P> & axis,
-		T & angle
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER void axisAngle(mat<4, 4, T, Q> const& mat, vec<3, T, Q> & axis, T & angle)
 	{
-		T epsilon = (T)0.01;
-		T epsilon2 = (T)0.1;
+		T epsilon = static_cast<T>(0.01);
+		T epsilon2 = static_cast<T>(0.1);
 
 		if((abs(mat[1][0] - mat[0][1]) < epsilon) && (abs(mat[2][0] - mat[0][2]) < epsilon) && (abs(mat[2][1] - mat[1][2]) < epsilon))
 		{
-			if ((abs(mat[1][0] + mat[0][1]) < epsilon2) && (abs(mat[2][0] + mat[0][2]) < epsilon2) && (abs(mat[2][1] + mat[1][2]) < epsilon2) && (abs(mat[0][0] + mat[1][1] + mat[2][2] - (T)3.0) < epsilon2))
+			if ((abs(mat[1][0] + mat[0][1]) < epsilon2) && (abs(mat[2][0] + mat[0][2]) < epsilon2) && (abs(mat[2][1] + mat[1][2]) < epsilon2) && (abs(mat[0][0] + mat[1][1] + mat[2][2] - static_cast<T>(3.0)) < epsilon2))
 			{
-				angle = (T)0.0;
-				axis.x = (T)1.0;
-				axis.y = (T)0.0;
-				axis.z = (T)0.0;
+				angle = static_cast<T>(0.0);
+				axis.x = static_cast<T>(1.0);
+				axis.y = static_cast<T>(0.0);
+				axis.z = static_cast<T>(0.0);
 				return;
 			}
 			angle = static_cast<T>(3.1415926535897932384626433832795);
-			T xx = (mat[0][0] + (T)1.0) / (T)2.0;
-			T yy = (mat[1][1] + (T)1.0) / (T)2.0;
-			T zz = (mat[2][2] + (T)1.0) / (T)2.0;
-			T xy = (mat[1][0] + mat[0][1]) / (T)4.0;
-			T xz = (mat[2][0] + mat[0][2]) / (T)4.0;
-			T yz = (mat[2][1] + mat[1][2]) / (T)4.0;
+			T xx = (mat[0][0] + static_cast<T>(1.0)) * static_cast<T>(0.5);
+			T yy = (mat[1][1] + static_cast<T>(1.0)) * static_cast<T>(0.5);
+			T zz = (mat[2][2] + static_cast<T>(1.0)) * static_cast<T>(0.5);
+			T xy = (mat[1][0] + mat[0][1]) * static_cast<T>(0.25);
+			T xz = (mat[2][0] + mat[0][2]) * static_cast<T>(0.25);
+			T yz = (mat[2][1] + mat[1][2]) * static_cast<T>(0.25);
 			if((xx > yy) && (xx > zz))
 			{
-				if (xx < epsilon) {
-					axis.x = (T)0.0;
-					axis.y = (T)0.7071;
-					axis.z = (T)0.7071;
-				} else {
+				if(xx < epsilon)
+				{
+					axis.x = static_cast<T>(0.0);
+					axis.y = static_cast<T>(0.7071);
+					axis.z = static_cast<T>(0.7071);
+				}
+				else
+				{
 					axis.x = sqrt(xx);
 					axis.y = xy / axis.x;
 					axis.z = xz / axis.x;
@@ -45,11 +45,14 @@ namespace glm
 			}
 			else if (yy > zz)
 			{
-				if (yy < epsilon) {
-					axis.x = (T)0.7071;
-					axis.y = (T)0.0;
-					axis.z = (T)0.7071;
-				} else {
+				if(yy < epsilon)
+				{
+					axis.x = static_cast<T>(0.7071);
+					axis.y = static_cast<T>(0.0);
+					axis.z = static_cast<T>(0.7071);
+				}
+				else
+				{
 					axis.y = sqrt(yy);
 					axis.x = xy / axis.y;
 					axis.z = yz / axis.y;
@@ -57,11 +60,14 @@ namespace glm
 			}
 			else
 			{
-				if (zz < epsilon) {
-					axis.x = (T)0.7071;
-					axis.y = (T)0.7071;
-					axis.z = (T)0.0;
-				} else {
+				if (zz < epsilon)
+				{
+					axis.x = static_cast<T>(0.7071);
+					axis.y = static_cast<T>(0.7071);
+					axis.z = static_cast<T>(0.0);
+				}
+				else
+				{
 					axis.z = sqrt(zz);
 					axis.x = xz / axis.z;
 					axis.y = yz / axis.z;
@@ -71,61 +77,51 @@ namespace glm
 		}
 		T s = sqrt((mat[2][1] - mat[1][2]) * (mat[2][1] - mat[1][2]) + (mat[2][0] - mat[0][2]) * (mat[2][0] - mat[0][2]) + (mat[1][0] - mat[0][1]) * (mat[1][0] - mat[0][1]));
 		if (glm::abs(s) < T(0.001))
-			s = (T)1.0;
-		angle = acos((mat[0][0] + mat[1][1] + mat[2][2] - (T)1.0) / (T)2.0);
+			s = static_cast<T>(1);
+		T const angleCos = (mat[0][0] + mat[1][1] + mat[2][2] - static_cast<T>(1)) * static_cast<T>(0.5);
+		if(angleCos - static_cast<T>(1) < epsilon)
+			angle = pi<T>() * static_cast<T>(0.25);
+		else
+			angle = acos(angleCos);
 		axis.x = (mat[1][2] - mat[2][1]) / s;
 		axis.y = (mat[2][0] - mat[0][2]) / s;
 		axis.z = (mat[0][1] - mat[1][0]) / s;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> axisAngleMatrix
-	(
-		tvec3<T, P> const & axis,
-		T const angle
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> axisAngleMatrix(vec<3, T, Q> const& axis, T const angle)
 	{
 		T c = cos(angle);
 		T s = sin(angle);
 		T t = static_cast<T>(1) - c;
-		tvec3<T, P> n = normalize(axis);
+		vec<3, T, Q> n = normalize(axis);
 
-		return tmat4x4<T, P>(
-			t * n.x * n.x + c,          t * n.x * n.y + n.z * s,    t * n.x * n.z - n.y * s,    T(0),
-			t * n.x * n.y - n.z * s,    t * n.y * n.y + c,          t * n.y * n.z + n.x * s,    T(0),
-			t * n.x * n.z + n.y * s,    t * n.y * n.z - n.x * s,    t * n.z * n.z + c,          T(0),
-			T(0),                        T(0),                        T(0),                     T(1)
-		);
+		return mat<4, 4, T, Q>(
+			t * n.x * n.x + c,          t * n.x * n.y + n.z * s,    t * n.x * n.z - n.y * s,    static_cast<T>(0.0),
+			t * n.x * n.y - n.z * s,    t * n.y * n.y + c,          t * n.y * n.z + n.x * s,    static_cast<T>(0.0),
+			t * n.x * n.z + n.y * s,    t * n.y * n.z - n.x * s,    t * n.z * n.z + c,          static_cast<T>(0.0),
+			static_cast<T>(0.0),        static_cast<T>(0.0),        static_cast<T>(0.0),        static_cast<T>(1.0));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> extractMatrixRotation
-	(
-		tmat4x4<T, P> const & mat
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> extractMatrixRotation(mat<4, 4, T, Q> const& m)
 	{
-		return tmat4x4<T, P>(
-			mat[0][0], mat[0][1], mat[0][2], 0.0,
-			mat[1][0], mat[1][1], mat[1][2], 0.0,
-			mat[2][0], mat[2][1], mat[2][2], 0.0,
-			0.0,       0.0,       0.0,       1.0
-		);
+		return mat<4, 4, T, Q>(
+			m[0][0], m[0][1], m[0][2], static_cast<T>(0.0),
+			m[1][0], m[1][1], m[1][2], static_cast<T>(0.0),
+			m[2][0], m[2][1], m[2][2], static_cast<T>(0.0),
+			static_cast<T>(0.0), static_cast<T>(0.0), static_cast<T>(0.0), static_cast<T>(1.0));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> interpolate
-	(
-		tmat4x4<T, P> const & m1,
-		tmat4x4<T, P> const & m2,
-		T const delta
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> interpolate(mat<4, 4, T, Q> const& m1, mat<4, 4, T, Q> const& m2, T const delta)
 	{
-		tmat4x4<T, P> m1rot = extractMatrixRotation(m1);
-		tmat4x4<T, P> dltRotation = m2 * transpose(m1rot);
-		tvec3<T, P> dltAxis;
+		mat<4, 4, T, Q> m1rot = extractMatrixRotation(m1);
+		mat<4, 4, T, Q> dltRotation = m2 * transpose(m1rot);
+		vec<3, T, Q> dltAxis;
 		T dltAngle;
 		axisAngle(dltRotation, dltAxis, dltAngle);
-		tmat4x4<T, P> out = axisAngleMatrix(dltAxis, dltAngle * delta) * m1rot;
+		mat<4, 4, T, Q> out = axisAngleMatrix(dltAxis, dltAngle * delta) * m1rot;
 		out[3][0] = m1[3][0] + delta * (m2[3][0] - m1[3][0]);
 		out[3][1] = m1[3][1] + delta * (m2[3][1] - m1[3][1]);
 		out[3][2] = m1[3][2] + delta * (m2[3][2] - m1[3][2]);
diff --git a/external/include/glm/gtx/matrix_major_storage.hpp b/external/include/glm/gtx/matrix_major_storage.hpp
index 9402abe..3b922df 100644
--- a/external/include/glm/gtx/matrix_major_storage.hpp
+++ b/external/include/glm/gtx/matrix_major_storage.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_matrix_major_storage GLM_GTX_matrix_major_storage
 /// @ingroup gtx
 ///
-/// @brief Build matrices with specific matrix order, row or column
+/// Include <glm/gtx/matrix_major_storage.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_major_storage.hpp> need to be included to use these functionalities.
+/// Build matrices with specific matrix order, row or column
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_major_storage extension included")
 #endif
@@ -27,87 +31,87 @@ namespace glm
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
-		tvec2<T, P> const & v1, 
-		tvec2<T, P> const & v2);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 2, T, Q> rowMajor2(
+		vec<2, T, Q> const& v1,
+		vec<2, T, Q> const& v2);
+
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x2<T, P> rowMajor2(
-		tmat2x2<T, P> const & m);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 2, T, Q> rowMajor2(
+		mat<2, 2, T, Q> const& m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
-		tvec3<T, P> const & v1, 
-		tvec3<T, P> const & v2, 
-		tvec3<T, P> const & v3);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> rowMajor3(
+		vec<3, T, Q> const& v1,
+		vec<3, T, Q> const& v2,
+		vec<3, T, Q> const& v3);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> rowMajor3(
-		tmat3x3<T, P> const & m);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> rowMajor3(
+		mat<3, 3, T, Q> const& m);
 
 	//! Build a row major matrix from row vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
-		tvec4<T, P> const & v1, 
-		tvec4<T, P> const & v2,
-		tvec4<T, P> const & v3, 
-		tvec4<T, P> const & v4);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> rowMajor4(
+		vec<4, T, Q> const& v1,
+		vec<4, T, Q> const& v2,
+		vec<4, T, Q> const& v3,
+		vec<4, T, Q> const& v4);
 
 	//! Build a row major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> rowMajor4(
-		tmat4x4<T, P> const & m);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> rowMajor4(
+		mat<4, 4, T, Q> const& m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
-		tvec2<T, P> const & v1, 
-		tvec2<T, P> const & v2);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 2, T, Q> colMajor2(
+		vec<2, T, Q> const& v1,
+		vec<2, T, Q> const& v2);
+
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x2<T, P> colMajor2(
-		tmat2x2<T, P> const & m);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 2, T, Q> colMajor2(
+		mat<2, 2, T, Q> const& m);
 
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
-		tvec3<T, P> const & v1, 
-		tvec3<T, P> const & v2, 
-		tvec3<T, P> const & v3);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> colMajor3(
+		vec<3, T, Q> const& v1,
+		vec<3, T, Q> const& v2,
+		vec<3, T, Q> const& v3);
+
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> colMajor3(
-		tmat3x3<T, P> const & m);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> colMajor3(
+		mat<3, 3, T, Q> const& m);
+
 	//! Build a column major matrix from column vectors.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
-		tvec4<T, P> const & v1, 
-		tvec4<T, P> const & v2, 
-		tvec4<T, P> const & v3, 
-		tvec4<T, P> const & v4);
-				
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> colMajor4(
+		vec<4, T, Q> const& v1,
+		vec<4, T, Q> const& v2,
+		vec<4, T, Q> const& v3,
+		vec<4, T, Q> const& v4);
+
 	//! Build a column major matrix from other matrix.
 	//! From GLM_GTX_matrix_major_storage extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat4x4<T, P> colMajor4(
-		tmat4x4<T, P> const & m);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> colMajor4(
+		mat<4, 4, T, Q> const& m);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_major_storage.inl b/external/include/glm/gtx/matrix_major_storage.inl
index 7097739..8b1b1a8 100644
--- a/external/include/glm/gtx/matrix_major_storage.inl
+++ b/external/include/glm/gtx/matrix_major_storage.inl
@@ -3,14 +3,14 @@
 
 namespace glm
 {
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, Q> rowMajor2
 	(
-		tvec2<T, P> const & v1, 
-		tvec2<T, P> const & v2
+		vec<2, T, Q> const& v1,
+		vec<2, T, Q> const& v2
 	)
 	{
-		tmat2x2<T, P> Result;
+		mat<2, 2, T, Q> Result;
 		Result[0][0] = v1.x;
 		Result[1][0] = v1.y;
 		Result[0][1] = v2.x;
@@ -18,11 +18,11 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat2x2<T, P> rowMajor2(
-		const tmat2x2<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, Q> rowMajor2(
+		const mat<2, 2, T, Q>& m)
 	{
-		tmat2x2<T, P> Result;
+		mat<2, 2, T, Q> Result;
 		Result[0][0] = m[0][0];
 		Result[0][1] = m[1][0];
 		Result[1][0] = m[0][1];
@@ -30,13 +30,13 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3(
-		const tvec3<T, P>& v1, 
-		const tvec3<T, P>& v2, 
-		const tvec3<T, P>& v3)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rowMajor3(
+		const vec<3, T, Q>& v1,
+		const vec<3, T, Q>& v2,
+		const vec<3, T, Q>& v3)
 	{
-		tmat3x3<T, P> Result;
+		mat<3, 3, T, Q> Result;
 		Result[0][0] = v1.x;
 		Result[1][0] = v1.y;
 		Result[2][0] = v1.z;
@@ -49,11 +49,11 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> rowMajor3(
-		const tmat3x3<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rowMajor3(
+		const mat<3, 3, T, Q>& m)
 	{
-		tmat3x3<T, P> Result;
+		mat<3, 3, T, Q> Result;
 		Result[0][0] = m[0][0];
 		Result[0][1] = m[1][0];
 		Result[0][2] = m[2][0];
@@ -66,14 +66,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4(
-		const tvec4<T, P>& v1, 
-		const tvec4<T, P>& v2, 
-		const tvec4<T, P>& v3, 
-		const tvec4<T, P>& v4)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rowMajor4(
+		const vec<4, T, Q>& v1,
+		const vec<4, T, Q>& v2,
+		const vec<4, T, Q>& v3,
+		const vec<4, T, Q>& v4)
 	{
-		tmat4x4<T, P> Result;
+		mat<4, 4, T, Q> Result;
 		Result[0][0] = v1.x;
 		Result[1][0] = v1.y;
 		Result[2][0] = v1.z;
@@ -93,11 +93,11 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> rowMajor4(
-		const tmat4x4<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rowMajor4(
+		const mat<4, 4, T, Q>& m)
 	{
-		tmat4x4<T, P> Result;
+		mat<4, 4, T, Q> Result;
 		Result[0][0] = m[0][0];
 		Result[0][1] = m[1][0];
 		Result[0][2] = m[2][0];
@@ -117,51 +117,51 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2(
-		const tvec2<T, P>& v1, 
-		const tvec2<T, P>& v2)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, Q> colMajor2(
+		const vec<2, T, Q>& v1,
+		const vec<2, T, Q>& v2)
 	{
-		return tmat2x2<T, P>(v1, v2);
+		return mat<2, 2, T, Q>(v1, v2);
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat2x2<T, P> colMajor2(
-		const tmat2x2<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, Q> colMajor2(
+		const mat<2, 2, T, Q>& m)
 	{
-		return tmat2x2<T, P>(m);
+		return mat<2, 2, T, Q>(m);
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3(
-		const tvec3<T, P>& v1, 
-		const tvec3<T, P>& v2, 
-		const tvec3<T, P>& v3)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> colMajor3(
+		const vec<3, T, Q>& v1,
+		const vec<3, T, Q>& v2,
+		const vec<3, T, Q>& v3)
 	{
-		return tmat3x3<T, P>(v1, v2, v3);
+		return mat<3, 3, T, Q>(v1, v2, v3);
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> colMajor3(
-		const tmat3x3<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> colMajor3(
+		const mat<3, 3, T, Q>& m)
 	{
-		return tmat3x3<T, P>(m);
+		return mat<3, 3, T, Q>(m);
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4(
-		const tvec4<T, P>& v1, 
-		const tvec4<T, P>& v2, 
-		const tvec4<T, P>& v3, 
-		const tvec4<T, P>& v4)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> colMajor4(
+		const vec<4, T, Q>& v1,
+		const vec<4, T, Q>& v2,
+		const vec<4, T, Q>& v3,
+		const vec<4, T, Q>& v4)
 	{
-		return tmat4x4<T, P>(v1, v2, v3, v4);
+		return mat<4, 4, T, Q>(v1, v2, v3, v4);
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> colMajor4(
-		const tmat4x4<T, P>& m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> colMajor4(
+		const mat<4, 4, T, Q>& m)
 	{
-		return tmat4x4<T, P>(m);
+		return mat<4, 4, T, Q>(m);
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_operation.hpp b/external/include/glm/gtx/matrix_operation.hpp
index 3192ae5..bce938b 100644
--- a/external/include/glm/gtx/matrix_operation.hpp
+++ b/external/include/glm/gtx/matrix_operation.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_matrix_operation GLM_GTX_matrix_operation
 /// @ingroup gtx
 ///
-/// @brief Build diagonal matrices from vectors.
+/// Include <glm/gtx/matrix_operation.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_operation.hpp> need to be included to use these functionalities.
+/// Build diagonal matrices from vectors.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_operation extension included")
 #endif
@@ -26,57 +30,57 @@ namespace glm
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x2<T, P> diagonal2x2(
-		tvec2<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 2, T, Q> diagonal2x2(
+		vec<2, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x3<T, P> diagonal2x3(
-		tvec2<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 3, T, Q> diagonal2x3(
+		vec<2, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat2x4<T, P> diagonal2x4(
-		tvec2<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<2, 4, T, Q> diagonal2x4(
+		vec<2, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x2<T, P> diagonal3x2(
-		tvec2<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 2, T, Q> diagonal3x2(
+		vec<2, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> diagonal3x3(
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> diagonal3x3(
+		vec<3, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x4<T, P> diagonal3x4(
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 4, T, Q> diagonal3x4(
+		vec<3, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x2<T, P> diagonal4x2(
-		tvec2<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 2, T, Q> diagonal4x2(
+		vec<2, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x3<T, P> diagonal4x3(
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 3, T, Q> diagonal4x3(
+		vec<3, T, Q> const& v);
 
 	//! Build a diagonal matrix.
 	//! From GLM_GTX_matrix_operation extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> diagonal4x4(
-		tvec4<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> diagonal4x4(
+		vec<4, T, Q> const& v);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_operation.inl b/external/include/glm/gtx/matrix_operation.inl
index 1553215..da1aab8 100644
--- a/external/include/glm/gtx/matrix_operation.inl
+++ b/external/include/glm/gtx/matrix_operation.inl
@@ -3,116 +3,116 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat2x2<T, P> diagonal2x2
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 2, T, Q> diagonal2x2
 	(
-		tvec2<T, P> const & v
+		vec<2, T, Q> const& v
 	)
 	{
-		tmat2x2<T, P> Result(static_cast<T>(1));
+		mat<2, 2, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat2x3<T, P> diagonal2x3
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 3, T, Q> diagonal2x3
 	(
-		tvec2<T, P> const & v
+		vec<2, T, Q> const& v
 	)
 	{
-		tmat2x3<T, P> Result(static_cast<T>(1));
+		mat<2, 3, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat2x4<T, P> diagonal2x4
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<2, 4, T, Q> diagonal2x4
 	(
-		tvec2<T, P> const & v
+		vec<2, T, Q> const& v
 	)
 	{
-		tmat2x4<T, P> Result(static_cast<T>(1));
+		mat<2, 4, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x2<T, P> diagonal3x2
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 2, T, Q> diagonal3x2
 	(
-		tvec2<T, P> const & v
+		vec<2, T, Q> const& v
 	)
 	{
-		tmat3x2<T, P> Result(static_cast<T>(1));
+		mat<3, 2, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> diagonal3x3
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> diagonal3x3
 	(
-		tvec3<T, P> const & v
+		vec<3, T, Q> const& v
 	)
 	{
-		tmat3x3<T, P> Result(static_cast<T>(1));
+		mat<3, 3, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		Result[2][2] = v[2];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x4<T, P> diagonal3x4
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 4, T, Q> diagonal3x4
 	(
-		tvec3<T, P> const & v
+		vec<3, T, Q> const& v
 	)
 	{
-		tmat3x4<T, P> Result(static_cast<T>(1));
+		mat<3, 4, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		Result[2][2] = v[2];
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> diagonal4x4
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> diagonal4x4
 	(
-		tvec4<T, P> const & v
+		vec<4, T, Q> const& v
 	)
 	{
-		tmat4x4<T, P> Result(static_cast<T>(1));
+		mat<4, 4, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		Result[2][2] = v[2];
 		Result[3][3] = v[3];
-		return Result;		
+		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x3<T, P> diagonal4x3
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 3, T, Q> diagonal4x3
 	(
-		tvec3<T, P> const & v
+		vec<3, T, Q> const& v
 	)
 	{
-		tmat4x3<T, P> Result(static_cast<T>(1));
+		mat<4, 3, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
 		Result[2][2] = v[2];
-		return Result;		
+		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x2<T, P> diagonal4x2
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 2, T, Q> diagonal4x2
 	(
-		tvec2<T, P> const & v
+		vec<2, T, Q> const& v
 	)
 	{
-		tmat4x2<T, P> Result(static_cast<T>(1));
+		mat<4, 2, T, Q> Result(static_cast<T>(1));
 		Result[0][0] = v[0];
 		Result[1][1] = v[1];
-		return Result;		
+		return Result;
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_query.hpp b/external/include/glm/gtx/matrix_query.hpp
index 2518274..4f7e855 100644
--- a/external/include/glm/gtx/matrix_query.hpp
+++ b/external/include/glm/gtx/matrix_query.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_matrix_query GLM_GTX_matrix_query
 /// @ingroup gtx
 ///
-/// @brief Query to evaluate matrix properties
+/// Include <glm/gtx/matrix_query.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_query.hpp> need to be included to use these functionalities.
+/// Query to evaluate matrix properties
 
 #pragma once
 
@@ -18,6 +18,10 @@
 #include "../gtx/vector_query.hpp"
 #include <limits>
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_query extension included")
 #endif
@@ -29,43 +33,43 @@ namespace glm
 
 	/// Return whether a matrix a null matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNull(tmat2x2<T, P> const & m, T const & epsilon);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNull(mat<2, 2, T, Q> const& m, T const& epsilon);
+
 	/// Return whether a matrix a null matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNull(tmat3x3<T, P> const & m, T const & epsilon);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNull(mat<3, 3, T, Q> const& m, T const& epsilon);
+
 	/// Return whether a matrix is a null matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNull(tmat4x4<T, P> const & m, T const & epsilon);
-			
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNull(mat<4, 4, T, Q> const& m, T const& epsilon);
+
 	/// Return whether a matrix is an identity matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P, template <typename, precision> class matType>
-	GLM_FUNC_DECL bool isIdentity(matType<T, P> const & m, T const & epsilon);
+	template<length_t C, length_t R, typename T, qualifier Q, template<length_t, length_t, typename, qualifier> class matType>
+	GLM_FUNC_DECL bool isIdentity(matType<C, R, T, Q> const& m, T const& epsilon);
 
 	/// Return whether a matrix is a normalized matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNormalized(mat<2, 2, T, Q> const& m, T const& epsilon);
 
 	/// Return whether a matrix is a normalized matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNormalized(mat<3, 3, T, Q> const& m, T const& epsilon);
 
 	/// Return whether a matrix is a normalized matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P>
-	GLM_FUNC_DECL bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNormalized(mat<4, 4, T, Q> const& m, T const& epsilon);
 
 	/// Return whether a matrix is an orthonormalized matrix.
 	/// From GLM_GTX_matrix_query extension.
-	template<typename T, precision P, template <typename, precision> class matType>
-	GLM_FUNC_DECL bool isOrthogonal(matType<T, P> const & m, T const & epsilon);
+	template<length_t C, length_t R, typename T, qualifier Q, template<length_t, length_t, typename, qualifier> class matType>
+	GLM_FUNC_DECL bool isOrthogonal(matType<C, R, T, Q> const& m, T const& epsilon);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/matrix_query.inl b/external/include/glm/gtx/matrix_query.inl
index 491b774..38b520f 100644
--- a/external/include/glm/gtx/matrix_query.inl
+++ b/external/include/glm/gtx/matrix_query.inl
@@ -3,8 +3,8 @@
 
 namespace glm
 {
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNull(tmat2x2<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNull(mat<2, 2, T, Q> const& m, T const& epsilon)
 	{
 		bool result = true;
 		for(length_t i = 0; result && i < m.length() ; ++i)
@@ -12,8 +12,8 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNull(tmat3x3<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNull(mat<3, 3, T, Q> const& m, T const& epsilon)
 	{
 		bool result = true;
 		for(length_t i = 0; result && i < m.length() ; ++i)
@@ -21,8 +21,8 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNull(tmat4x4<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNull(mat<4, 4, T, Q> const& m, T const& epsilon)
 	{
 		bool result = true;
 		for(length_t i = 0; result && i < m.length() ; ++i)
@@ -30,8 +30,8 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P, template <typename, precision> class matType>
-	GLM_FUNC_QUALIFIER bool isIdentity(matType<T, P> const & m, T const & epsilon)
+	template<length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isIdentity(mat<C, R, T, Q> const& m, T const& epsilon)
 	{
 		bool result = true;
 		for(length_t i = 0; result && i < m[0].length() ; ++i)
@@ -46,15 +46,15 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNormalized(tmat2x2<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNormalized(mat<2, 2, T, Q> const& m, T const& epsilon)
 	{
 		bool result(true);
 		for(length_t i = 0; result && i < m.length(); ++i)
 			result = isNormalized(m[i], epsilon);
 		for(length_t i = 0; result && i < m.length(); ++i)
 		{
-			typename tmat2x2<T, P>::col_type v;
+			typename mat<2, 2, T, Q>::col_type v;
 			for(length_t j = 0; j < m.length(); ++j)
 				v[j] = m[j][i];
 			result = isNormalized(v, epsilon);
@@ -62,15 +62,15 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNormalized(tmat3x3<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNormalized(mat<3, 3, T, Q> const& m, T const& epsilon)
 	{
 		bool result(true);
 		for(length_t i = 0; result && i < m.length(); ++i)
 			result = isNormalized(m[i], epsilon);
 		for(length_t i = 0; result && i < m.length(); ++i)
 		{
-			typename tmat3x3<T, P>::col_type v;
+			typename mat<3, 3, T, Q>::col_type v;
 			for(length_t j = 0; j < m.length(); ++j)
 				v[j] = m[j][i];
 			result = isNormalized(v, epsilon);
@@ -78,15 +78,15 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P>
-	GLM_FUNC_QUALIFIER bool isNormalized(tmat4x4<T, P> const & m, T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNormalized(mat<4, 4, T, Q> const& m, T const& epsilon)
 	{
 		bool result(true);
 		for(length_t i = 0; result && i < m.length(); ++i)
 			result = isNormalized(m[i], epsilon);
 		for(length_t i = 0; result && i < m.length(); ++i)
 		{
-			typename tmat4x4<T, P>::col_type v;
+			typename mat<4, 4, T, Q>::col_type v;
 			for(length_t j = 0; j < m.length(); ++j)
 				v[j] = m[j][i];
 			result = isNormalized(v, epsilon);
@@ -94,17 +94,17 @@ namespace glm
 		return result;
 	}
 
-	template<typename T, precision P, template <typename, precision> class matType>
-	GLM_FUNC_QUALIFIER bool isOrthogonal(matType<T, P> const & m, T const & epsilon)
+	template<length_t C, length_t R, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isOrthogonal(mat<C, R, T, Q> const& m, T const& epsilon)
 	{
-		bool result(true);
+		bool result = true;
 		for(length_t i(0); result && i < m.length() - 1; ++i)
 		for(length_t j(i + 1); result && j < m.length(); ++j)
 			result = areOrthogonal(m[i], m[j], epsilon);
 
 		if(result)
 		{
-			matType<T, P> tmp = transpose(m);
+			mat<C, R, T, Q> tmp = transpose(m);
 			for(length_t i(0); result && i < m.length() - 1 ; ++i)
 			for(length_t j(i + 1); result && j < m.length(); ++j)
 				result = areOrthogonal(tmp[i], tmp[j], epsilon);
diff --git a/external/include/glm/gtx/matrix_transform_2d.hpp b/external/include/glm/gtx/matrix_transform_2d.hpp
index 91f4834..56c9bb8 100644
--- a/external/include/glm/gtx/matrix_transform_2d.hpp
+++ b/external/include/glm/gtx/matrix_transform_2d.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_matrix_transform_2d GLM_GTX_matrix_transform_2d
 /// @ingroup gtx
 ///
-/// @brief Defines functions that generate common 2d transformation matrices.
+/// Include <glm/gtx/matrix_transform_2d.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/matrix_transform_2d.hpp> need to be included to use these functionalities.
+/// Defines functions that generate common 2d transformation matrices.
 
 #pragma once
 
@@ -17,6 +17,9 @@
 #include "../mat3x3.hpp"
 #include "../vec2.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
 
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_matrix_transform_2d extension included")
@@ -26,50 +29,50 @@ namespace glm
 {
 	/// @addtogroup gtx_matrix_transform_2d
 	/// @{
-	
+
 	/// Builds a translation 3 * 3 matrix created from a vector of 2 components.
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
-	/// @param v Coordinates of a translation vector.		
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> translate(
-		tmat3x3<T, P> const & m,
-		tvec2<T, P> const & v);
+	/// @param v Coordinates of a translation vector.
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> translate(
+		mat<3, 3, T, Q> const& m,
+		vec<2, T, Q> const& v);
 
-	/// Builds a rotation 3 * 3 matrix created from an angle. 
+	/// Builds a rotation 3 * 3 matrix created from an angle.
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
-	/// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is defined or degrees otherwise.
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate(
-		tmat3x3<T, P> const & m,
+	/// @param angle Rotation angle expressed in radians.
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rotate(
+		mat<3, 3, T, Q> const& m,
 		T angle);
 
 	/// Builds a scale 3 * 3 matrix created from a vector of 2 components.
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
-	/// @param v Coordinates of a scale vector.		
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> scale(
-		tmat3x3<T, P> const & m,
-		tvec2<T, P> const & v);
+	/// @param v Coordinates of a scale vector.
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> scale(
+		mat<3, 3, T, Q> const& m,
+		vec<2, T, Q> const& v);
 
-	/// Builds an horizontal (parallel to the x axis) shear 3 * 3 matrix. 
+	/// Builds an horizontal (parallel to the x axis) shear 3 * 3 matrix.
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param y Shear factor.
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX(
-		tmat3x3<T, P> const & m,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearX(
+		mat<3, 3, T, Q> const& m,
 		T y);
 
-	/// Builds a vertical (parallel to the y axis) shear 3 * 3 matrix. 
+	/// Builds a vertical (parallel to the y axis) shear 3 * 3 matrix.
 	///
 	/// @param m Input matrix multiplied by this translation matrix.
 	/// @param x Shear factor.
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY(
-		tmat3x3<T, P> const & m,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearY(
+		mat<3, 3, T, Q> const& m,
 		T x);
 
 	/// @}
diff --git a/external/include/glm/gtx/matrix_transform_2d.inl b/external/include/glm/gtx/matrix_transform_2d.inl
index bea5670..9ae83d9 100644
--- a/external/include/glm/gtx/matrix_transform_2d.inl
+++ b/external/include/glm/gtx/matrix_transform_2d.inl
@@ -6,62 +6,62 @@
 
 namespace glm
 {
-	
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> translate(
-		tmat3x3<T, P> const & m,
-		tvec2<T, P> const & v)
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> translate(
+		mat<3, 3, T, Q> const& m,
+		vec<2, T, Q> const& v)
 	{
-		tmat3x3<T, P> Result(m);
+		mat<3, 3, T, Q> Result(m);
 		Result[2] = m[0] * v[0] + m[1] * v[1] + m[2];
 		return Result;
 	}
 
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> rotate(
-		tmat3x3<T, P> const & m,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> rotate(
+		mat<3, 3, T, Q> const& m,
 		T angle)
 	{
 		T const a = angle;
 		T const c = cos(a);
 		T const s = sin(a);
 
-		tmat3x3<T, P> Result(uninitialize);
+		mat<3, 3, T, Q> Result;
 		Result[0] = m[0] * c + m[1] * s;
 		Result[1] = m[0] * -s + m[1] * c;
 		Result[2] = m[2];
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> scale(
-		tmat3x3<T, P> const & m,
-		tvec2<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> scale(
+		mat<3, 3, T, Q> const& m,
+		vec<2, T, Q> const& v)
 	{
-		tmat3x3<T, P> Result(uninitialize);
+		mat<3, 3, T, Q> Result;
 		Result[0] = m[0] * v[0];
 		Result[1] = m[1] * v[1];
 		Result[2] = m[2];
 		return Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX(
-		tmat3x3<T, P> const & m,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearX(
+		mat<3, 3, T, Q> const& m,
 		T y)
 	{
-		tmat3x3<T, P> Result(1);
+		mat<3, 3, T, Q> Result(1);
 		Result[0][1] = y;
 		return m * Result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY(
-		tmat3x3<T, P> const & m,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearY(
+		mat<3, 3, T, Q> const& m,
 		T x)
 	{
-		tmat3x3<T, P> Result(1);
+		mat<3, 3, T, Q> Result(1);
 		Result[1][0] = x;
 		return m * Result;
 	}
diff --git a/external/include/glm/gtx/mixed_product.hpp b/external/include/glm/gtx/mixed_product.hpp
index 65861f7..f1ed6e0 100644
--- a/external/include/glm/gtx/mixed_product.hpp
+++ b/external/include/glm/gtx/mixed_product.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_mixed_product GLM_GTX_mixed_producte
 /// @ingroup gtx
 ///
-/// @brief Mixed product of 3 vectors.
+/// Include <glm/gtx/mixed_product.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/mixed_product.hpp> need to be included to use these functionalities.
+/// Mixed product of 3 vectors.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_mixed_product extension included")
 #endif
@@ -25,11 +29,11 @@ namespace glm
 	/// @{
 
 	/// @brief Mixed product of 3 vectors (from GLM_GTX_mixed_product extension)
-	template <typename T, precision P> 
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T mixedProduct(
-		tvec3<T, P> const & v1, 
-		tvec3<T, P> const & v2, 
-		tvec3<T, P> const & v3);
+		vec<3, T, Q> const& v1,
+		vec<3, T, Q> const& v2,
+		vec<3, T, Q> const& v3);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/mixed_product.inl b/external/include/glm/gtx/mixed_product.inl
index a6ede59..01e94ec 100644
--- a/external/include/glm/gtx/mixed_product.inl
+++ b/external/include/glm/gtx/mixed_product.inl
@@ -3,12 +3,12 @@
 
 namespace glm
 {
-	template <typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_QUALIFIER T mixedProduct
 	(
-		tvec3<T, P> const & v1,
-		tvec3<T, P> const & v2,
-		tvec3<T, P> const & v3
+		vec<3, T, Q> const& v1,
+		vec<3, T, Q> const& v2,
+		vec<3, T, Q> const& v3
 	)
 	{
 		return dot(cross(v1, v2), v3);
diff --git a/external/include/glm/gtx/norm.hpp b/external/include/glm/gtx/norm.hpp
index b3cb528..2f106d8 100644
--- a/external/include/glm/gtx/norm.hpp
+++ b/external/include/glm/gtx/norm.hpp
@@ -7,16 +7,20 @@
 /// @defgroup gtx_norm GLM_GTX_norm
 /// @ingroup gtx
 ///
-/// @brief Various ways to compute vector norms.
-/// 
-/// <glm/gtx/norm.hpp> need to be included to use these functionalities.
+/// Include <glm/gtx/norm.hpp> to use the features of this extension.
+///
+/// Various ways to compute vector norms.
 
 #pragma once
 
 // Dependency:
-#include "../detail/func_geometric.hpp"
+#include "../geometric.hpp"
 #include "../gtx/quaternion.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_norm extension included")
 #endif
@@ -28,57 +32,43 @@ namespace glm
 
 	/// Returns the squared length of x.
 	/// From GLM_GTX_norm extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T length2(
-		vecType<T, P> const & x);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T length2(vec<L, T, Q> const& x);
 
 	/// Returns the squared distance between p0 and p1, i.e., length2(p0 - p1).
 	/// From GLM_GTX_norm extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T distance2(
-		vecType<T, P> const & p0,
-		vecType<T, P> const & p1);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T distance2(vec<L, T, Q> const& p0, vec<L, T, Q> const& p1);
 
 	//! Returns the L1 norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T l1Norm(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T l1Norm(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
+
 	//! Returns the L1 norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T l1Norm(
-		tvec3<T, P> const & v);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T l1Norm(vec<3, T, Q> const& v);
+
 	//! Returns the L2 norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T l2Norm(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T l2Norm(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
+
 	//! Returns the L2 norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T l2Norm(
-		tvec3<T, P> const & x);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T l2Norm(vec<3, T, Q> const& x);
+
 	//! Returns the L norm between x and y.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T lxNorm(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		unsigned int Depth);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T lxNorm(vec<3, T, Q> const& x, vec<3, T, Q> const& y, unsigned int Depth);
 
 	//! Returns the L norm of v.
 	//! From GLM_GTX_norm extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T lxNorm(
-		tvec3<T, P> const & x,
-		unsigned int Depth);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T lxNorm(vec<3, T, Q> const& x, unsigned int Depth);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/norm.inl b/external/include/glm/gtx/norm.inl
index 20954ec..7bd64e8 100644
--- a/external/include/glm/gtx/norm.inl
+++ b/external/include/glm/gtx/norm.inl
@@ -1,104 +1,82 @@
 /// @ref gtx_norm
 /// @file glm/gtx/norm.inl
 
-#include "../detail/precision.hpp"
+#include "../detail/qualifier.hpp"
 
 namespace glm{
 namespace detail
 {
-	template <template <typename, precision> class vecType, typename T, precision P, bool Aligned>
+	template<length_t L, typename T, qualifier Q, bool Aligned>
 	struct compute_length2
 	{
-		GLM_FUNC_QUALIFIER static T call(vecType<T, P> const & v)
+		GLM_FUNC_QUALIFIER static T call(vec<L, T, Q> const& v)
 		{
 			return dot(v, v);
 		}
 	};
 }//namespace detail
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType length2(genType x)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'length2' accepts only floating-point inputs");
 		return x * x;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T length2(vecType<T, P> const & v)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T length2(vec<L, T, Q> const& v)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'length2' accepts only floating-point inputs");
-		return detail::compute_length2<vecType, T, P, detail::is_aligned<P>::value>::call(v);
+		return detail::compute_length2<L, T, Q, detail::is_aligned<Q>::value>::call(v);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER T distance2(T p0, T p1)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs");
 		return length2(p1 - p0);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T distance2(vecType<T, P> const & p0, vecType<T, P> const & p1)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T distance2(vec<L, T, Q> const& p0, vec<L, T, Q> const& p1)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'distance2' accepts only floating-point inputs");
 		return length2(p1 - p0);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T l1Norm
-	(
-		tvec3<T, P> const & a,
-		tvec3<T, P> const & b
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T l1Norm(vec<3, T, Q> const& a, vec<3, T, Q> const& b)
 	{
 		return abs(b.x - a.x) + abs(b.y - a.y) + abs(b.z - a.z);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T l1Norm
-	(
-		tvec3<T, P> const & v
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T l1Norm(vec<3, T, Q> const& v)
 	{
 		return abs(v.x) + abs(v.y) + abs(v.z);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T l2Norm
-	(
-		tvec3<T, P> const & a,
-		tvec3<T, P> const & b
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T l2Norm(vec<3, T, Q> const& a, vec<3, T, Q> const& b
 	)
 	{
 		return length(b - a);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T l2Norm
-	(
-		tvec3<T, P> const & v
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T l2Norm(vec<3, T, Q> const& v)
 	{
 		return length(v);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T lxNorm
-	(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		unsigned int Depth
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T lxNorm(vec<3, T, Q> const& x, vec<3, T, Q> const& y, unsigned int Depth)
 	{
 		return pow(pow(y.x - x.x, T(Depth)) + pow(y.y - x.y, T(Depth)) + pow(y.z - x.z, T(Depth)), T(1) / T(Depth));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T lxNorm
-	(
-		tvec3<T, P> const & v,
-		unsigned int Depth
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T lxNorm(vec<3, T, Q> const& v, unsigned int Depth)
 	{
 		return pow(pow(v.x, T(Depth)) + pow(v.y, T(Depth)) + pow(v.z, T(Depth)), T(1) / T(Depth));
 	}
diff --git a/external/include/glm/gtx/normal.hpp b/external/include/glm/gtx/normal.hpp
index 2e0044e..03dbffe 100644
--- a/external/include/glm/gtx/normal.hpp
+++ b/external/include/glm/gtx/normal.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_normal GLM_GTX_normal
 /// @ingroup gtx
 ///
-/// @brief Compute the normal of a triangle.
+/// Include <glm/gtx/normal.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/normal.hpp> need to be included to use these functionalities.
+/// Compute the normal of a triangle.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_normal extension included")
 #endif
@@ -25,13 +29,11 @@ namespace glm
 	/// @addtogroup gtx_normal
 	/// @{
 
-	//! Computes triangle normal from triangle points. 
-	//! From GLM_GTX_normal extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tvec3<T, P> triangleNormal(
-		tvec3<T, P> const & p1, 
-		tvec3<T, P> const & p2, 
-		tvec3<T, P> const & p3);
+	/// Computes triangle normal from triangle points.
+	///
+	/// @see gtx_normal
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> triangleNormal(vec<3, T, Q> const& p1, vec<3, T, Q> const& p2, vec<3, T, Q> const& p3);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/normal.inl b/external/include/glm/gtx/normal.inl
index e442317..bcd74e5 100644
--- a/external/include/glm/gtx/normal.inl
+++ b/external/include/glm/gtx/normal.inl
@@ -3,12 +3,12 @@
 
 namespace glm
 {
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tvec3<T, P> triangleNormal
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> triangleNormal
 	(
-		tvec3<T, P> const & p1, 
-		tvec3<T, P> const & p2, 
-		tvec3<T, P> const & p3
+		vec<3, T, Q> const& p1,
+		vec<3, T, Q> const& p2,
+		vec<3, T, Q> const& p3
 	)
 	{
 		return normalize(cross(p1 - p2, p1 - p3));
diff --git a/external/include/glm/gtx/normalize_dot.hpp b/external/include/glm/gtx/normalize_dot.hpp
index de650d3..86048e7 100644
--- a/external/include/glm/gtx/normalize_dot.hpp
+++ b/external/include/glm/gtx/normalize_dot.hpp
@@ -7,15 +7,19 @@
 /// @defgroup gtx_normalize_dot GLM_GTX_normalize_dot
 /// @ingroup gtx
 ///
-/// @brief Dot product of vectors that need to be normalize with a single square root.
+/// Include <glm/gtx/normalized_dot.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/normalized_dot.hpp> need to be included to use these functionalities.
+/// Dot product of vectors that need to be normalize with a single square root.
 
 #pragma once
 
 // Dependency:
 #include "../gtx/fast_square_root.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_normalize_dot extension included")
 #endif
@@ -29,15 +33,15 @@ namespace glm
 	/// It's faster that dot(normalize(x), normalize(y)).
 	///
 	/// @see gtx_normalize_dot extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T normalizeDot(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
 
 	/// Normalize parameters and returns the dot product of x and y.
 	/// Faster that dot(fastNormalize(x), fastNormalize(y)).
 	///
 	/// @see gtx_normalize_dot extension.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T fastNormalizeDot(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/normalize_dot.inl b/external/include/glm/gtx/normalize_dot.inl
index 0d01ffe..8b88860 100644
--- a/external/include/glm/gtx/normalize_dot.inl
+++ b/external/include/glm/gtx/normalize_dot.inl
@@ -3,14 +3,14 @@
 
 namespace glm
 {
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T normalizeDot(vecType<T, P> const & x, vecType<T, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T normalizeDot(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
 		return glm::dot(x, y) * glm::inversesqrt(glm::dot(x, x) * glm::dot(y, y));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER T fastNormalizeDot(vecType<T, P> const & x, vecType<T, P> const & y)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T fastNormalizeDot(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
 		return glm::dot(x, y) * glm::fastInverseSqrt(glm::dot(x, x) * glm::dot(y, y));
 	}
diff --git a/external/include/glm/gtx/number_precision.hpp b/external/include/glm/gtx/number_precision.hpp
index 736d035..3f4bee1 100644
--- a/external/include/glm/gtx/number_precision.hpp
+++ b/external/include/glm/gtx/number_precision.hpp
@@ -8,9 +8,9 @@
 /// @defgroup gtx_number_precision GLM_GTX_number_precision
 /// @ingroup gtx
 ///
-/// @brief Defined size types.
+/// Include <glm/gtx/number_precision.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/number_precision.hpp> need to be included to use these functionalities.
+/// Defined size types.
 
 #pragma once
 
@@ -18,6 +18,10 @@
 #include "../glm.hpp"
 #include "../gtc/type_precision.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_number_precision extension included")
 #endif
@@ -26,7 +30,7 @@ namespace glm{
 namespace gtx
 {
 	/////////////////////////////
-	// Unsigned int vector types 
+	// Unsigned int vector types
 
 	/// @addtogroup gtx_number_precision
 	/// @{
@@ -37,18 +41,18 @@ namespace gtx
 	typedef u64			u64vec1;    //!< \brief 64bit unsigned integer scalar. (from GLM_GTX_number_precision extension)
 
 	//////////////////////
-	// Float vector types 
+	// Float vector types
 
-	typedef f32			f32vec1;    //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-	typedef f64			f64vec1;    //!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f32			f32vec1;    //!< \brief Single-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f64			f64vec1;    //!< \brief Single-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
 
 	//////////////////////
-	// Float matrix types 
+	// Float matrix types
 
-	typedef f32			f32mat1;	//!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-	typedef f32			f32mat1x1;	//!< \brief Single-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-	typedef f64			f64mat1;	//!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension)
-	typedef f64			f64mat1x1;	//!< \brief Double-precision floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f32			f32mat1;	//!< \brief Single-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f32			f32mat1x1;	//!< \brief Single-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f64			f64mat1;	//!< \brief Double-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
+	typedef f64			f64mat1x1;	//!< \brief Double-qualifier floating-point scalar. (from GLM_GTX_number_precision extension)
 
 	/// @}
 }//namespace gtx
diff --git a/external/include/glm/gtx/optimum_pow.hpp b/external/include/glm/gtx/optimum_pow.hpp
index e9510c4..eb09f1c 100644
--- a/external/include/glm/gtx/optimum_pow.hpp
+++ b/external/include/glm/gtx/optimum_pow.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_optimum_pow GLM_GTX_optimum_pow
 /// @ingroup gtx
 ///
-/// @brief Integer exponentiation of power functions.
+/// Include <glm/gtx/optimum_pow.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/optimum_pow.hpp> need to be included to use these functionalities.
+/// Integer exponentiation of power functions.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_optimum_pow extension included")
 #endif
@@ -28,20 +32,20 @@ namespace gtx
 	/// Returns x raised to the power of 2.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
-	GLM_FUNC_DECL genType pow2(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL genType pow2(genType const& x);
 
 	/// Returns x raised to the power of 3.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
-	GLM_FUNC_DECL genType pow3(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL genType pow3(genType const& x);
 
 	/// Returns x raised to the power of 4.
 	///
 	/// @see gtx_optimum_pow
-	template <typename genType>
-	GLM_FUNC_DECL genType pow4(genType const & x);
+	template<typename genType>
+	GLM_FUNC_DECL genType pow4(genType const& x);
 
 	/// @}
 }//namespace gtx
diff --git a/external/include/glm/gtx/optimum_pow.inl b/external/include/glm/gtx/optimum_pow.inl
index 2216a74..78b729f 100644
--- a/external/include/glm/gtx/optimum_pow.inl
+++ b/external/include/glm/gtx/optimum_pow.inl
@@ -3,20 +3,20 @@
 
 namespace glm
 {
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType pow2(genType const & x)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType pow2(genType const& x)
 	{
 		return x * x;
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType pow3(genType const & x)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType pow3(genType const& x)
 	{
 		return x * x * x;
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType pow4(genType const & x)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType pow4(genType const& x)
 	{
 		return (x * x) * (x * x);
 	}
diff --git a/external/include/glm/gtx/orthonormalize.hpp b/external/include/glm/gtx/orthonormalize.hpp
index 4bea449..48b157f 100644
--- a/external/include/glm/gtx/orthonormalize.hpp
+++ b/external/include/glm/gtx/orthonormalize.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_orthonormalize GLM_GTX_orthonormalize
 /// @ingroup gtx
 ///
-/// @brief Orthonormalize matrices.
+/// Include <glm/gtx/orthonormalize.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/orthonormalize.hpp> need to be included to use these functionalities.
+/// Orthonormalize matrices.
 
 #pragma once
 
@@ -18,6 +18,10 @@
 #include "../mat3x3.hpp"
 #include "../geometric.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_orthonormalize extension included")
 #endif
@@ -30,14 +34,14 @@ namespace glm
 	/// Returns the orthonormalized matrix of m.
 	///
 	/// @see gtx_orthonormalize
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> orthonormalize(mat<3, 3, T, Q> const& m);
+
 	/// Orthonormalizes x according y.
 	///
 	/// @see gtx_orthonormalize
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> orthonormalize(vec<3, T, Q> const& x, vec<3, T, Q> const& y);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/orthonormalize.inl b/external/include/glm/gtx/orthonormalize.inl
index 4796384..c65db11 100644
--- a/external/include/glm/gtx/orthonormalize.inl
+++ b/external/include/glm/gtx/orthonormalize.inl
@@ -3,10 +3,10 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> orthonormalize(tmat3x3<T, P> const & m)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> orthonormalize(mat<3, 3, T, Q> const& m)
 	{
-		tmat3x3<T, P> r = m;
+		mat<3, 3, T, Q> r = m;
 
 		r[0] = normalize(r[0]);
 
@@ -22,8 +22,8 @@ namespace glm
 		return r;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tvec3<T, P> orthonormalize(tvec3<T, P> const & x, tvec3<T, P> const & y)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> orthonormalize(vec<3, T, Q> const& x, vec<3, T, Q> const& y)
 	{
 		return normalize(x - y * dot(y, x));
 	}
diff --git a/external/include/glm/gtx/perpendicular.hpp b/external/include/glm/gtx/perpendicular.hpp
index 8b6260a..35601ac 100644
--- a/external/include/glm/gtx/perpendicular.hpp
+++ b/external/include/glm/gtx/perpendicular.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_perpendicular GLM_GTX_perpendicular
 /// @ingroup gtx
 ///
-/// @brief Perpendicular of a vector from other one
+/// Include <glm/gtx/perpendicular.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/perpendicular.hpp> need to be included to use these functionalities.
+/// Perpendicular of a vector from other one
 
 #pragma once
 
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/projection.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_perpendicular extension included")
 #endif
@@ -28,10 +32,8 @@ namespace glm
 
 	//! Projects x a perpendicular axis of Normal.
 	//! From GLM_GTX_perpendicular extension.
-	template <typename vecType> 
-	GLM_FUNC_DECL vecType perp(
-		vecType const & x, 
-		vecType const & Normal);
+	template<typename genType>
+	GLM_FUNC_DECL genType perp(genType const& x, genType const& Normal);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/perpendicular.inl b/external/include/glm/gtx/perpendicular.inl
index 08a7a81..3b99eed 100644
--- a/external/include/glm/gtx/perpendicular.inl
+++ b/external/include/glm/gtx/perpendicular.inl
@@ -3,12 +3,8 @@
 
 namespace glm
 {
-	template <typename vecType> 
-	GLM_FUNC_QUALIFIER vecType perp
-	(
-		vecType const & x, 
-		vecType const & Normal
-	)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType perp(genType const& x, genType const& Normal)
 	{
 		return x - proj(x, Normal);
 	}
diff --git a/external/include/glm/gtx/polar_coordinates.hpp b/external/include/glm/gtx/polar_coordinates.hpp
index c647c0f..b8421db 100644
--- a/external/include/glm/gtx/polar_coordinates.hpp
+++ b/external/include/glm/gtx/polar_coordinates.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_polar_coordinates GLM_GTX_polar_coordinates
 /// @ingroup gtx
 ///
-/// @brief Conversion from Euclidean space to polar space and revert.
+/// Include <glm/gtx/polar_coordinates.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/polar_coordinates.hpp> need to be included to use these functionalities.
+/// Conversion from Euclidean space to polar space and revert.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_polar_coordinates extension included")
 #endif
@@ -27,16 +31,16 @@ namespace glm
 	/// Convert Euclidean to Polar coordinates, x is the xz distance, y, the latitude and z the longitude.
 	///
 	/// @see gtx_polar_coordinates
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> polar(
-		tvec3<T, P> const & euclidean);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> polar(
+		vec<3, T, Q> const& euclidean);
 
 	/// Convert Polar to Euclidean coordinates.
 	///
 	/// @see gtx_polar_coordinates
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> euclidean(
-		tvec2<T, P> const & polar);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> euclidean(
+		vec<2, T, Q> const& polar);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/polar_coordinates.inl b/external/include/glm/gtx/polar_coordinates.inl
index afc9d2b..cd1f357 100644
--- a/external/include/glm/gtx/polar_coordinates.inl
+++ b/external/include/glm/gtx/polar_coordinates.inl
@@ -3,32 +3,32 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> polar
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> polar
 	(
-		tvec3<T, P> const & euclidean
+		vec<3, T, Q> const& euclidean
 	)
 	{
 		T const Length(length(euclidean));
-		tvec3<T, P> const tmp(euclidean / Length);
+		vec<3, T, Q> const tmp(euclidean / Length);
 		T const xz_dist(sqrt(tmp.x * tmp.x + tmp.z * tmp.z));
 
-		return tvec3<T, P>(
+		return vec<3, T, Q>(
 			asin(tmp.y),	// latitude
 			atan(tmp.x, tmp.z),		// longitude
 			xz_dist);				// xz distance
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> euclidean
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> euclidean
 	(
-		tvec2<T, P> const & polar
+		vec<2, T, Q> const& polar
 	)
 	{
 		T const latitude(polar.x);
 		T const longitude(polar.y);
 
-		return tvec3<T, P>(
+		return vec<3, T, Q>(
 			cos(latitude) * sin(longitude),
 			sin(latitude),
 			cos(latitude) * cos(longitude));
diff --git a/external/include/glm/gtx/projection.hpp b/external/include/glm/gtx/projection.hpp
index fcddae8..9a24abf 100644
--- a/external/include/glm/gtx/projection.hpp
+++ b/external/include/glm/gtx/projection.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_projection GLM_GTX_projection
 /// @ingroup gtx
 ///
-/// @brief Projection of a vector to other one
+/// Include <glm/gtx/projection.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/projection.hpp> need to be included to use these functionalities.
+/// Projection of a vector to other one
 
 #pragma once
 
 // Dependency:
 #include "../geometric.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_projection extension included")
 #endif
@@ -27,8 +31,8 @@ namespace glm
 	/// Projects x on Normal.
 	///
 	/// @see gtx_projection
-	template <typename vecType>
-	GLM_FUNC_DECL vecType proj(vecType const & x, vecType const & Normal);
+	template<typename genType>
+	GLM_FUNC_DECL genType proj(genType const& x, genType const& Normal);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/projection.inl b/external/include/glm/gtx/projection.inl
index d21fe83..90950f8 100644
--- a/external/include/glm/gtx/projection.inl
+++ b/external/include/glm/gtx/projection.inl
@@ -3,8 +3,8 @@
 
 namespace glm
 {
-	template <typename vecType>
-	GLM_FUNC_QUALIFIER vecType proj(vecType const & x, vecType const & Normal)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType proj(genType const& x, genType const& Normal)
 	{
 		return glm::dot(x, Normal) / glm::dot(Normal, Normal) * Normal;
 	}
diff --git a/external/include/glm/gtx/quaternion.hpp b/external/include/glm/gtx/quaternion.hpp
index 674d7e7..7310d08 100644
--- a/external/include/glm/gtx/quaternion.hpp
+++ b/external/include/glm/gtx/quaternion.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_quaternion GLM_GTX_quaternion
 /// @ingroup gtx
 ///
-/// @brief Extented quaternion types and functions
+/// Include <glm/gtx/quaternion.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/quaternion.hpp> need to be included to use these functionalities.
+/// Extented quaternion types and functions
 
 #pragma once
 
@@ -19,6 +19,10 @@
 #include "../gtc/quaternion.hpp"
 #include "../gtx/norm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_quaternion extension included")
 #endif
@@ -28,156 +32,189 @@ namespace glm
 	/// @addtogroup gtx_quaternion
 	/// @{
 
+	/// Create an identity quaternion.
+	///
+	/// @see gtx_quaternion
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> quat_identity();
+
 	/// Compute a cross product between a quaternion and a vector.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> cross(
-		tquat<T, P> const & q,
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> cross(
+		tquat<T, Q> const& q,
+		vec<3, T, Q> const& v);
 
 	//! Compute a cross product between a vector and a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> cross(
-		tvec3<T, P> const & v,
-		tquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> cross(
+		vec<3, T, Q> const& v,
+		tquat<T, Q> const& q);
 
-	//! Compute a point on a path according squad equation. 
+	//! Compute a point on a path according squad equation.
 	//! q1 and q2 are control points; s1 and s2 are intermediate control points.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> squad(
-		tquat<T, P> const & q1,
-		tquat<T, P> const & q2,
-		tquat<T, P> const & s1,
-		tquat<T, P> const & s2,
-		T const & h);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> squad(
+		tquat<T, Q> const& q1,
+		tquat<T, Q> const& q2,
+		tquat<T, Q> const& s1,
+		tquat<T, Q> const& s2,
+		T const& h);
 
 	//! Returns an intermediate control point for squad interpolation.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> intermediate(
-		tquat<T, P> const & prev,
-		tquat<T, P> const & curr,
-		tquat<T, P> const & next);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> intermediate(
+		tquat<T, Q> const& prev,
+		tquat<T, Q> const& curr,
+		tquat<T, Q> const& next);
 
 	//! Returns a exp of a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> exp(
-		tquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> exp(
+		tquat<T, Q> const& q);
 
 	//! Returns a log of a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> log(
-		tquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> log(
+		tquat<T, Q> const& q);
 
 	/// Returns x raised to the y power.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> pow(
-		tquat<T, P> const & x,
-		T const & y);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> pow(
+		tquat<T, Q> const& x,
+		T const& y);
 
 	//! Returns quarternion square root.
 	///
 	/// @see gtx_quaternion
-	//template<typename T, precision P>
-	//tquat<T, P> sqrt(
-	//	tquat<T, P> const & q);
+	//template<typename T, qualifier Q>
+	//tquat<T, Q> sqrt(
+	//	tquat<T, Q> const& q);
 
 	//! Rotates a 3 components vector by a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rotate(
-		tquat<T, P> const & q,
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rotate(
+		tquat<T, Q> const& q,
+		vec<3, T, Q> const& v);
 
 	/// Rotates a 4 components vector by a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> rotate(
-		tquat<T, P> const & q,
-		tvec4<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> rotate(
+		tquat<T, Q> const& q,
+		vec<4, T, Q> const& v);
 
 	/// Extract the real component of a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
+	template<typename T, qualifier Q>
 	GLM_FUNC_DECL T extractRealComponent(
-		tquat<T, P> const & q);
+		tquat<T, Q> const& q);
 
 	/// Converts a quaternion to a 3 * 3 matrix.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> toMat3(
-		tquat<T, P> const & x){return mat3_cast(x);}
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> toMat3(
+		tquat<T, Q> const& x){return mat3_cast(x);}
 
 	/// Converts a quaternion to a 4 * 4 matrix.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> toMat4(
-		tquat<T, P> const & x){return mat4_cast(x);}
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> toMat4(
+		tquat<T, Q> const& x){return mat4_cast(x);}
 
 	/// Converts a 3 * 3 matrix to a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> toQuat(
-		tmat3x3<T, P> const & x){return quat_cast(x);}
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> toQuat(
+		mat<3, 3, T, Q> const& x){return quat_cast(x);}
 
 	/// Converts a 4 * 4 matrix to a quaternion.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> toQuat(
-		tmat4x4<T, P> const & x){return quat_cast(x);}
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> toQuat(
+		mat<4, 4, T, Q> const& x){return quat_cast(x);}
 
 	/// Quaternion interpolation using the rotation short path.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> shortMix(
-		tquat<T, P> const & x,
-		tquat<T, P> const & y,
-		T const & a);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> shortMix(
+		tquat<T, Q> const& x,
+		tquat<T, Q> const& y,
+		T const& a);
 
 	/// Quaternion normalized linear interpolation.
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> fastMix(
-		tquat<T, P> const & x,
-		tquat<T, P> const & y,
-		T const & a);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> fastMix(
+		tquat<T, Q> const& x,
+		tquat<T, Q> const& y,
+		T const& a);
 
 	/// Compute the rotation between two vectors.
 	/// param orig vector, needs to be normalized
 	/// param dest vector, needs to be normalized
 	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> rotation(
-		tvec3<T, P> const & orig, 
-		tvec3<T, P> const & dest);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> rotation(
+		vec<3, T, Q> const& orig,
+		vec<3, T, Q> const& dest);
+
+	/// Build a look at quaternion based on the default handedness.
+	///
+	/// @param direction Desired forward direction. Needs to be normalized.
+	/// @param up Up vector, how the camera is oriented. Typically (0, 1, 0).
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> quatLookAt(
+		vec<3, T, Q> const& direction,
+		vec<3, T, Q> const& up);
+
+	/// Build a right-handed look at quaternion.
+	///
+	/// @param direction Desired forward direction onto which the -z-axis gets mapped. Needs to be normalized.
+	/// @param up Up vector, how the camera is oriented. Typically (0, 1, 0).
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> quatLookAtRH(
+		vec<3, T, Q> const& direction,
+		vec<3, T, Q> const& up);
+
+	/// Build a left-handed look at quaternion.
+	///
+	/// @param direction Desired forward direction onto which the +z-axis gets mapped. Needs to be normalized.
+	/// @param up Up vector, how the camera is oriented. Typically (0, 1, 0).
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> quatLookAtLH(
+		vec<3, T, Q> const& direction,
+		vec<3, T, Q> const& up);
 
 	/// Returns the squared length of x.
-	/// 
+	///
 	/// @see gtx_quaternion
-	template<typename T, precision P>
-	GLM_FUNC_DECL T length2(tquat<T, P> const & q);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T length2(tquat<T, Q> const& q);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/quaternion.inl b/external/include/glm/gtx/quaternion.inl
index c86ec18..fde7a8f 100644
--- a/external/include/glm/gtx/quaternion.inl
+++ b/external/include/glm/gtx/quaternion.inl
@@ -6,84 +6,90 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> cross(tvec3<T, P> const& v, tquat<T, P> const& q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> quat_identity()
+	{
+		return tquat<T, Q>(static_cast<T>(1), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> cross(vec<3, T, Q> const& v, tquat<T, Q> const& q)
 	{
 		return inverse(q) * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> cross(tquat<T, P> const& q, tvec3<T, P> const& v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> cross(tquat<T, Q> const& q, vec<3, T, Q> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> squad
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> squad
 	(
-		tquat<T, P> const & q1,
-		tquat<T, P> const & q2,
-		tquat<T, P> const & s1,
-		tquat<T, P> const & s2,
-		T const & h)
+		tquat<T, Q> const& q1,
+		tquat<T, Q> const& q2,
+		tquat<T, Q> const& s1,
+		tquat<T, Q> const& s2,
+		T const& h)
 	{
 		return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> intermediate
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> intermediate
 	(
-		tquat<T, P> const & prev,
-		tquat<T, P> const & curr,
-		tquat<T, P> const & next
+		tquat<T, Q> const& prev,
+		tquat<T, Q> const& curr,
+		tquat<T, Q> const& next
 	)
 	{
-		tquat<T, P> invQuat = inverse(curr);
+		tquat<T, Q> invQuat = inverse(curr);
 		return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> exp(tquat<T, P> const& q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> exp(tquat<T, Q> const& q)
 	{
-		tvec3<T, P> u(q.x, q.y, q.z);
+		vec<3, T, Q> u(q.x, q.y, q.z);
 		T const Angle = glm::length(u);
 		if (Angle < epsilon<T>())
-			return tquat<T, P>();
+			return tquat<T, Q>();
 
-		tvec3<T, P> const v(u / Angle);
-		return tquat<T, P>(cos(Angle), sin(Angle) * v);
+		vec<3, T, Q> const v(u / Angle);
+		return tquat<T, Q>(cos(Angle), sin(Angle) * v);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> log(tquat<T, P> const& q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> log(tquat<T, Q> const& q)
 	{
-		tvec3<T, P> u(q.x, q.y, q.z);
+		vec<3, T, Q> u(q.x, q.y, q.z);
 		T Vec3Len = length(u);
 
 		if (Vec3Len < epsilon<T>())
 		{
 			if(q.w > static_cast<T>(0))
-				return tquat<T, P>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
+				return tquat<T, Q>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
 			else if(q.w < static_cast<T>(0))
-				return tquat<T, P>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
+				return tquat<T, Q>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
 			else
-				return tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
+				return tquat<T, Q>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
 		}
 		else
 		{
 			T t = atan(Vec3Len, T(q.w)) / Vec3Len;
 			T QuatLen2 = Vec3Len * Vec3Len + q.w * q.w;
-			return tquat<T, P>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z);
+			return tquat<T, Q>(static_cast<T>(0.5) * log(QuatLen2), t * q.x, t * q.y, t * q.z);
 		}
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> pow(tquat<T, P> const & x, T const & y)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> pow(tquat<T, Q> const& x, T const& y)
 	{
 		//Raising to the power of 0 should yield 1
 		//Needed to prevent a division by 0 error later on
 		if(y > -epsilon<T>() && y < epsilon<T>())
-			return tquat<T, P>(1,0,0,0);
+			return tquat<T, Q>(1,0,0,0);
 
 		//To deal with non-unit quaternions
 		T magnitude = sqrt(x.x * x.x + x.y * x.y + x.z * x.z + x.w *x.w);
@@ -91,30 +97,30 @@ namespace glm
 		//Equivalent to raising a real number to a power
 		//Needed to prevent a division by 0 error later on
 		if(abs(x.w / magnitude) > static_cast<T>(1) - epsilon<T>() && abs(x.w / magnitude) < static_cast<T>(1) + epsilon<T>())
-			return tquat<T, P>(pow(x.w, y),0,0,0);
+			return tquat<T, Q>(pow(x.w, y),0,0,0);
 
 		T Angle = acos(x.w / magnitude);
 		T NewAngle = Angle * y;
 		T Div = sin(NewAngle) / sin(Angle);
 		T Mag = pow(magnitude, y - static_cast<T>(1));
 
-		return tquat<T, P>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
+		return tquat<T, Q>(cos(NewAngle) * magnitude * Mag, x.x * Div * Mag, x.y * Div * Mag, x.z * Div * Mag);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotate(tquat<T, P> const& q, tvec3<T, P> const& v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotate(tquat<T, Q> const& q, vec<3, T, Q> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> rotate(tquat<T, P> const& q, tvec4<T, P> const& v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> rotate(tquat<T, Q> const& q, vec<4, T, Q> const& v)
 	{
 		return q * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, P> const& q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T extractRealComponent(tquat<T, Q> const& q)
 	{
 		T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
 		if(w < T(0))
@@ -123,20 +129,20 @@ namespace glm
 			return -sqrt(w);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T length2(tquat<T, P> const& q)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T length2(tquat<T, Q> const& q)
 	{
 		return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> shortMix(tquat<T, P> const& x, tquat<T, P> const& y, T const& a)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> shortMix(tquat<T, Q> const& x, tquat<T, Q> const& y, T const& a)
 	{
 		if(a <= static_cast<T>(0)) return x;
 		if(a >= static_cast<T>(1)) return y;
 
 		T fCos = dot(x, y);
-		tquat<T, P> y2(y); //BUG!!! tquat<T> y2;
+		tquat<T, Q> y2(y); //BUG!!! tquat<T> y2;
 		if(fCos < static_cast<T>(0))
 		{
 			y2 = -y;
@@ -159,27 +165,29 @@ namespace glm
 			k1 = sin((static_cast<T>(0) + a) * fAngle) * fOneOverSin;
 		}
 
-		return tquat<T, P>(
+		return tquat<T, Q>(
 			k0 * x.w + k1 * y2.w,
 			k0 * x.x + k1 * y2.x,
 			k0 * x.y + k1 * y2.y,
 			k0 * x.z + k1 * y2.z);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> fastMix(tquat<T, P> const& x, tquat<T, P> const& y, T const & a)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> fastMix(tquat<T, Q> const& x, tquat<T, Q> const& y, T const& a)
 	{
 		return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> rotation(tvec3<T, P> const& orig, tvec3<T, P> const& dest)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> rotation(vec<3, T, Q> const& orig, vec<3, T, Q> const& dest)
 	{
 		T cosTheta = dot(orig, dest);
-		tvec3<T, P> rotationAxis;
+		vec<3, T, Q> rotationAxis;
 
-		if(cosTheta >= static_cast<T>(1) - epsilon<T>())
-			return quat();
+		if(cosTheta >= static_cast<T>(1) - epsilon<T>()) {
+			// orig and dest point in the same direction
+			return quat_identity<T,Q>();
+		}
 
 		if(cosTheta < static_cast<T>(-1) + epsilon<T>())
 		{
@@ -188,9 +196,9 @@ namespace glm
 			// So guess one; any will do as long as it's perpendicular to start
 			// This implementation favors a rotation around the Up axis (Y),
 			// since it's often what you want to do.
-			rotationAxis = cross(tvec3<T, P>(0, 0, 1), orig);
+			rotationAxis = cross(vec<3, T, Q>(0, 0, 1), orig);
 			if(length2(rotationAxis) < epsilon<T>()) // bad luck, they were parallel, try again!
-				rotationAxis = cross(tvec3<T, P>(1, 0, 0), orig);
+				rotationAxis = cross(vec<3, T, Q>(1, 0, 0), orig);
 
 			rotationAxis = normalize(rotationAxis);
 			return angleAxis(pi<T>(), rotationAxis);
@@ -202,11 +210,45 @@ namespace glm
 		T s = sqrt((T(1) + cosTheta) * static_cast<T>(2));
 		T invs = static_cast<T>(1) / s;
 
-		return tquat<T, P>(
-			s * static_cast<T>(0.5f), 
+		return tquat<T, Q>(
+			s * static_cast<T>(0.5f),
 			rotationAxis.x * invs,
 			rotationAxis.y * invs,
 			rotationAxis.z * invs);
 	}
 
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAt(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+	{
+#		if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED
+			return quatLookAtLH(direction, up);
+#		else
+			return quatLookAtRH(direction, up);
+# 		endif
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtRH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+	{
+		mat<3, 3, T, Q> Result;
+
+		Result[2] = -direction;
+		Result[0] = normalize(cross(up, Result[2]));
+		Result[1] = cross(Result[2], Result[0]);
+
+		return quat_cast(Result);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> quatLookAtLH(vec<3, T, Q> const& direction, vec<3, T, Q> const& up)
+	{
+		mat<3, 3, T, Q> Result;
+
+		Result[2] = direction;
+		Result[0] = normalize(cross(up, Result[2]));
+		Result[1] = cross(Result[2], Result[0]);
+
+		return quat_cast(Result);
+	}
+
 }//namespace glm
diff --git a/external/include/glm/gtx/range.hpp b/external/include/glm/gtx/range.hpp
index 00d78b4..38c5713 100644
--- a/external/include/glm/gtx/range.hpp
+++ b/external/include/glm/gtx/range.hpp
@@ -5,16 +5,20 @@
 /// @defgroup gtx_range GLM_GTX_range
 /// @ingroup gtx
 ///
-/// @brief Defines begin and end for vectors and matrices. Useful for range-based for loop.
-/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements).
+/// Include <glm/gtx/range.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/range.hpp> need to be included to use these functionalities.
+/// Defines begin and end for vectors and matrices. Useful for range-based for loop.
+/// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements).
 
 #pragma once
 
 // Dependencies
 #include "../detail/setup.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if !GLM_HAS_RANGE_FOR
 #	error "GLM_GTX_range requires C++11 suppport or 'range for'"
 #endif
@@ -27,59 +31,68 @@ namespace glm
 	/// @addtogroup gtx_range
 	/// @{
 
-	template <typename T, precision P>
-	inline length_t components(tvec1<T, P> const & v)
+#	if GLM_COMPILER & GLM_COMPILER_VC
+#		pragma warning(push)
+#		pragma warning(disable : 4100) // unreferenced formal parameter
+#	endif
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<1, T, Q> const& v)
 	{
 		return v.length();
 	}
-	
-	template <typename T, precision P>
-	inline length_t components(tvec2<T, P> const & v)
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<2, T, Q> const& v)
 	{
 		return v.length();
 	}
-	
-	template <typename T, precision P>
-	inline length_t components(tvec3<T, P> const & v)
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<3, T, Q> const& v)
 	{
 		return v.length();
 	}
-	
-	template <typename T, precision P>
-	inline length_t components(tvec4<T, P> const & v)
+
+	template<typename T, qualifier Q>
+	inline length_t components(vec<4, T, Q> const& v)
 	{
 		return v.length();
 	}
-	
-	template <typename genType>
-	inline length_t components(genType const & m)
+
+	template<typename genType>
+	inline length_t components(genType const& m)
 	{
 		return m.length() * m[0].length();
 	}
-	
-	template <typename genType>
-	inline typename genType::value_type const * begin(genType const & v)
+
+	template<typename genType>
+	inline typename genType::value_type const * begin(genType const& v)
 	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
-	inline typename genType::value_type const * end(genType const & v)
+	template<typename genType>
+	inline typename genType::value_type const * end(genType const& v)
 	{
 		return begin(v) + components(v);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type * begin(genType& v)
 	{
 		return value_ptr(v);
 	}
 
-	template <typename genType>
+	template<typename genType>
 	inline typename genType::value_type * end(genType& v)
 	{
 		return begin(v) + components(v);
 	}
 
+#	if GLM_COMPILER & GLM_COMPILER_VC
+#		pragma warning(pop)
+#	endif
+
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/raw_data.hpp b/external/include/glm/gtx/raw_data.hpp
index 2625fd1..f377c4e 100644
--- a/external/include/glm/gtx/raw_data.hpp
+++ b/external/include/glm/gtx/raw_data.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_raw_data GLM_GTX_raw_data
 /// @ingroup gtx
 ///
-/// @brief Projection of a vector to other one
+/// Include <glm/gtx/raw_data.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/raw_data.hpp> need to be included to use these functionalities.
+/// Projection of a vector to other one
 
 #pragma once
 
@@ -16,6 +16,10 @@
 #include "../detail/setup.hpp"
 #include "../detail/type_int.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_raw_data extension included")
 #endif
@@ -25,19 +29,19 @@ namespace glm
 	/// @addtogroup gtx_raw_data
 	/// @{
 
-	//! Type for byte numbers. 
+	//! Type for byte numbers.
 	//! From GLM_GTX_raw_data extension.
 	typedef detail::uint8		byte;
 
-	//! Type for word numbers. 
+	//! Type for word numbers.
 	//! From GLM_GTX_raw_data extension.
 	typedef detail::uint16		word;
 
-	//! Type for dword numbers. 
+	//! Type for dword numbers.
 	//! From GLM_GTX_raw_data extension.
 	typedef detail::uint32		dword;
 
-	//! Type for qword numbers. 
+	//! Type for qword numbers.
 	//! From GLM_GTX_raw_data extension.
 	typedef detail::uint64		qword;
 
diff --git a/external/include/glm/gtx/rotate_normalized_axis.hpp b/external/include/glm/gtx/rotate_normalized_axis.hpp
index f1dfa7b..3ac482c 100644
--- a/external/include/glm/gtx/rotate_normalized_axis.hpp
+++ b/external/include/glm/gtx/rotate_normalized_axis.hpp
@@ -8,9 +8,9 @@
 /// @defgroup gtx_rotate_normalized_axis GLM_GTX_rotate_normalized_axis
 /// @ingroup gtx
 ///
-/// @brief Quaternions and matrices rotations around normalized axis.
+/// Include <glm/gtx/rotate_normalized_axis.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/rotate_normalized_axis.hpp> need to be included to use these functionalities.
+/// Quaternions and matrices rotations around normalized axis.
 
 #pragma once
 
@@ -19,6 +19,10 @@
 #include "../gtc/epsilon.hpp"
 #include "../gtc/quaternion.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included")
 #endif
@@ -28,35 +32,35 @@ namespace glm
 	/// @addtogroup gtx_rotate_normalized_axis
 	/// @{
 
-	/// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle. 
-	/// 
+	/// Builds a rotation 4 * 4 matrix created from a normalized axis and an angle.
+	///
 	/// @param m Input matrix multiplied by this rotation matrix.
-	/// @param angle Rotation angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
+	/// @param angle Rotation angle expressed in radians.
 	/// @param axis Rotation axis, must be normalized.
-	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double.
-	/// 
+	/// @tparam T Value type used to build the matrix. Currently supported: half (not recommended), float or double.
+	///
 	/// @see gtx_rotate_normalized_axis
-	/// @see - rotate(T angle, T x, T y, T z) 
-	/// @see - rotate(tmat4x4<T, P> const & m, T angle, T x, T y, T z) 
-	/// @see - rotate(T angle, tvec3<T, P> const & v) 
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> rotateNormalizedAxis(
-		tmat4x4<T, P> const & m,
-		T const & angle,
-		tvec3<T, P> const & axis);
+	/// @see - rotate(T angle, T x, T y, T z)
+	/// @see - rotate(mat<4, 4, T, Q> const& m, T angle, T x, T y, T z)
+	/// @see - rotate(T angle, vec<3, T, Q> const& v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> rotateNormalizedAxis(
+		mat<4, 4, T, Q> const& m,
+		T const& angle,
+		vec<3, T, Q> const& axis);
 
 	/// Rotates a quaternion from a vector of 3 components normalized axis and an angle.
-	/// 
+	///
 	/// @param q Source orientation
-	/// @param angle Angle expressed in radians if GLM_FORCE_RADIANS is define or degrees otherwise.
+	/// @param angle Angle expressed in radians.
 	/// @param axis Normalized axis of the rotation, must be normalized.
-	/// 
+	///
 	/// @see gtx_rotate_normalized_axis
-	template <typename T, precision P>
-	GLM_FUNC_DECL tquat<T, P> rotateNormalizedAxis(
-		tquat<T, P> const & q,
-		T const & angle,
-		tvec3<T, P> const & axis);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL tquat<T, Q> rotateNormalizedAxis(
+		tquat<T, Q> const& q,
+		T const& angle,
+		vec<3, T, Q> const& axis);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/rotate_normalized_axis.inl b/external/include/glm/gtx/rotate_normalized_axis.inl
index dc1b1a8..66e0910 100644
--- a/external/include/glm/gtx/rotate_normalized_axis.inl
+++ b/external/include/glm/gtx/rotate_normalized_axis.inl
@@ -3,23 +3,23 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> rotateNormalizedAxis
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rotateNormalizedAxis
 	(
-		tmat4x4<T, P> const & m,
-		T const & angle,
-		tvec3<T, P> const & v
+		mat<4, 4, T, Q> const& m,
+		T const& angle,
+		vec<3, T, Q> const& v
 	)
 	{
 		T const a = angle;
 		T const c = cos(a);
 		T const s = sin(a);
 
-		tvec3<T, P> const axis(v);
+		vec<3, T, Q> const axis(v);
 
-		tvec3<T, P> const temp((static_cast<T>(1) - c) * axis);
+		vec<3, T, Q> const temp((static_cast<T>(1) - c) * axis);
 
-		tmat4x4<T, P> Rotate(uninitialize);
+		mat<4, 4, T, Q> Rotate;
 		Rotate[0][0] = c + temp[0] * axis[0];
 		Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2];
 		Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1];
@@ -32,7 +32,7 @@ namespace glm
 		Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0];
 		Rotate[2][2] = c + temp[2] * axis[2];
 
-		tmat4x4<T, P> Result(uninitialize);
+		mat<4, 4, T, Q> Result;
 		Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2];
 		Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2];
 		Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2];
@@ -40,20 +40,20 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tquat<T, P> rotateNormalizedAxis
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER tquat<T, Q> rotateNormalizedAxis
 	(
-		tquat<T, P> const & q, 
-		T const & angle,
-		tvec3<T, P> const & v
+		tquat<T, Q> const& q,
+		T const& angle,
+		vec<3, T, Q> const& v
 	)
 	{
-		tvec3<T, P> const Tmp(v);
+		vec<3, T, Q> const Tmp(v);
 
 		T const AngleRad(angle);
 		T const Sin = sin(AngleRad * T(0.5));
 
-		return q * tquat<T, P>(cos(AngleRad * static_cast<T>(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin);
-		//return gtc::quaternion::cross(q, tquat<T, P>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
+		return q * tquat<T, Q>(cos(AngleRad * static_cast<T>(0.5)), Tmp.x * Sin, Tmp.y * Sin, Tmp.z * Sin);
+		//return gtc::quaternion::cross(q, tquat<T, Q>(cos(AngleRad * T(0.5)), Tmp.x * fSin, Tmp.y * fSin, Tmp.z * fSin));
 	}
 }//namespace glm
diff --git a/external/include/glm/gtx/rotate_vector.hpp b/external/include/glm/gtx/rotate_vector.hpp
index 91d1784..2ad909d 100644
--- a/external/include/glm/gtx/rotate_vector.hpp
+++ b/external/include/glm/gtx/rotate_vector.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_rotate_vector GLM_GTX_rotate_vector
 /// @ingroup gtx
 ///
-/// @brief Function to directly rotate a vector
+/// Include <glm/gtx/rotate_vector.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/rotate_vector.hpp> need to be included to use these functionalities.
+/// Function to directly rotate a vector
 
 #pragma once
 
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/transform.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_rotate_vector extension included")
 #endif
@@ -27,89 +31,89 @@ namespace glm
 	/// @{
 
 	/// Returns Spherical interpolation between two vectors
-	/// 
+	///
 	/// @param x A first vector
 	/// @param y A second vector
 	/// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
-	/// 
+	///
 	/// @see gtx_rotate_vector
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> slerp(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		T const & a);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> slerp(
+		vec<3, T, Q> const& x,
+		vec<3, T, Q> const& y,
+		T const& a);
 
 	//! Rotate a two dimensional vector.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec2<T, P> rotate(
-		tvec2<T, P> const & v,
-		T const & angle);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<2, T, Q> rotate(
+		vec<2, T, Q> const& v,
+		T const& angle);
+
 	//! Rotate a three dimensional vector around an axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rotate(
-		tvec3<T, P> const & v,
-		T const & angle,
-		tvec3<T, P> const & normal);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rotate(
+		vec<3, T, Q> const& v,
+		T const& angle,
+		vec<3, T, Q> const& normal);
+
 	//! Rotate a four dimensional vector around an axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> rotate(
-		tvec4<T, P> const & v,
-		T const & angle,
-		tvec3<T, P> const & normal);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> rotate(
+		vec<4, T, Q> const& v,
+		T const& angle,
+		vec<3, T, Q> const& normal);
+
 	//! Rotate a three dimensional vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rotateX(
-		tvec3<T, P> const & v,
-		T const & angle);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rotateX(
+		vec<3, T, Q> const& v,
+		T const& angle);
 
 	//! Rotate a three dimensional vector around the Y axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rotateY(
-		tvec3<T, P> const & v,
-		T const & angle);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rotateY(
+		vec<3, T, Q> const& v,
+		T const& angle);
+
 	//! Rotate a three dimensional vector around the Z axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec3<T, P> rotateZ(
-		tvec3<T, P> const & v,
-		T const & angle);
-		
-	//! Rotate a four dimentionnals vector around the X axis.
-	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> rotateX(
-		tvec4<T, P> const & v,
-		T const & angle);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<3, T, Q> rotateZ(
+		vec<3, T, Q> const& v,
+		T const& angle);
+
 	//! Rotate a four dimensional vector around the X axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> rotateY(
-		tvec4<T, P> const & v,
-		T const & angle);
-		
-	//! Rotate a four dimensional vector around the X axis.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> rotateX(
+		vec<4, T, Q> const& v,
+		T const& angle);
+
+	//! Rotate a four dimensional vector around the Y axis.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tvec4<T, P> rotateZ(
-		tvec4<T, P> const & v,
-		T const & angle);
-		
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> rotateY(
+		vec<4, T, Q> const& v,
+		T const& angle);
+
+	//! Rotate a four dimensional vector around the Z axis.
+	//! From GLM_GTX_rotate_vector extension.
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL vec<4, T, Q> rotateZ(
+		vec<4, T, Q> const& v,
+		T const& angle);
+
 	//! Build a rotation matrix from a normal and a up vector.
 	//! From GLM_GTX_rotate_vector extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> orientation(
-		tvec3<T, P> const & Normal,
-		tvec3<T, P> const & Up);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> orientation(
+		vec<3, T, Q> const& Normal,
+		vec<3, T, Q> const& Up);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/rotate_vector.inl b/external/include/glm/gtx/rotate_vector.inl
index 5620e96..5183d37 100644
--- a/external/include/glm/gtx/rotate_vector.inl
+++ b/external/include/glm/gtx/rotate_vector.inl
@@ -3,12 +3,12 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> slerp
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> slerp
 	(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		T const & a
+		vec<3, T, Q> const& x,
+		vec<3, T, Q> const& y,
+		T const& a
 	)
 	{
 		// get cosine of angle between vectors (-1 -> 1)
@@ -25,14 +25,14 @@ namespace glm
 		return x * t1 + y * t2;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<T, P> rotate
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, T, Q> rotate
 	(
-		tvec2<T, P> const & v,
-		T const & angle
+		vec<2, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec2<T, P> Result;
+		vec<2, T, Q> Result;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -41,47 +41,47 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotate
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotate
 	(
-		tvec3<T, P> const & v,
-		T const & angle,
-		tvec3<T, P> const & normal
+		vec<3, T, Q> const& v,
+		T const& angle,
+		vec<3, T, Q> const& normal
 	)
 	{
-		return tmat3x3<T, P>(glm::rotate(angle, normal)) * v;
+		return mat<3, 3, T, Q>(glm::rotate(angle, normal)) * v;
 	}
 	/*
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotateGTX(
-		const tvec3<T, P>& x,
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotateGTX(
+		const vec<3, T, Q>& x,
 		T angle,
-		const tvec3<T, P>& normal)
+		const vec<3, T, Q>& normal)
 	{
 		const T Cos = cos(radians(angle));
 		const T Sin = sin(radians(angle));
 		return x * Cos + ((x * normal) * (T(1) - Cos)) * normal + cross(x, normal) * Sin;
 	}
 	*/
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> rotate
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> rotate
 	(
-		tvec4<T, P> const & v,
-		T const & angle,
-		tvec3<T, P> const & normal
+		vec<4, T, Q> const& v,
+		T const& angle,
+		vec<3, T, Q> const& normal
 	)
 	{
 		return rotate(angle, normal) * v;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotateX
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotateX
 	(
-		tvec3<T, P> const & v,
-		T const & angle
+		vec<3, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec3<T, P> Result(v);
+		vec<3, T, Q> Result(v);
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -90,14 +90,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotateY
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotateY
 	(
-		tvec3<T, P> const & v,
-		T const & angle
+		vec<3, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec3<T, P> Result = v;
+		vec<3, T, Q> Result = v;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -106,14 +106,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<T, P> rotateZ
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, T, Q> rotateZ
 	(
-		tvec3<T, P> const & v,
-		T const & angle
+		vec<3, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec3<T, P> Result = v;
+		vec<3, T, Q> Result = v;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -122,14 +122,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> rotateX
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> rotateX
 	(
-		tvec4<T, P> const & v,
-		T const & angle
+		vec<4, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec4<T, P> Result = v;
+		vec<4, T, Q> Result = v;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -138,14 +138,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> rotateY
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> rotateY
 	(
-		tvec4<T, P> const & v,
-		T const & angle
+		vec<4, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec4<T, P> Result = v;
+		vec<4, T, Q> Result = v;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -154,14 +154,14 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<T, P> rotateZ
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, T, Q> rotateZ
 	(
-		tvec4<T, P> const & v,
-		T const & angle
+		vec<4, T, Q> const& v,
+		T const& angle
 	)
 	{
-		tvec4<T, P> Result = v;
+		vec<4, T, Q> Result = v;
 		T const Cos(cos(angle));
 		T const Sin(sin(angle));
 
@@ -170,17 +170,17 @@ namespace glm
 		return Result;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> orientation
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> orientation
 	(
-		tvec3<T, P> const & Normal,
-		tvec3<T, P> const & Up
+		vec<3, T, Q> const& Normal,
+		vec<3, T, Q> const& Up
 	)
 	{
 		if(all(equal(Normal, Up)))
-			return tmat4x4<T, P>(T(1));
+			return mat<4, 4, T, Q>(T(1));
 
-		tvec3<T, P> RotationAxis = cross(Up, Normal);
+		vec<3, T, Q> RotationAxis = cross(Up, Normal);
 		T Angle = acos(dot(Normal, Up));
 
 		return rotate(Angle, RotationAxis);
diff --git a/external/include/glm/gtx/scalar_multiplication.hpp b/external/include/glm/gtx/scalar_multiplication.hpp
index 695e841..b73edf6 100644
--- a/external/include/glm/gtx/scalar_multiplication.hpp
+++ b/external/include/glm/gtx/scalar_multiplication.hpp
@@ -2,7 +2,9 @@
 /// @file glm/gtx/scalar_multiplication.hpp
 /// @author Joshua Moerman
 ///
-/// @brief Enables scalar multiplication for all types
+/// Include <glm/gtx/scalar_multiplication.hpp> to use the features of this extension.
+///
+/// Enables scalar multiplication for all types
 ///
 /// Since GLSL is very strict about types, the following (often used) combinations do not work:
 ///    double * vec4
@@ -14,6 +16,10 @@
 
 #include "../detail/setup.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC)
 #	error "GLM_GTX_scalar_multiplication requires C++11 support or alias templates and if not support for GCC"
 #endif
@@ -26,28 +32,28 @@
 
 namespace glm
 {
-	template <typename T, typename Vec>
+	template<typename T, typename Vec>
 	using return_type_scalar_multiplication = typename std::enable_if<
 		!std::is_same<T, float>::value       // T may not be a float
 		&& std::is_arithmetic<T>::value, Vec // But it may be an int or double (no vec3 or mat3, ...)
 	>::type;
 
 #define GLM_IMPLEMENT_SCAL_MULT(Vec) \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
-	operator*(T const & s, Vec rh){ \
+	operator*(T const& s, Vec rh){ \
 		return rh *= static_cast<float>(s); \
 	} \
 	 \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
-	operator*(Vec lh, T const & s){ \
+	operator*(Vec lh, T const& s){ \
 		return lh *= static_cast<float>(s); \
 	} \
 	 \
-	template <typename T> \
+	template<typename T> \
 	return_type_scalar_multiplication<T, Vec> \
-	operator/(Vec lh, T const & s){ \
+	operator/(Vec lh, T const& s){ \
 		return lh *= 1.0f / s; \
 	}
 
diff --git a/external/include/glm/gtx/scalar_relational.hpp b/external/include/glm/gtx/scalar_relational.hpp
index 9695716..7fc8c1c 100644
--- a/external/include/glm/gtx/scalar_relational.hpp
+++ b/external/include/glm/gtx/scalar_relational.hpp
@@ -6,15 +6,19 @@
 /// @defgroup gtx_scalar_relational GLM_GTX_scalar_relational
 /// @ingroup gtx
 ///
-/// @brief Extend a position from a source to a position at a defined length.
+/// Include <glm/gtx/scalar_relational.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/scalar_relational.hpp> need to be included to use these functionalities.
+/// Extend a position from a source to a position at a defined length.
 
 #pragma once
 
 // Dependency:
 #include "../glm.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_extend extension included")
 #endif
diff --git a/external/include/glm/gtx/scalar_relational.inl b/external/include/glm/gtx/scalar_relational.inl
index 709da04..8da7236 100644
--- a/external/include/glm/gtx/scalar_relational.inl
+++ b/external/include/glm/gtx/scalar_relational.inl
@@ -3,69 +3,69 @@
 
 namespace glm
 {
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool lessThan
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
 		return x < y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool lessThanEqual
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
 		return x <= y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool greaterThan
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
 		return x > y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool greaterThanEqual
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
 		return x >= y;
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool equal
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
-		return x == y;
+		return detail::compute_equal<T>::call(x, y);
 	}
 
-	template <typename T>
+	template<typename T>
 	GLM_FUNC_QUALIFIER bool notEqual
 	(
-		T const & x, 
-		T const & y
+		T const& x,
+		T const& y
 	)
 	{
-		return x != y;
+		return !detail::compute_equal<T>::call(x, y);
 	}
 
 	GLM_FUNC_QUALIFIER bool any
 	(
-		bool const & x
+		bool const& x
 	)
 	{
 		return x;
@@ -73,7 +73,7 @@ namespace glm
 
 	GLM_FUNC_QUALIFIER bool all
 	(
-		bool const & x
+		bool const& x
 	)
 	{
 		return x;
@@ -81,7 +81,7 @@ namespace glm
 
 	GLM_FUNC_QUALIFIER bool not_
 	(
-		bool const & x
+		bool const& x
 	)
 	{
 		return !x;
diff --git a/external/include/glm/gtx/simd_mat4.hpp b/external/include/glm/gtx/simd_mat4.hpp
deleted file mode 100644
index a68220c..0000000
--- a/external/include/glm/gtx/simd_mat4.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/// @ref gtx_simd_mat4
-/// @file glm/gtx/simd_mat4.hpp
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_mat4 GLM_GTX_simd_mat4
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of mat4 type.
-///
-/// <glm/gtx/simd_mat4.hpp> need to be included to use these functionalities.
-
-#pragma once
-
-// Dependencies
-#include "../detail/setup.hpp"
-
-#if(GLM_ARCH != GLM_ARCH_PURE)
-
-#if(GLM_ARCH & GLM_ARCH_SSE2_BIT)
-#	include "../detail/intrinsic_matrix.hpp"
-#	include "../gtx/simd_vec4.hpp"
-#else
-#	error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTX_simd_mat4 extension included")
-#	pragma message("GLM: GLM_GTX_simd_mat4 extension is deprecated and will be removed in GLM 0.9.9. Use mat4 instead and use compiler SIMD arguments.")
-#endif
-
-namespace glm{
-namespace detail
-{
-	/// 4x4 Matrix implemented using SIMD SEE intrinsics.
-	/// \ingroup gtx_simd_mat4
-	GLM_ALIGNED_STRUCT(16) fmat4x4SIMD
-	{
-		typedef float value_type;
-		typedef fvec4SIMD col_type;
-		typedef fvec4SIMD row_type;
-		typedef std::size_t size_type;
-		typedef fmat4x4SIMD type;
-		typedef fmat4x4SIMD transpose_type;
-
-		typedef tmat4x4<float, defaultp> pure_type;
-		typedef tvec4<float, defaultp> pure_row_type;
-		typedef tvec4<float, defaultp> pure_col_type;
-		typedef tmat4x4<float, defaultp> pure_transpose_type;
-
-		GLM_FUNC_DECL length_t length() const;
-
-		fvec4SIMD Data[4];
-
-		//////////////////////////////////////
-		// Constructors
-
-		fmat4x4SIMD() GLM_DEFAULT_CTOR;
-		explicit fmat4x4SIMD(float const & s);
-		explicit fmat4x4SIMD(
-			float const & x0, float const & y0, float const & z0, float const & w0,
-			float const & x1, float const & y1, float const & z1, float const & w1,
-			float const & x2, float const & y2, float const & z2, float const & w2,
-			float const & x3, float const & y3, float const & z3, float const & w3);
-		explicit fmat4x4SIMD(
-			fvec4SIMD const & v0,
-			fvec4SIMD const & v1,
-			fvec4SIMD const & v2,
-			fvec4SIMD const & v3);
-		explicit fmat4x4SIMD(
-			mat4x4 const & m);
-		explicit fmat4x4SIMD(
-			__m128 const in[4]);
-
-		// Conversions
-		//template <typename U>
-		//explicit tmat4x4(tmat4x4<U> const & m);
-
-		//explicit tmat4x4(tmat2x2<T> const & x);
-		//explicit tmat4x4(tmat3x3<T> const & x);
-		//explicit tmat4x4(tmat2x3<T> const & x);
-		//explicit tmat4x4(tmat3x2<T> const & x);
-		//explicit tmat4x4(tmat2x4<T> const & x);
-		//explicit tmat4x4(tmat4x2<T> const & x);
-		//explicit tmat4x4(tmat3x4<T> const & x);
-		//explicit tmat4x4(tmat4x3<T> const & x);
-
-		// Accesses
-		fvec4SIMD & operator[](length_t i);
-		fvec4SIMD const & operator[](length_t i) const;
-
-		// Unary updatable operators
-		fmat4x4SIMD & operator= (fmat4x4SIMD const & m) GLM_DEFAULT;
-		fmat4x4SIMD & operator+= (float const & s);
-		fmat4x4SIMD & operator+= (fmat4x4SIMD const & m);
-		fmat4x4SIMD & operator-= (float const & s);
-		fmat4x4SIMD & operator-= (fmat4x4SIMD const & m);
-		fmat4x4SIMD & operator*= (float const & s);
-		fmat4x4SIMD & operator*= (fmat4x4SIMD const & m);
-		fmat4x4SIMD & operator/= (float const & s);
-		fmat4x4SIMD & operator/= (fmat4x4SIMD const & m);
-		fmat4x4SIMD & operator++ ();
-		fmat4x4SIMD & operator-- ();
-	};
-
-	// Binary operators
-	fmat4x4SIMD operator+ (fmat4x4SIMD const & m, float const & s);
-	fmat4x4SIMD operator+ (float const & s, fmat4x4SIMD const & m);
-	fmat4x4SIMD operator+ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
-	fmat4x4SIMD operator- (fmat4x4SIMD const & m, float const & s);
-	fmat4x4SIMD operator- (float const & s, fmat4x4SIMD const & m);
-	fmat4x4SIMD operator- (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
-	fmat4x4SIMD operator* (fmat4x4SIMD const & m, float const & s);
-	fmat4x4SIMD operator* (float const & s, fmat4x4SIMD const & m);
-
-	fvec4SIMD operator* (fmat4x4SIMD const & m, fvec4SIMD const & v);
-	fvec4SIMD operator* (fvec4SIMD const & v, fmat4x4SIMD const & m);
-
-	fmat4x4SIMD operator* (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
-	fmat4x4SIMD operator/ (fmat4x4SIMD const & m, float const & s);
-	fmat4x4SIMD operator/ (float const & s, fmat4x4SIMD const & m);
-
-	fvec4SIMD operator/ (fmat4x4SIMD const & m, fvec4SIMD const & v);
-	fvec4SIMD operator/ (fvec4SIMD const & v, fmat4x4SIMD const & m);
-
-	fmat4x4SIMD operator/ (fmat4x4SIMD const & m1, fmat4x4SIMD const & m2);
-
-	// Unary constant operators
-	fmat4x4SIMD const operator-  (fmat4x4SIMD const & m);
-	fmat4x4SIMD const operator-- (fmat4x4SIMD const & m, int);
-	fmat4x4SIMD const operator++ (fmat4x4SIMD const & m, int);
-}//namespace detail
-
-	typedef detail::fmat4x4SIMD simdMat4;
-
-	/// @addtogroup gtx_simd_mat4
-	/// @{
-
-	//! Convert a simdMat4 to a mat4.
-	//! (From GLM_GTX_simd_mat4 extension)
-	mat4 mat4_cast(
-		detail::fmat4x4SIMD const & x);
-
-	//! Multiply matrix x by matrix y component-wise, i.e.,
-	//! result[i][j] is the scalar product of x[i][j] and y[i][j].
-	//! (From GLM_GTX_simd_mat4 extension).
-	detail::fmat4x4SIMD matrixCompMult(
-		detail::fmat4x4SIMD const & x,
-		detail::fmat4x4SIMD const & y);
-
-	//! Treats the first parameter c as a column vector
-	//! and the second parameter r as a row vector
-	//! and does a linear algebraic matrix multiply c * r.
-	//! (From GLM_GTX_simd_mat4 extension).
-	detail::fmat4x4SIMD outerProduct(
-		detail::fvec4SIMD const & c,
-		detail::fvec4SIMD const & r);
-
-	//! Returns the transposed matrix of x
-	//! (From GLM_GTX_simd_mat4 extension).
-	detail::fmat4x4SIMD transpose(
-		detail::fmat4x4SIMD const & x);
-
-	//! Return the determinant of a mat4 matrix.
-	//! (From GLM_GTX_simd_mat4 extension).
-	float determinant(
-		detail::fmat4x4SIMD const & m);
-
-	//! Return the inverse of a mat4 matrix.
-	//! (From GLM_GTX_simd_mat4 extension).
-	detail::fmat4x4SIMD inverse(
-		detail::fmat4x4SIMD const & m);
-
-	/// @}
-}// namespace glm
-
-#include "simd_mat4.inl"
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/external/include/glm/gtx/simd_mat4.inl b/external/include/glm/gtx/simd_mat4.inl
deleted file mode 100644
index 9643255..0000000
--- a/external/include/glm/gtx/simd_mat4.inl
+++ /dev/null
@@ -1,577 +0,0 @@
-/// @ref gtx_simd_mat4
-/// @file glm/gtx/simd_mat4.inl
-
-namespace glm{
-namespace detail{
-
-GLM_FUNC_QUALIFIER length_t fmat4x4SIMD::length() const
-{
-	return 4;
-}
-
-//////////////////////////////////////
-// Accesses
-
-GLM_FUNC_QUALIFIER fvec4SIMD & fmat4x4SIMD::operator[]
-(
-	length_t i
-)
-{
-	assert(i < this->length());
-
-	return this->Data[i];
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD const & fmat4x4SIMD::operator[]
-(
-	length_t i
-) const
-{
-	assert(i < this->length());
-
-	return this->Data[i];
-}
-
-//////////////////////////////////////////////////////////////
-// Constructors
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-	GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD()
-	{
-#		ifndef GLM_FORCE_NO_CTOR_INIT
-			this->Data[0] = fvec4SIMD(1, 0, 0, 0);
-			this->Data[1] = fvec4SIMD(0, 1, 0, 0);
-			this->Data[2] = fvec4SIMD(0, 0, 1, 0);
-			this->Data[3] = fvec4SIMD(0, 0, 0, 1);
-#		endif
-	}
-#	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD(float const & s)
-{
-	this->Data[0] = fvec4SIMD(s, 0, 0, 0);
-	this->Data[1] = fvec4SIMD(0, s, 0, 0);
-	this->Data[2] = fvec4SIMD(0, 0, s, 0);
-	this->Data[3] = fvec4SIMD(0, 0, 0, s);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
-	float const & x0, float const & y0, float const & z0, float const & w0,
-	float const & x1, float const & y1, float const & z1, float const & w1,
-	float const & x2, float const & y2, float const & z2, float const & w2,
-	float const & x3, float const & y3, float const & z3, float const & w3
-)
-{
-	this->Data[0] = fvec4SIMD(x0, y0, z0, w0);
-	this->Data[1] = fvec4SIMD(x1, y1, z1, w1);
-	this->Data[2] = fvec4SIMD(x2, y2, z2, w2);
-	this->Data[3] = fvec4SIMD(x3, y3, z3, w3);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
-	fvec4SIMD const & v0,
-	fvec4SIMD const & v1,
-	fvec4SIMD const & v2,
-	fvec4SIMD const & v3
-)
-{
-	this->Data[0] = v0;
-	this->Data[1] = v1;
-	this->Data[2] = v2;
-	this->Data[3] = v3;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
-	mat4 const & m
-)
-{
-	this->Data[0] = fvec4SIMD(m[0]);
-	this->Data[1] = fvec4SIMD(m[1]);
-	this->Data[2] = fvec4SIMD(m[2]);
-	this->Data[3] = fvec4SIMD(m[3]);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD::fmat4x4SIMD
-(
-	__m128 const in[4]
-)
-{
-	this->Data[0] = in[0];
-	this->Data[1] = in[1];
-	this->Data[2] = in[2];
-	this->Data[3] = in[3];
-}
-
-//////////////////////////////////////////////////////////////
-// mat4 operators
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS
-	GLM_FUNC_QUALIFIER fmat4x4SIMD& fmat4x4SIMD::operator=
-	(
-		fmat4x4SIMD const & m
-	)
-	{
-		this->Data[0] = m[0];
-		this->Data[1] = m[1];
-		this->Data[2] = m[2];
-		this->Data[3] = m[3];
-		return *this;
-	}
-#endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+= 
-(
-	fmat4x4SIMD const & m
-)
-{
-	this->Data[0].Data = _mm_add_ps(this->Data[0].Data, m[0].Data);
-	this->Data[1].Data = _mm_add_ps(this->Data[1].Data, m[1].Data);
-	this->Data[2].Data = _mm_add_ps(this->Data[2].Data, m[2].Data);
-	this->Data[3].Data = _mm_add_ps(this->Data[3].Data, m[3].Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-= 
-(
-	fmat4x4SIMD const & m
-)
-{
-	this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, m[0].Data);
-	this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, m[1].Data);
-	this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, m[2].Data);
-	this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, m[3].Data);
-
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*= 
-(
-	fmat4x4SIMD const & m
-)
-{
-	sse_mul_ps(&this->Data[0].Data, &m.Data[0].Data, &this->Data[0].Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/= 
-(
-	fmat4x4SIMD const & m
-)
-{
-	__m128 Inv[4];
-	sse_inverse_ps(&m.Data[0].Data, Inv);
-	sse_mul_ps(&this->Data[0].Data, Inv, &this->Data[0].Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator+= 
-(
-	float const & s
-)
-{
-	__m128 Operand = _mm_set_ps1(s);
-	this->Data[0].Data = _mm_add_ps(this->Data[0].Data, Operand);
-	this->Data[1].Data = _mm_add_ps(this->Data[1].Data, Operand);
-	this->Data[2].Data = _mm_add_ps(this->Data[2].Data, Operand);
-	this->Data[3].Data = _mm_add_ps(this->Data[3].Data, Operand);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-= 
-(
-	float const & s
-)
-{
-	__m128 Operand = _mm_set_ps1(s);
-	this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, Operand);
-	this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, Operand);
-	this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, Operand);
-	this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, Operand);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator*= 
-(
-	float const & s
-)
-{
-	__m128 Operand = _mm_set_ps1(s);
-	this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand);
-	this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand);
-	this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand);
-	this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator/= 
-(
-	float const & s
-)
-{
-	__m128 Operand = _mm_div_ps(one, _mm_set_ps1(s));
-	this->Data[0].Data = _mm_mul_ps(this->Data[0].Data, Operand);
-	this->Data[1].Data = _mm_mul_ps(this->Data[1].Data, Operand);
-	this->Data[2].Data = _mm_mul_ps(this->Data[2].Data, Operand);
-	this->Data[3].Data = _mm_mul_ps(this->Data[3].Data, Operand);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator++ ()
-{
-	this->Data[0].Data = _mm_add_ps(this->Data[0].Data, one);
-	this->Data[1].Data = _mm_add_ps(this->Data[1].Data, one);
-	this->Data[2].Data = _mm_add_ps(this->Data[2].Data, one);
-	this->Data[3].Data = _mm_add_ps(this->Data[3].Data, one);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD & fmat4x4SIMD::operator-- ()
-{
-	this->Data[0].Data = _mm_sub_ps(this->Data[0].Data, one);
-	this->Data[1].Data = _mm_sub_ps(this->Data[1].Data, one);
-	this->Data[2].Data = _mm_sub_ps(this->Data[2].Data, one);
-	this->Data[3].Data = _mm_sub_ps(this->Data[3].Data, one);
-	return *this;
-}
-
-
-//////////////////////////////////////////////////////////////
-// Binary operators
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
-	const fmat4x4SIMD &m,
-	float const & s
-)
-{
-	return detail::fmat4x4SIMD
-	(
-		m[0] + s,
-		m[1] + s,
-		m[2] + s,
-		m[3] + s
-	);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
-	float const & s,
-	const fmat4x4SIMD &m
-)
-{
-	return detail::fmat4x4SIMD
-	(
-		m[0] + s,
-		m[1] + s,
-		m[2] + s,
-		m[3] + s
-	);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator+
-(
-    const fmat4x4SIMD &m1,
-    const fmat4x4SIMD &m2
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m1[0] + m2[0],
-        m1[1] + m2[1],
-        m1[2] + m2[2],
-        m1[3] + m2[3]
-    );
-}
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
-    const fmat4x4SIMD &m,
-    float const & s
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] - s,
-        m[1] - s,
-        m[2] - s,
-        m[3] - s
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
-    float const & s,
-    const fmat4x4SIMD &m
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        s - m[0],
-        s - m[1],
-        s - m[2],
-        s - m[3]
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator-
-(
-    const fmat4x4SIMD &m1,
-    const fmat4x4SIMD &m2
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m1[0] - m2[0],
-        m1[1] - m2[1],
-        m1[2] - m2[2],
-        m1[3] - m2[3]
-    );
-}
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
-    const fmat4x4SIMD &m,
-    float const & s
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] * s,
-        m[1] * s,
-        m[2] * s,
-        m[3] * s
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
-    float const & s,
-    const fmat4x4SIMD &m
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] * s,
-        m[1] * s,
-        m[2] * s,
-        m[3] * s
-    );
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator*
-(
-    const fmat4x4SIMD &m,
-    fvec4SIMD const & v
-)
-{
-    return sse_mul_ps(&m.Data[0].Data, v.Data);
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator*
-(
-    fvec4SIMD const & v,
-    const fmat4x4SIMD &m
-)
-{
-    return sse_mul_ps(v.Data, &m.Data[0].Data);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator*
-(
-    const fmat4x4SIMD &m1,
-    const fmat4x4SIMD &m2
-)
-{
-    fmat4x4SIMD result;
-    sse_mul_ps(&m1.Data[0].Data, &m2.Data[0].Data, &result.Data[0].Data);
-    
-    return result;
-}
-    
-
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
-    const fmat4x4SIMD &m,
-    float const & s
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] / s,
-        m[1] / s,
-        m[2] / s,
-        m[3] / s
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
-    float const & s,
-    const fmat4x4SIMD &m
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        s / m[0],
-        s / m[1],
-        s / m[2],
-        s / m[3]
-    );
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD inverse(detail::fmat4x4SIMD const & m)
-{
-	detail::fmat4x4SIMD result;
-	detail::sse_inverse_ps(&m[0].Data, &result[0].Data);
-	return result;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/
-(
-	const fmat4x4SIMD & m,
-	fvec4SIMD const & v
-)
-{
-	return inverse(m) * v;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/
-(
-	fvec4SIMD const & v,
-	const fmat4x4SIMD &m
-)
-{
-	return v * inverse(m);
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD operator/
-(
-	const fmat4x4SIMD &m1,
-	const fmat4x4SIMD &m2
-)
-{
-	__m128 result[4];
-	__m128 inv[4];
-
-	sse_inverse_ps(&m2.Data[0].Data, inv);
-	sse_mul_ps(&m1.Data[0].Data, inv, result);
-
-	return fmat4x4SIMD(result);
-}
-
-
-//////////////////////////////////////////////////////////////
-// Unary constant operators
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator-
-(
-    fmat4x4SIMD const & m
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        -m[0],
-        -m[1],
-        -m[2],
-        -m[3]
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator--
-(
-    fmat4x4SIMD const & m,
-    int
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] - 1.0f,
-        m[1] - 1.0f,
-        m[2] - 1.0f,
-        m[3] - 1.0f
-    );
-}
-
-GLM_FUNC_QUALIFIER fmat4x4SIMD const operator++
-(
-    fmat4x4SIMD const & m,
-    int
-)
-{
-    return detail::fmat4x4SIMD
-    (
-        m[0] + 1.0f,
-        m[1] + 1.0f,
-        m[2] + 1.0f,
-        m[3] + 1.0f
-    );
-}
-
-}//namespace detail
-
-GLM_FUNC_QUALIFIER mat4 mat4_cast
-(
-	detail::fmat4x4SIMD const & x
-)
-{
-	GLM_ALIGN(16) mat4 Result;
-	_mm_store_ps(&Result[0][0], x.Data[0].Data);
-	_mm_store_ps(&Result[1][0], x.Data[1].Data);
-	_mm_store_ps(&Result[2][0], x.Data[2].Data);
-	_mm_store_ps(&Result[3][0], x.Data[3].Data);
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD matrixCompMult
-(
-	detail::fmat4x4SIMD const & x,
-	detail::fmat4x4SIMD const & y
-)
-{
-	detail::fmat4x4SIMD result;
-	result[0] = x[0] * y[0];
-	result[1] = x[1] * y[1];
-	result[2] = x[2] * y[2];
-	result[3] = x[3] * y[3];
-	return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD outerProduct
-(
-	detail::fvec4SIMD const & c,
-	detail::fvec4SIMD const & r
-)
-{
-	__m128 Shu0 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(0, 0, 0, 0));
-	__m128 Shu1 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(1, 1, 1, 1));
-	__m128 Shu2 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(2, 2, 2, 2));
-	__m128 Shu3 = _mm_shuffle_ps(r.Data, r.Data, _MM_SHUFFLE(3, 3, 3, 3));
-
-	detail::fmat4x4SIMD result(uninitialize);
-	result[0].Data = _mm_mul_ps(c.Data, Shu0);
-	result[1].Data = _mm_mul_ps(c.Data, Shu1);
-	result[2].Data = _mm_mul_ps(c.Data, Shu2);
-	result[3].Data = _mm_mul_ps(c.Data, Shu3);
-	return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD transpose(detail::fmat4x4SIMD const & m)
-{
-	detail::fmat4x4SIMD result;
-	glm_mat4_transpose(&m[0].Data, &result[0].Data);
-	return result;
-}
-
-GLM_FUNC_QUALIFIER float determinant(detail::fmat4x4SIMD const & m)
-{
-	float Result;
-	_mm_store_ss(&Result, glm_mat4_determinant(&m[0].Data));
-	return Result;
-}
-
-}//namespace glm
diff --git a/external/include/glm/gtx/simd_quat.hpp b/external/include/glm/gtx/simd_quat.hpp
deleted file mode 100644
index b134019..0000000
--- a/external/include/glm/gtx/simd_quat.hpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/// @ref gtx_simd_quat
-/// @file glm/gtx/simd_quat.hpp
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_quat GLM_GTX_simd_quat
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of quat type.
-///
-/// <glm/gtx/simd_quat.hpp> need to be included to use these functionalities.
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-#include "../gtc/quaternion.hpp"
-#include "../gtx/fast_trigonometry.hpp"
-
-#if GLM_ARCH != GLM_ARCH_PURE
-
-#if GLM_ARCH & GLM_ARCH_SSE2_BIT
-#	include "../gtx/simd_mat4.hpp"
-#else
-#	error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTX_simd_quat extension included")
-#	pragma message("GLM: GLM_GTX_simd_quat extension is deprecated and will be removed in GLM 0.9.9. Use GLM_GTC_quaternion instead and use compiler SIMD arguments.")
-#endif
-
-// Warning silencer for nameless struct/union.
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-#   pragma warning(push)
-#   pragma warning(disable:4201)   // warning C4201: nonstandard extension used : nameless struct/union
-#endif
-
-namespace glm{
-namespace detail
-{
-	GLM_ALIGNED_STRUCT(16) fquatSIMD
-	{
-		typedef float value_type;
-		typedef std::size_t size_type;
-
-		typedef fquatSIMD type;
-		typedef tquat<bool, defaultp> bool_type;
-		typedef tquat<float, defaultp> pure_type;
-
-#ifdef GLM_SIMD_ENABLE_XYZW_UNION
-		union
-		{
-			__m128 Data;
-			struct {float x, y, z, w;};
-		};
-#else
-		__m128 Data;
-#endif
-
-		//////////////////////////////////////
-		// Implicit basic constructors
-
-		fquatSIMD() GLM_DEFAULT_CTOR;
-		fquatSIMD(fquatSIMD const & q) GLM_DEFAULT;
-		fquatSIMD(__m128 const & Data);
-
-		//////////////////////////////////////
-		// Explicit basic constructors
-
-		explicit fquatSIMD(
-			ctor);
-		explicit fquatSIMD(
-			float const & w,
-			float const & x,
-			float const & y,
-			float const & z);
-		explicit fquatSIMD(
-			quat const & v);
-		explicit fquatSIMD(
-			vec3 const & eulerAngles);
-
-
-		//////////////////////////////////////
-		// Unary arithmetic operators
-
-		fquatSIMD& operator= (fquatSIMD const & q) GLM_DEFAULT;
-		fquatSIMD& operator*=(float const & s);
-		fquatSIMD& operator/=(float const & s);
-	};
-
-
-	//////////////////////////////////////
-	// Arithmetic operators
-
-	detail::fquatSIMD operator- (
-		detail::fquatSIMD const & q);
-
-	detail::fquatSIMD operator+ (
-		detail::fquatSIMD const & q,
-		detail::fquatSIMD const & p);
-
-	detail::fquatSIMD operator* (
-		detail::fquatSIMD const & q,
-		detail::fquatSIMD const & p);
-
-	detail::fvec4SIMD operator* (
-		detail::fquatSIMD const & q,
-		detail::fvec4SIMD const & v);
-
-	detail::fvec4SIMD operator* (
-		detail::fvec4SIMD const & v,
-		detail::fquatSIMD const & q);
-
-	detail::fquatSIMD operator* (
-		detail::fquatSIMD const & q,
-		float s);
-
-	detail::fquatSIMD operator* (
-		float s,
-		detail::fquatSIMD const & q);
-
-	detail::fquatSIMD operator/ (
-		detail::fquatSIMD const & q,
-		float s);
-
-}//namespace detail
-
-	/// @addtogroup gtx_simd_quat
-	/// @{
-
-	typedef glm::detail::fquatSIMD simdQuat;
-
-	//! Convert a simdQuat to a quat.
-	/// @see gtx_simd_quat
-	quat quat_cast(
-		detail::fquatSIMD const & x);
-
-	//! Convert a simdMat4 to a simdQuat.
-	/// @see gtx_simd_quat
-	detail::fquatSIMD quatSIMD_cast(
-		detail::fmat4x4SIMD const & m);
-
-	//! Converts a mat4 to a simdQuat.
-	/// @see gtx_simd_quat
-	template <typename T, precision P>
-	detail::fquatSIMD quatSIMD_cast(
-		tmat4x4<T, P> const & m);
-
-	//! Converts a mat3 to a simdQuat.
-	/// @see gtx_simd_quat
-	template <typename T, precision P>
-	detail::fquatSIMD quatSIMD_cast(
-		tmat3x3<T, P> const & m);
-
-	//! Convert a simdQuat to a simdMat4
-	/// @see gtx_simd_quat
-	detail::fmat4x4SIMD mat4SIMD_cast(
-		detail::fquatSIMD const & q);
-
-	//! Converts a simdQuat to a standard mat4.
-	/// @see gtx_simd_quat
-	mat4 mat4_cast(
-		detail::fquatSIMD const & q);
-
-
-	/// Returns the length of the quaternion.
-	///
-	/// @see gtx_simd_quat
-	float length(
-		detail::fquatSIMD const & x);
-
-	/// Returns the normalized quaternion.
-	///
-	/// @see gtx_simd_quat
-	detail::fquatSIMD normalize(
-		detail::fquatSIMD const & x);
-
-	/// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ...
-	///
-	/// @see gtx_simd_quat
-	float dot(
-		detail::fquatSIMD const & q1,
-		detail::fquatSIMD const & q2);
-
-	/// Spherical linear interpolation of two quaternions.
-	/// The interpolation is oriented and the rotation is performed at constant speed.
-	/// For short path spherical linear interpolation, use the slerp function.
-	///
-	/// @param x A quaternion
-	/// @param y A quaternion
-	/// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
-	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
-	/// @see gtx_simd_quat
-	/// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
-	detail::fquatSIMD mix(
-		detail::fquatSIMD const & x,
-		detail::fquatSIMD const & y,
-		float const & a);
-
-	/// Linear interpolation of two quaternions.
-	/// The interpolation is oriented.
-	///
-	/// @param x A quaternion
-	/// @param y A quaternion
-	/// @param a Interpolation factor. The interpolation is defined in the range [0, 1].
-	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
-	/// @see gtx_simd_quat
-	detail::fquatSIMD lerp(
-		detail::fquatSIMD const & x,
-		detail::fquatSIMD const & y,
-		float const & a);
-
-	/// Spherical linear interpolation of two quaternions.
-	/// The interpolation always take the short path and the rotation is performed at constant speed.
-	///
-	/// @param x A quaternion
-	/// @param y A quaternion
-	/// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1].
-	/// @tparam T Value type used to build the quaternion. Supported: half, float or double.
-	/// @see gtx_simd_quat
-	detail::fquatSIMD slerp(
-		detail::fquatSIMD const & x,
-		detail::fquatSIMD const & y,
-		float const & a);
-
-
-	/// Faster spherical linear interpolation of two unit length quaternions.
-	///
-	/// This is the same as mix(), except for two rules:
-	///   1) The two quaternions must be unit length.
-	///   2) The interpolation factor (a) must be in the range [0, 1].
-	///
-	/// This will use the equivalent to fastAcos() and fastSin().
-	///
-	/// @see gtx_simd_quat
-	/// @see - mix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
-	detail::fquatSIMD fastMix(
-		detail::fquatSIMD const & x,
-		detail::fquatSIMD const & y,
-		float const & a);
-
-	/// Identical to fastMix() except takes the shortest path.
-	///
-	/// The same rules apply here as those in fastMix(). Both quaternions must be unit length and 'a' must be
-	/// in the range [0, 1].
-	///
-	/// @see - fastMix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
-	/// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a)
-	detail::fquatSIMD fastSlerp(
-		detail::fquatSIMD const & x,
-		detail::fquatSIMD const & y,
-		float const & a);
-
-
-	/// Returns the q conjugate.
-	///
-	/// @see gtx_simd_quat
-	detail::fquatSIMD conjugate(
-		detail::fquatSIMD const & q);
-
-	/// Returns the q inverse.
-	///
-	/// @see gtx_simd_quat
-	detail::fquatSIMD inverse(
-		detail::fquatSIMD const & q);
-
-	/// Build a quaternion from an angle and a normalized axis.
-	///
-	/// @param angle Angle expressed in radians.
-	/// @param axis Axis of the quaternion, must be normalized.
-	///
-	/// @see gtx_simd_quat
-	detail::fquatSIMD angleAxisSIMD(
-		float const & angle,
-		vec3 const & axis);
-
-	/// Build a quaternion from an angle and a normalized axis.
-	///
-	/// @param angle Angle expressed in radians.
-	/// @param x x component of the x-axis, x, y, z must be a normalized axis
-	/// @param y y component of the y-axis, x, y, z must be a normalized axis
-	/// @param z z component of the z-axis, x, y, z must be a normalized axis
-	///
-	/// @see gtx_simd_quat
-	detail::fquatSIMD angleAxisSIMD(
-		float const & angle,
-		float const & x,
-		float const & y,
-		float const & z);
-
-	// TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp().
-	/// Performs the equivalent of glm::fastSin() on each component of the given __m128.
-	__m128 fastSin(__m128 x);
-
-	/// @}
-}//namespace glm
-
-#include "simd_quat.inl"
-
-
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-#   pragma warning(pop)
-#endif
-
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/external/include/glm/gtx/simd_quat.inl b/external/include/glm/gtx/simd_quat.inl
deleted file mode 100644
index b84865c..0000000
--- a/external/include/glm/gtx/simd_quat.inl
+++ /dev/null
@@ -1,620 +0,0 @@
-/// @ref gtx_simd_quat
-/// @file glm/gtx/simd_quat.inl
-
-namespace glm{
-namespace detail{
-
-
-//////////////////////////////////////
-// Debugging
-#if 0
-void print(__m128 v)
-{
-    GLM_ALIGN(16) float result[4];
-    _mm_store_ps(result, v);
-
-    printf("__m128:    %f %f %f %f\n", result[0], result[1], result[2], result[3]);
-}
-
-void print(const fvec4SIMD &v)
-{
-    printf("fvec4SIMD: %f %f %f %f\n", v.x, v.y, v.z, v.w);
-}
-#endif
-
-//////////////////////////////////////
-// Implicit basic constructors
-
-#	if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-	GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD()
-#		ifdef GLM_FORCE_NO_CTOR_INIT
-			: Data(_mm_set_ps(1.0f, 0.0f, 0.0f, 0.0f))
-#		endif
-	{}
-#	endif
-
-#	if !GLM_HAS_DEFAULTED_FUNCTIONS
-	GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(fquatSIMD const & q) :
-		Data(q.Data)
-	{}
-#	endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(__m128 const & Data) :
-	Data(Data)
-{}
-
-//////////////////////////////////////
-// Explicit basic constructors
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(float const & w, float const & x, float const & y, float const & z) :
-	Data(_mm_set_ps(w, z, y, x))
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(quat const & q) :
-	Data(_mm_set_ps(q.w, q.z, q.y, q.x))
-{}
-
-GLM_FUNC_QUALIFIER fquatSIMD::fquatSIMD(vec3 const & eulerAngles)
-{
-	vec3 c = glm::cos(eulerAngles * 0.5f);
-	vec3 s = glm::sin(eulerAngles * 0.5f);
-
-	Data = _mm_set_ps(
-		(c.x * c.y * c.z) + (s.x * s.y * s.z),
-		(c.x * c.y * s.z) - (s.x * s.y * c.z),
-		(c.x * s.y * c.z) + (s.x * c.y * s.z),
-		(s.x * c.y * c.z) - (c.x * s.y * s.z));
-}
-
-
-//////////////////////////////////////
-// Unary arithmetic operators
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS
-	GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator=(fquatSIMD const & q)
-	{
-		this->Data = q.Data;
-		return *this;
-	}
-#endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator*=(float const & s)
-{
-	this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s));
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD& fquatSIMD::operator/=(float const & s)
-{
-	this->Data = _mm_div_ps(Data, _mm_set1_ps(s));
-	return *this;
-}
-
-
-
-// negate operator
-GLM_FUNC_QUALIFIER fquatSIMD operator- (fquatSIMD const & q)
-{
-    return fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(-1.0f, -1.0f, -1.0f, -1.0f)));
-}
-
-// operator+
-GLM_FUNC_QUALIFIER fquatSIMD operator+ (fquatSIMD const & q1, fquatSIMD const & q2)
-{
-	return fquatSIMD(_mm_add_ps(q1.Data, q2.Data));
-}
-
-//operator*
-GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q1, fquatSIMD const & q2)
-{
-    // SSE2 STATS:
-    //    11 shuffle
-    //    8  mul
-    //    8  add
-    
-    // SSE4 STATS:
-    //    3 shuffle
-    //    4 mul
-    //    4 dpps
-
-    __m128 mul0 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(0, 1, 2, 3)));
-    __m128 mul1 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(1, 0, 3, 2)));
-    __m128 mul2 = _mm_mul_ps(q1.Data, _mm_shuffle_ps(q2.Data, q2.Data, _MM_SHUFFLE(2, 3, 0, 1)));
-    __m128 mul3 = _mm_mul_ps(q1.Data, q2.Data);
-
-#   if(GLM_ARCH & GLM_ARCH_SSE41_BIT)
-    __m128 add0 = _mm_dp_ps(mul0, _mm_set_ps(1.0f, -1.0f,  1.0f,  1.0f), 0xff);
-    __m128 add1 = _mm_dp_ps(mul1, _mm_set_ps(1.0f,  1.0f,  1.0f, -1.0f), 0xff);
-    __m128 add2 = _mm_dp_ps(mul2, _mm_set_ps(1.0f,  1.0f, -1.0f,  1.0f), 0xff);
-    __m128 add3 = _mm_dp_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f), 0xff);
-#   else
-           mul0 = _mm_mul_ps(mul0, _mm_set_ps(1.0f, -1.0f,  1.0f,  1.0f));
-    __m128 add0 = _mm_add_ps(mul0, _mm_movehl_ps(mul0, mul0));
-           add0 = _mm_add_ss(add0, _mm_shuffle_ps(add0, add0, 1));
-
-           mul1 = _mm_mul_ps(mul1, _mm_set_ps(1.0f,  1.0f,  1.0f, -1.0f));
-    __m128 add1 = _mm_add_ps(mul1, _mm_movehl_ps(mul1, mul1));
-           add1 = _mm_add_ss(add1, _mm_shuffle_ps(add1, add1, 1));
-
-           mul2 = _mm_mul_ps(mul2, _mm_set_ps(1.0f,  1.0f, -1.0f,  1.0f));
-    __m128 add2 = _mm_add_ps(mul2, _mm_movehl_ps(mul2, mul2));
-           add2 = _mm_add_ss(add2, _mm_shuffle_ps(add2, add2, 1));
-
-           mul3 = _mm_mul_ps(mul3, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f));
-    __m128 add3 = _mm_add_ps(mul3, _mm_movehl_ps(mul3, mul3));
-           add3 = _mm_add_ss(add3, _mm_shuffle_ps(add3, add3, 1));
-#endif
-
-
-    // This SIMD code is a politically correct way of doing this, but in every test I've tried it has been slower than
-    // the final code below. I'll keep this here for reference - maybe somebody else can do something better...
-    //
-    //__m128 xxyy = _mm_shuffle_ps(add0, add1, _MM_SHUFFLE(0, 0, 0, 0));
-    //__m128 zzww = _mm_shuffle_ps(add2, add3, _MM_SHUFFLE(0, 0, 0, 0));
-    //
-    //return _mm_shuffle_ps(xxyy, zzww, _MM_SHUFFLE(2, 0, 2, 0));
-    
-    float x;
-    float y;
-    float z;
-    float w;
-
-    _mm_store_ss(&x, add0);
-    _mm_store_ss(&y, add1);
-    _mm_store_ss(&z, add2);
-    _mm_store_ss(&w, add3);
-
-    return detail::fquatSIMD(w, x, y, z);
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fquatSIMD const & q, fvec4SIMD const & v)
-{
-    static const __m128 two = _mm_set1_ps(2.0f);
-
-    __m128 q_wwww  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3));
-    __m128 q_swp0  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1));
-	__m128 q_swp1  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2));
-	__m128 v_swp0  = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 0, 2, 1));
-	__m128 v_swp1  = _mm_shuffle_ps(v.Data, v.Data, _MM_SHUFFLE(3, 1, 0, 2));
-	
-	__m128 uv      = _mm_sub_ps(_mm_mul_ps(q_swp0, v_swp1), _mm_mul_ps(q_swp1, v_swp0));
-    __m128 uv_swp0 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 0, 2, 1));
-    __m128 uv_swp1 = _mm_shuffle_ps(uv, uv, _MM_SHUFFLE(3, 1, 0, 2));
-    __m128 uuv     = _mm_sub_ps(_mm_mul_ps(q_swp0, uv_swp1), _mm_mul_ps(q_swp1, uv_swp0));
-
-    
-    uv  = _mm_mul_ps(uv,  _mm_mul_ps(q_wwww, two));
-    uuv = _mm_mul_ps(uuv, two);
-
-    return _mm_add_ps(v.Data, _mm_add_ps(uv, uuv));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, fquatSIMD const & q)
-{
-	return glm::inverse(q) * v;
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD operator* (fquatSIMD const & q, float s)
-{
-	return fquatSIMD(_mm_mul_ps(q.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fquatSIMD operator* (float s, fquatSIMD const & q)
-{
-	return fquatSIMD(_mm_mul_ps(_mm_set1_ps(s), q.Data));
-}
-
-
-//operator/
-GLM_FUNC_QUALIFIER fquatSIMD operator/ (fquatSIMD const & q, float s)
-{
-	return fquatSIMD(_mm_div_ps(q.Data, _mm_set1_ps(s)));
-}
-
-
-}//namespace detail
-
-
-GLM_FUNC_QUALIFIER quat quat_cast
-(
-	detail::fquatSIMD const & x
-)
-{
-	GLM_ALIGN(16) quat Result;
-	_mm_store_ps(&Result[0], x.Data);
-
-	return Result;
-}
-
-template <typename T>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast_impl(const T m0[], const T m1[], const T m2[])
-{
-    T trace = m0[0] + m1[1] + m2[2] + T(1.0);
-    if (trace > T(0))
-    {
-        T s = static_cast<T>(0.5) / sqrt(trace);
-
-        return _mm_set_ps(
-            static_cast<float>(T(0.25) / s),
-            static_cast<float>((m0[1] - m1[0]) * s),
-            static_cast<float>((m2[0] - m0[2]) * s),
-            static_cast<float>((m1[2] - m2[1]) * s));
-    }
-    else
-    {
-        if (m0[0] > m1[1])
-        {
-            if (m0[0] > m2[2])
-            {
-                // X is biggest.
-                T s = sqrt(m0[0] - m1[1] - m2[2] + T(1.0)) * T(0.5);
-
-                return _mm_set_ps(
-                    static_cast<float>((m1[2] - m2[1]) * s),
-                    static_cast<float>((m2[0] + m0[2]) * s),
-                    static_cast<float>((m0[1] + m1[0]) * s),
-                    static_cast<float>(T(0.5)          * s));
-            }
-        }
-        else
-        {
-            if (m1[1] > m2[2])
-            {
-                // Y is biggest.
-                T s = sqrt(m1[1] - m0[0] - m2[2] + T(1.0)) * T(0.5);
-
-                return _mm_set_ps(
-                    static_cast<float>((m2[0] - m0[2]) * s),
-                    static_cast<float>((m1[2] + m2[1]) * s),
-                    static_cast<float>(T(0.5)          * s),
-                    static_cast<float>((m0[1] + m1[0]) * s));
-            }
-        }
-
-        // Z is biggest.
-        T s = sqrt(m2[2] - m0[0] - m1[1] + T(1.0)) * T(0.5);
-
-        return _mm_set_ps(
-            static_cast<float>((m0[1] - m1[0]) * s),
-            static_cast<float>(T(0.5)          * s),
-            static_cast<float>((m1[2] + m2[1]) * s),
-            static_cast<float>((m2[0] + m0[2]) * s));
-    }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
-	detail::fmat4x4SIMD const & m
-)
-{
-    // Scalar implementation for now.
-    GLM_ALIGN(16) float m0[4];
-    GLM_ALIGN(16) float m1[4];
-    GLM_ALIGN(16) float m2[4];
-
-    _mm_store_ps(m0, m[0].Data);
-    _mm_store_ps(m1, m[1].Data);
-    _mm_store_ps(m2, m[2].Data);
-
-    return quatSIMD_cast_impl(m0, m1, m2);
-}
-
-template <typename T, precision P>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
-    tmat4x4<T, P> const & m
-)
-{
-    return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]);
-}
-
-template <typename T, precision P>
-GLM_FUNC_QUALIFIER detail::fquatSIMD quatSIMD_cast
-(
-    tmat3x3<T, P> const & m
-)
-{
-    return quatSIMD_cast_impl(&m[0][0], &m[1][0], &m[2][0]);
-}
-
-
-GLM_FUNC_QUALIFIER detail::fmat4x4SIMD mat4SIMD_cast
-(
-	detail::fquatSIMD const & q
-)
-{
-    detail::fmat4x4SIMD result;
-
-    __m128 _wwww  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 3, 3, 3));
-    __m128 _xyzw  = q.Data;
-    __m128 _zxyw  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 1, 0, 2));
-    __m128 _yzxw  = _mm_shuffle_ps(q.Data, q.Data, _MM_SHUFFLE(3, 0, 2, 1));
-
-    __m128 _xyzw2 = _mm_add_ps(_xyzw, _xyzw);
-    __m128 _zxyw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 1, 0, 2));
-    __m128 _yzxw2 = _mm_shuffle_ps(_xyzw2, _xyzw2, _MM_SHUFFLE(3, 0, 2, 1));
-    
-    __m128 _tmp0  = _mm_sub_ps(_mm_set1_ps(1.0f), _mm_mul_ps(_yzxw2, _yzxw));
-           _tmp0  = _mm_sub_ps(_tmp0, _mm_mul_ps(_zxyw2, _zxyw));
-
-    __m128 _tmp1  = _mm_mul_ps(_yzxw2, _xyzw);
-           _tmp1  = _mm_add_ps(_tmp1, _mm_mul_ps(_zxyw2, _wwww));
-
-    __m128 _tmp2  = _mm_mul_ps(_zxyw2, _xyzw);
-           _tmp2  = _mm_sub_ps(_tmp2, _mm_mul_ps(_yzxw2, _wwww));
-
-
-    // There's probably a better, more politically correct way of doing this...
-    result[0].Data = _mm_set_ps(
-        0.0f,
-        reinterpret_cast<float*>(&_tmp2)[0],
-        reinterpret_cast<float*>(&_tmp1)[0],
-        reinterpret_cast<float*>(&_tmp0)[0]);
-
-    result[1].Data = _mm_set_ps(
-        0.0f,
-        reinterpret_cast<float*>(&_tmp1)[1],
-        reinterpret_cast<float*>(&_tmp0)[1],
-        reinterpret_cast<float*>(&_tmp2)[1]);
-
-    result[2].Data = _mm_set_ps(
-        0.0f,
-        reinterpret_cast<float*>(&_tmp0)[2],
-        reinterpret_cast<float*>(&_tmp2)[2],
-        reinterpret_cast<float*>(&_tmp1)[2]);
-
-   result[3].Data = _mm_set_ps(
-        1.0f,
-        0.0f,
-        0.0f,
-        0.0f);
-
-
-    return result;
-}
-
-GLM_FUNC_QUALIFIER mat4 mat4_cast
-(
-	detail::fquatSIMD const & q
-)
-{
-    return mat4_cast(mat4SIMD_cast(q));
-}
-
-
-
-GLM_FUNC_QUALIFIER float length
-(
-	detail::fquatSIMD const & q
-)
-{
-    return glm::sqrt(dot(q, q));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD normalize
-(
-	detail::fquatSIMD const & q
-)
-{
-    return _mm_mul_ps(q.Data, _mm_set1_ps(1.0f / length(q)));
-}
-
-GLM_FUNC_QUALIFIER float dot
-(
-	detail::fquatSIMD const & q1,
-	detail::fquatSIMD const & q2
-)
-{
-    float result;
-    _mm_store_ss(&result, detail::sse_dot_ps(q1.Data, q2.Data));
-
-    return result;
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD mix
-(
-	detail::fquatSIMD const & x, 
-	detail::fquatSIMD const & y, 
-	float const & a
-)
-{
-	float cosTheta = dot(x, y);
-
-    if (cosTheta > 1.0f - glm::epsilon<float>())
-    {
-	    return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-    }
-    else
-    {
-        float angle = glm::acos(cosTheta);
-        
-        
-        float s0 = glm::sin((1.0f - a) * angle);
-        float s1 = glm::sin(a * angle);
-        float d  = 1.0f / glm::sin(angle);
-
-        return (s0 * x + s1 * y) * d;
-    }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD lerp
-(
-	detail::fquatSIMD const & x, 
-	detail::fquatSIMD const & y, 
-	float const & a
-)
-{
-	// Lerp is only defined in [0, 1]
-	assert(a >= 0.0f);
-	assert(a <= 1.0f);
-
-    return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD slerp
-(
-	detail::fquatSIMD const & x, 
-	detail::fquatSIMD const & y, 
-	float const & a
-)
-{
-	detail::fquatSIMD z = y;
-
-	float cosTheta = dot(x, y);
-
-	// If cosTheta < 0, the interpolation will take the long way around the sphere. 
-	// To fix this, one quat must be negated.
-	if (cosTheta < 0.0f)
-	{
-		z        = -y;
-		cosTheta = -cosTheta;
-	}
-
-	// Perform a linear interpolation when cosTheta is close to 1 to avoid side effect of sin(angle) becoming a zero denominator
-	if(cosTheta > 1.0f - epsilon<float>())
-	{
-		return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-	}
-	else
-	{
-        float angle = glm::acos(cosTheta);
-
-
-		float s0 = glm::sin((1.0f - a) * angle);
-        float s1 = glm::sin(a * angle);
-        float d  = 1.0f / glm::sin(angle);
-
-        return (s0 * x + s1 * y) * d;
-	}
-}
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD fastMix
-(
-	detail::fquatSIMD const & x, 
-	detail::fquatSIMD const & y, 
-	float const & a
-)
-{
-	float cosTheta = dot(x, y);
-
-    if (cosTheta > 1.0f - glm::epsilon<float>())
-    {
-	    return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-    }
-    else
-    {
-        float angle = glm::fastAcos(cosTheta);
-
-
-        __m128 s  = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f));
-
-        __m128 s0 =                               _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3));
-        __m128 s1 =                               _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2));
-        __m128 d  = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1)));
-        
-        return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d);
-    }
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD fastSlerp
-(
-	detail::fquatSIMD const & x, 
-	detail::fquatSIMD const & y, 
-	float const & a
-)
-{
-	detail::fquatSIMD z = y;
-
-	float cosTheta = dot(x, y);
-	if (cosTheta < 0.0f)
-	{
-		z        = -y;
-		cosTheta = -cosTheta;
-	}
-
-
-	if(cosTheta > 1.0f - epsilon<float>())
-	{
-		return _mm_add_ps(x.Data, _mm_mul_ps(_mm_set1_ps(a), _mm_sub_ps(y.Data, x.Data)));
-	}
-	else
-	{
-        float angle = glm::fastAcos(cosTheta);
-
-
-        __m128 s  = glm::fastSin(_mm_set_ps((1.0f - a) * angle, a * angle, angle, 0.0f));
-
-        __m128 s0 =                               _mm_shuffle_ps(s, s, _MM_SHUFFLE(3, 3, 3, 3));
-        __m128 s1 =                               _mm_shuffle_ps(s, s, _MM_SHUFFLE(2, 2, 2, 2));
-        __m128 d  = _mm_div_ps(_mm_set1_ps(1.0f), _mm_shuffle_ps(s, s, _MM_SHUFFLE(1, 1, 1, 1)));
-        
-        return _mm_mul_ps(_mm_add_ps(_mm_mul_ps(s0, x.Data), _mm_mul_ps(s1, y.Data)), d);
-	}
-}
-
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD conjugate
-(
-	detail::fquatSIMD const & q
-)
-{
-	return detail::fquatSIMD(_mm_mul_ps(q.Data, _mm_set_ps(1.0f, -1.0f, -1.0f, -1.0f)));
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD inverse
-(
-	detail::fquatSIMD const & q
-)
-{
-	return conjugate(q) / dot(q, q);
-}
-
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD
-(
-	float const & angle,
-	vec3 const & v
-)
-{
-	float s = glm::sin(angle * 0.5f);
-
-	return _mm_set_ps(
-		glm::cos(angle * 0.5f),
-		v.z * s,
-		v.y * s,
-		v.x * s);
-}
-
-GLM_FUNC_QUALIFIER detail::fquatSIMD angleAxisSIMD
-(
-	float const & angle, 
-	float const & x, 
-	float const & y, 
-	float const & z
-)
-{
-	return angleAxisSIMD(angle, vec3(x, y, z));
-}
-
-
-GLM_FUNC_QUALIFIER __m128 fastSin(__m128 x)
-{
-	static const __m128 c0 = _mm_set1_ps(0.16666666666666666666666666666667f);
-	static const __m128 c1 = _mm_set1_ps(0.00833333333333333333333333333333f);
-	static const __m128 c2 = _mm_set1_ps(0.00019841269841269841269841269841f);
-
-	__m128 x3 = _mm_mul_ps(x,  _mm_mul_ps(x, x));
-	__m128 x5 = _mm_mul_ps(x3, _mm_mul_ps(x, x));
-	__m128 x7 = _mm_mul_ps(x5, _mm_mul_ps(x, x));
-
-	__m128 y0 = _mm_mul_ps(x3, c0);
-	__m128 y1 = _mm_mul_ps(x5, c1);
-	__m128 y2 = _mm_mul_ps(x7, c2);
-
-	return _mm_sub_ps(_mm_add_ps(_mm_sub_ps(x, y0), y1), y2);
-}
-
-
-}//namespace glm
diff --git a/external/include/glm/gtx/simd_vec4.hpp b/external/include/glm/gtx/simd_vec4.hpp
deleted file mode 100644
index cde540b..0000000
--- a/external/include/glm/gtx/simd_vec4.hpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/// @ref gtx_simd_vec4
-/// @file glm/gtx/simd_vec4.hpp
-///
-/// @see core (dependence)
-///
-/// @defgroup gtx_simd_vec4 GLM_GTX_simd_vec4
-/// @ingroup gtx
-///
-/// @brief SIMD implementation of vec4 type.
-///
-/// <glm/gtx/simd_vec4.hpp> need to be included to use these functionalities.
-
-#pragma once
-
-// Dependency:
-#include "../glm.hpp"
-
-#if(GLM_ARCH != GLM_ARCH_PURE)
-
-#if(GLM_ARCH & GLM_ARCH_SSE2_BIT)
-#	include "../detail/intrinsic_common.hpp"
-#	include "../detail/intrinsic_geometric.hpp"
-#	include "../detail/intrinsic_integer.hpp"
-#else
-#	error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
-#endif
-
-#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
-#	pragma message("GLM: GLM_GTX_simd_vec4 extension included")
-#	pragma message("GLM: GLM_GTX_simd_vec4 extension is deprecated and will be removed in GLM 0.9.9. Use *vec4 types instead and use compiler SIMD arguments.")
-#endif
-
-
-// Warning silencer for nameless struct/union.
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-#	pragma warning(push)
-#	pragma warning(disable:4201)   // warning C4201: nonstandard extension used : nameless struct/union
-#endif
-
-namespace glm
-{
-	enum comp
-	{
-		X = 0,
-		R = 0,
-		S = 0,
-		Y = 1,
-		G = 1,
-		T = 1,
-		Z = 2,
-		B = 2,
-		P = 2,
-		W = 3,
-		A = 3,
-		Q = 3
-	};
-
-}//namespace glm
-
-namespace glm{
-namespace detail
-{
-	/// 4-dimensional vector implemented using SIMD SEE intrinsics.
-	/// \ingroup gtx_simd_vec4
-	GLM_ALIGNED_STRUCT(16) fvec4SIMD
-	{
-		typedef float value_type;
-		typedef std::size_t size_type;
-
-		typedef fvec4SIMD type;
-		typedef tvec4<float, defaultp> pure_type;
-		typedef tvec4<bool, highp> bool_type;
-
-#ifdef GLM_SIMD_ENABLE_XYZW_UNION
-		union
-		{
-			__m128 Data;
-			struct {float x, y, z, w;};
-		};
-#else
-		__m128 Data;
-#endif
-
-		//////////////////////////////////////
-		// Implicit basic constructors
-
-		fvec4SIMD() GLM_DEFAULT_CTOR;
-		fvec4SIMD(fvec4SIMD const & v) GLM_DEFAULT;
-		fvec4SIMD(__m128 const & Data);
-
-		//////////////////////////////////////
-		// Explicit basic constructors
-
-		explicit fvec4SIMD(
-			ctor);
-		explicit fvec4SIMD(
-			float const & s);
-		explicit fvec4SIMD(
-			float const & x,
-			float const & y,
-			float const & z,
-			float const & w);
-		explicit fvec4SIMD(
-			vec4 const & v);
-
-		////////////////////////////////////////
-		//// Conversion vector constructors
-
-		fvec4SIMD(vec2 const & v, float const & s1, float const & s2);
-		fvec4SIMD(float const & s1, vec2 const & v, float const & s2);
-		fvec4SIMD(float const & s1, float const & s2, vec2 const & v);
-		fvec4SIMD(vec3 const & v, float const & s);
-		fvec4SIMD(float const & s, vec3 const & v);
-		fvec4SIMD(vec2 const & v1, vec2 const & v2);
-		//fvec4SIMD(ivec4SIMD const & v);
-
-		//////////////////////////////////////
-		// Unary arithmetic operators
-
-		fvec4SIMD& operator= (fvec4SIMD const & v) GLM_DEFAULT;
-		fvec4SIMD& operator+=(fvec4SIMD const & v);
-		fvec4SIMD& operator-=(fvec4SIMD const & v);
-		fvec4SIMD& operator*=(fvec4SIMD const & v);
-		fvec4SIMD& operator/=(fvec4SIMD const & v);
-
-		fvec4SIMD& operator+=(float const & s);
-		fvec4SIMD& operator-=(float const & s);
-		fvec4SIMD& operator*=(float const & s);
-		fvec4SIMD& operator/=(float const & s);
-
-		fvec4SIMD& operator++();
-		fvec4SIMD& operator--();
-
-		//////////////////////////////////////
-		// Swizzle operators
-
-		template <comp X_, comp Y_, comp Z_, comp W_>
-		fvec4SIMD& swizzle();
-		template <comp X_, comp Y_, comp Z_, comp W_>
-		fvec4SIMD swizzle() const;
-		template <comp X_, comp Y_, comp Z_>
-		fvec4SIMD swizzle() const;
-		template <comp X_, comp Y_>
-		fvec4SIMD swizzle() const;
-		template <comp X_>
-		fvec4SIMD swizzle() const;
-	};
-}//namespace detail
-
-	typedef glm::detail::fvec4SIMD simdVec4;
-
-	/// @addtogroup gtx_simd_vec4
-	/// @{
-
-	//! Convert a simdVec4 to a vec4.
-	/// @see gtx_simd_vec4
-	vec4 vec4_cast(
-		detail::fvec4SIMD const & x);
-
-	//! Returns x if x >= 0; otherwise, it returns -x.
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD abs(detail::fvec4SIMD const & x);
-
-	//! Returns 1.0 if x > 0, 0.0 if x = 0, or -1.0 if x < 0.
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD sign(detail::fvec4SIMD const & x);
-
-	//! Returns a value equal to the nearest integer that is less then or equal to x.
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD floor(detail::fvec4SIMD const & x);
-
-	//! Returns a value equal to the nearest integer to x
-	//! whose absolute value is not larger than the absolute value of x.
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD trunc(detail::fvec4SIMD const & x);
-
-	//! Returns a value equal to the nearest integer to x.
-	//! The fraction 0.5 will round in a direction chosen by the
-	//! implementation, presumably the direction that is fastest.
-	//! This includes the possibility that round(x) returns the
-	//! same value as roundEven(x) for all values of x.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD round(detail::fvec4SIMD const & x);
-
-	//! Returns a value equal to the nearest integer to x.
-	//! A fractional part of 0.5 will round toward the nearest even
-	//! integer. (Both 3.5 and 4.5 for x will return 4.0.)
-	///
-	/// @see gtx_simd_vec4
-	//detail::fvec4SIMD roundEven(detail::fvec4SIMD const & x);
-
-	//! Returns a value equal to the nearest integer
-	//! that is greater than or equal to x.
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD ceil(detail::fvec4SIMD const & x);
-
-	//! Return x - floor(x).
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fract(detail::fvec4SIMD const & x);
-
-	//! Modulus. Returns x - y * floor(x / y)
-	//! for each component in x using the floating point value y.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD mod(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	//! Modulus. Returns x - y * floor(x / y)
-	//! for each component in x using the floating point value y.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD mod(
-		detail::fvec4SIMD const & x,
-		float const & y);
-
-	//! Returns the fractional part of x and sets i to the integer
-	//! part (as a whole number floating point value). Both the
-	//! return value and the output parameter will have the same
-	//! sign as x.
-	//! (From GLM_GTX_simd_vec4 extension, common function)
-	//detail::fvec4SIMD modf(
-	//	detail::fvec4SIMD const & x,
-	//	detail::fvec4SIMD & i);
-
-	//! Returns y if y < x; otherwise, it returns x.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD min(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	detail::fvec4SIMD min(
-		detail::fvec4SIMD const & x,
-		float const & y);
-
-	//! Returns y if x < y; otherwise, it returns x.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD max(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	detail::fvec4SIMD max(
-		detail::fvec4SIMD const & x,
-		float const & y);
-
-	//! Returns min(max(x, minVal), maxVal) for each component in x
-	//! using the floating-point values minVal and maxVal.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD clamp(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & minVal,
-		detail::fvec4SIMD const & maxVal);
-
-	detail::fvec4SIMD clamp(
-		detail::fvec4SIMD const & x,
-		float const & minVal,
-		float const & maxVal);
-
-	//! \return If genTypeU is a floating scalar or vector:
-	//! Returns x * (1.0 - a) + y * a, i.e., the linear blend of
-	//! x and y using the floating-point value a.
-	//! The value for a is not restricted to the range [0, 1].
-	//!
-	//! \return If genTypeU is a boolean scalar or vector:
-	//! Selects which vector each returned component comes
-	//! from. For a component of a that is false, the
-	//! corresponding component of x is returned. For a
-	//! component of a that is true, the corresponding
-	//! component of y is returned. Components of x and y that
-	//! are not selected are allowed to be invalid floating point
-	//! values and will have no effect on the results. Thus, this
-	//! provides different functionality than
-	//! genType mix(genType x, genType y, genType(a))
-	//! where a is a Boolean vector.
-	//!
-	//! From GLSL 1.30.08 specification, section 8.3
-	//!
-	//! \param[in]  x Floating point scalar or vector.
-	//! \param[in]  y Floating point scalar or vector.
-	//! \param[in]  a Floating point or boolean scalar or vector.
-	//!
-	/// \todo Test when 'a' is a boolean.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD mix(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y,
-		detail::fvec4SIMD const & a);
-
-	//! Returns 0.0 if x < edge, otherwise it returns 1.0.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD step(
-		detail::fvec4SIMD const & edge,
-		detail::fvec4SIMD const & x);
-
-	detail::fvec4SIMD step(
-		float const & edge,
-		detail::fvec4SIMD const & x);
-
-	//! Returns 0.0 if x <= edge0 and 1.0 if x >= edge1 and
-	//! performs smooth Hermite interpolation between 0 and 1
-	//! when edge0 < x < edge1. This is useful in cases where
-	//! you would want a threshold function with a smooth
-	//! transition. This is equivalent to:
-	//! genType t;
-	//! t = clamp ((x - edge0) / (edge1 - edge0), 0, 1);
-	//! return t * t * (3 - 2 * t);
-	//! Results are undefined if edge0 >= edge1.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD smoothstep(
-		detail::fvec4SIMD const & edge0,
-		detail::fvec4SIMD const & edge1,
-		detail::fvec4SIMD const & x);
-
-	detail::fvec4SIMD smoothstep(
-		float const & edge0,
-		float const & edge1,
-		detail::fvec4SIMD const & x);
-
-	//! Returns true if x holds a NaN (not a number)
-	//! representation in the underlying implementation's set of
-	//! floating point representations. Returns false otherwise,
-	//! including for implementations with no NaN
-	//! representations.
-	///
-	/// @see gtx_simd_vec4
-	//bvec4 isnan(detail::fvec4SIMD const & x);
-
-	//! Returns true if x holds a positive infinity or negative
-	//! infinity representation in the underlying implementation's
-	//! set of floating point representations. Returns false
-	//! otherwise, including for implementations with no infinity
-	//! representations.
-	///
-	/// @see gtx_simd_vec4
-	//bvec4 isinf(detail::fvec4SIMD const & x);
-
-	//! Returns a signed or unsigned integer value representing
-	//! the encoding of a floating-point value. The floatingpoint
-	//! value's bit-level representation is preserved.
-	///
-	/// @see gtx_simd_vec4
-	//detail::ivec4SIMD floatBitsToInt(detail::fvec4SIMD const & value);
-
-	//! Returns a floating-point value corresponding to a signed
-	//! or unsigned integer encoding of a floating-point value.
-	//! If an inf or NaN is passed in, it will not signal, and the
-	//! resulting floating point value is unspecified. Otherwise,
-	//! the bit-level representation is preserved.
-	///
-	/// @see gtx_simd_vec4
-	//detail::fvec4SIMD intBitsToFloat(detail::ivec4SIMD const & value);
-
-	//! Computes and returns a * b + c.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fma(
-		detail::fvec4SIMD const & a,
-		detail::fvec4SIMD const & b,
-		detail::fvec4SIMD const & c);
-
-	//! Splits x into a floating-point significand in the range
-	//! [0.5, 1.0) and an integral exponent of two, such that:
-	//! x = significand * exp(2, exponent)
-	//! The significand is returned by the function and the
-	//! exponent is returned in the parameter exp. For a
-	//! floating-point value of zero, the significant and exponent
-	//! are both zero. For a floating-point value that is an
-	//! infinity or is not a number, the results are undefined.
-	///
-	/// @see gtx_simd_vec4
-	//detail::fvec4SIMD frexp(detail::fvec4SIMD const & x, detail::ivec4SIMD & exp);
-
-	//! Builds a floating-point number from x and the
-	//! corresponding integral exponent of two in exp, returning:
-	//! significand * exp(2, exponent)
-	//! If this product is too large to be represented in the
-	//! floating-point type, the result is undefined.
-	///
-	/// @see gtx_simd_vec4
-	//detail::fvec4SIMD ldexp(detail::fvec4SIMD const & x, detail::ivec4SIMD const & exp);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	///
-	/// @see gtx_simd_vec4
-	float length(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	//! Less accurate but much faster than simdLength.
-	///
-	/// @see gtx_simd_vec4
-	float fastLength(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	//! Slightly more accurate but much slower than simdLength.
-	///
-	/// @see gtx_simd_vec4
-	float niceLength(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD length4(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	//! Less accurate but much faster than simdLength4.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fastLength4(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the length of x, i.e., sqrt(x * x).
-	//! Slightly more accurate but much slower than simdLength4.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD niceLength4(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
-	///
-	/// @see gtx_simd_vec4
-	float distance(
-		detail::fvec4SIMD const & p0,
-		detail::fvec4SIMD const & p1);
-
-	//! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD distance4(
-		detail::fvec4SIMD const & p0,
-		detail::fvec4SIMD const & p1);
-
-	//! Returns the dot product of x and y, i.e., result = x * y.
-	///
-	/// @see gtx_simd_vec4
-	float simdDot(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	//! Returns the dot product of x and y, i.e., result = x * y.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD dot4(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	//! Returns the cross product of x and y.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD cross(
-		detail::fvec4SIMD const & x,
-		detail::fvec4SIMD const & y);
-
-	//! Returns a vector in the same direction as x but with length of 1.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD normalize(
-		detail::fvec4SIMD const & x);
-
-	//! Returns a vector in the same direction as x but with length of 1.
-	//! Less accurate but much faster than simdNormalize.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fastNormalize(
-		detail::fvec4SIMD const & x);
-
-	//! If dot(Nref, I) < 0.0, return N, otherwise, return -N.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD simdFaceforward(
-		detail::fvec4SIMD const & N,
-		detail::fvec4SIMD const & I,
-		detail::fvec4SIMD const & Nref);
-
-	//! For the incident vector I and surface orientation N,
-	//! returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD reflect(
-		detail::fvec4SIMD const & I,
-		detail::fvec4SIMD const & N);
-
-	//! For the incident vector I and surface normal N,
-	//! and the ratio of indices of refraction eta,
-	//! return the refraction vector.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD refract(
-		detail::fvec4SIMD const & I,
-		detail::fvec4SIMD const & N,
-		float const & eta);
-
-	//! Returns the positive square root of x.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD sqrt(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the positive square root of x with the nicest quality but very slow.
-	//! Slightly more accurate but much slower than simdSqrt.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD niceSqrt(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the positive square root of x
-	//! Less accurate but much faster than sqrt.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fastSqrt(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the reciprocal of the positive square root of x.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD inversesqrt(
-		detail::fvec4SIMD const & x);
-
-	//! Returns the reciprocal of the positive square root of x.
-	//! Faster than inversesqrt but less accurate.
-	///
-	/// @see gtx_simd_vec4
-	detail::fvec4SIMD fastInversesqrt(
-		detail::fvec4SIMD const & x);
-
-	/// @}
-}//namespace glm
-
-#include "simd_vec4.inl"
-
-#if (GLM_COMPILER & GLM_COMPILER_VC)
-#	pragma warning(pop)
-#endif
-
-#endif//(GLM_ARCH != GLM_ARCH_PURE)
diff --git a/external/include/glm/gtx/simd_vec4.inl b/external/include/glm/gtx/simd_vec4.inl
deleted file mode 100644
index efc87c6..0000000
--- a/external/include/glm/gtx/simd_vec4.inl
+++ /dev/null
@@ -1,721 +0,0 @@
-/// @ref gtx_simd_vec4
-/// @file glm/gtx/simd_vec4.inl
-
-namespace glm{
-namespace detail{
-
-//////////////////////////////////////
-// Implicit basic constructors
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS || !defined(GLM_FORCE_NO_CTOR_INIT)
-	GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD()
-#		ifdef GLM_FORCE_NO_CTOR_INIT
-			: Data(_mm_set_ps(0.0f, 0.0f, 0.0f, 0.0f))
-#		endif
-	{}
-#endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS
-	GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(fvec4SIMD const & v) :
-		Data(v.Data)
-	{}
-#endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(__m128 const & Data) :
-	Data(Data)
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec4 const & v) :
-	Data(_mm_set_ps(v.w, v.z, v.y, v.x))
-{}
-
-//////////////////////////////////////
-// Explicit basic constructors
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s) :
-	Data(_mm_set1_ps(s))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & x, float const & y, float const & z, float const & w) :
-//		Data(_mm_setr_ps(x, y, z, w))
-	Data(_mm_set_ps(w, z, y, x))
-{}
-/*
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const v[4]) :
-	Data(_mm_load_ps(v))
-{}
-*/
-//////////////////////////////////////
-// Swizzle constructors
-
-//fvec4SIMD(ref4<float> const & r);
-
-//////////////////////////////////////
-// Conversion vector constructors
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v, float const & s1, float const & s2) :
-	Data(_mm_set_ps(s2, s1, v.y, v.x))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, vec2 const & v, float const & s2) :
-	Data(_mm_set_ps(s2, v.y, v.x, s1))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s1, float const & s2, vec2 const & v) :
-	Data(_mm_set_ps(v.y, v.x, s2, s1))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec3 const & v, float const & s) :
-	Data(_mm_set_ps(s, v.z, v.y, v.x))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(float const & s, vec3 const & v) :
-	Data(_mm_set_ps(v.z, v.y, v.x, s))
-{}
-
-GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(vec2 const & v1, vec2 const & v2) :
-	Data(_mm_set_ps(v2.y, v2.x, v1.y, v1.x))
-{}
-
-//GLM_FUNC_QUALIFIER fvec4SIMD::fvec4SIMD(ivec4SIMD const & v) :
-//	Data(_mm_cvtepi32_ps(v.Data))
-//{}
-
-//////////////////////////////////////
-// Unary arithmetic operators
-
-#if !GLM_HAS_DEFAULTED_FUNCTIONS
-	GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator=(fvec4SIMD const & v)
-	{
-		this->Data = v.Data;
-		return *this;
-	}
-#endif//!GLM_HAS_DEFAULTED_FUNCTIONS
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(float const & s)
-{
-	this->Data = _mm_add_ps(Data, _mm_set_ps1(s));
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator+=(fvec4SIMD const & v)
-{
-	this->Data = _mm_add_ps(this->Data , v.Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(float const & s)
-{
-	this->Data = _mm_sub_ps(Data, _mm_set_ps1(s));
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator-=(fvec4SIMD const & v)
-{
-	this->Data = _mm_sub_ps(this->Data , v.Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(float const & s)
-{
-	this->Data = _mm_mul_ps(this->Data, _mm_set_ps1(s));
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator*=(fvec4SIMD const & v)
-{
-	this->Data = _mm_mul_ps(this->Data , v.Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(float const & s)
-{
-	this->Data = _mm_div_ps(Data, _mm_set1_ps(s));
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator/=(fvec4SIMD const & v)
-{
-	this->Data = _mm_div_ps(this->Data , v.Data);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator++()
-{
-	this->Data = _mm_add_ps(this->Data , glm::detail::one);
-	return *this;
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::operator--()
-{
-	this->Data = _mm_sub_ps(this->Data, glm::detail::one);
-	return *this;
-}
-
-//////////////////////////////////////
-// Swizzle operators
-
-template <comp X_, comp Y_, comp Z_, comp W_>
-GLM_FUNC_QUALIFIER fvec4SIMD fvec4SIMD::swizzle() const
-{
-	__m128 Data = _mm_shuffle_ps(
-		this->Data, this->Data, 
-		shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value);
-	return fvec4SIMD(Data);
-}
-
-template <comp X_, comp Y_, comp Z_, comp W_>
-GLM_FUNC_QUALIFIER fvec4SIMD& fvec4SIMD::swizzle()
-{
-	this->Data = _mm_shuffle_ps(
-		this->Data, this->Data, 
-		shuffle_mask<(W_ << 6) | (Z_ << 4) | (Y_ << 2) | (X_ << 0)>::value);
-	return *this;
-}
-
-// operator+
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v, float s)
-{
-	return fvec4SIMD(_mm_add_ps(v.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (float s, fvec4SIMD const & v)
-{
-	return fvec4SIMD(_mm_add_ps(_mm_set1_ps(s), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator+ (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
-	return fvec4SIMD(_mm_add_ps(v1.Data, v2.Data));
-}
-
-//operator-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v, float s)
-{
-	return fvec4SIMD(_mm_sub_ps(v.Data, _mm_set1_ps(s)));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (float s, fvec4SIMD const & v)
-{
-	return fvec4SIMD(_mm_sub_ps(_mm_set1_ps(s), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
-	return fvec4SIMD(_mm_sub_ps(v1.Data, v2.Data));
-}
-
-//operator*
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v, float s)
-{
-	__m128 par0 = v.Data;
-	__m128 par1 = _mm_set1_ps(s);
-	return fvec4SIMD(_mm_mul_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (float s, fvec4SIMD const & v)
-{
-	__m128 par0 = _mm_set1_ps(s);
-	__m128 par1 = v.Data;
-	return fvec4SIMD(_mm_mul_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator* (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
-	return fvec4SIMD(_mm_mul_ps(v1.Data, v2.Data));
-}
-
-//operator/
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v, float s)
-{
-	__m128 par0 = v.Data;
-	__m128 par1 = _mm_set1_ps(s);
-	return fvec4SIMD(_mm_div_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (float s, fvec4SIMD const & v)
-{
-	__m128 par0 = _mm_set1_ps(s);
-	__m128 par1 = v.Data;
-	return fvec4SIMD(_mm_div_ps(par0, par1));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator/ (fvec4SIMD const & v1, fvec4SIMD const & v2)
-{
-	return fvec4SIMD(_mm_div_ps(v1.Data, v2.Data));
-}
-
-// Unary constant operators
-GLM_FUNC_QUALIFIER fvec4SIMD operator- (fvec4SIMD const & v)
-{
-	return fvec4SIMD(_mm_sub_ps(_mm_setzero_ps(), v.Data));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator++ (fvec4SIMD const & v, int)
-{
-	return fvec4SIMD(_mm_add_ps(v.Data, glm::detail::one));
-}
-
-GLM_FUNC_QUALIFIER fvec4SIMD operator-- (fvec4SIMD const & v, int)
-{
-	return fvec4SIMD(_mm_sub_ps(v.Data, glm::detail::one));
-}
-
-}//namespace detail
-
-GLM_FUNC_QUALIFIER vec4 vec4_cast
-(
-	detail::fvec4SIMD const & x
-)
-{
-	GLM_ALIGN(16) vec4 Result;
-	_mm_store_ps(&Result[0], x.Data);
-	return Result;
-}
-
-// Other possible implementation
-//float abs(float a)
-//{
-//  return max(-a, a);
-//}
-GLM_FUNC_QUALIFIER detail::fvec4SIMD abs
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_abs_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD sign
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_sgn_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD floor
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_flr_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD trunc
-(
-	detail::fvec4SIMD const & x
-)
-{
-    //return x < 0 ? -floor(-x) : floor(x);
-
-	__m128 Flr0 = detail::sse_flr_ps(_mm_sub_ps(_mm_setzero_ps(), x.Data));
-	__m128 Sub0 = _mm_sub_ps(Flr0, x.Data);
-	__m128 Flr1 = detail::sse_flr_ps(x.Data);
-
-	__m128 Cmp0 = _mm_cmplt_ps(x.Data, glm::detail::zero);
-	__m128 Cmp1 = _mm_cmpnlt_ps(x.Data, glm::detail::zero);
-
-	__m128 And0 = _mm_and_ps(Sub0, Cmp0);
-	__m128 And1 = _mm_and_ps(Flr1, Cmp1);
-
-	return _mm_or_ps(And0, And1);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD round
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_rnd_ps(x.Data);
-}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD roundEven
-//(
-//	detail::fvec4SIMD const & x
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD ceil
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_ceil_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fract
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_frc_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mod
-(
-	detail::fvec4SIMD const & x, 
-	detail::fvec4SIMD const & y
-)
-{
-	return detail::sse_mod_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mod
-(
-	detail::fvec4SIMD const & x, 
-	float const & y
-)
-{
-	return detail::sse_mod_ps(x.Data, _mm_set1_ps(y));
-}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD modf
-//(
-//	detail::fvec4SIMD const & x, 
-//	detail::fvec4SIMD & i
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD min
-(
-	detail::fvec4SIMD const & x, 
-	detail::fvec4SIMD const & y
-)
-{
-	return _mm_min_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD min
-(
-	detail::fvec4SIMD const & x, 
-	float const & y
-)
-{
-	return _mm_min_ps(x.Data, _mm_set1_ps(y));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD max
-(
-	detail::fvec4SIMD const & x, 
-	detail::fvec4SIMD const & y
-)
-{
-	return _mm_max_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD max
-(
-	detail::fvec4SIMD const & x, 
-	float const & y
-)
-{
-	return _mm_max_ps(x.Data, _mm_set1_ps(y));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp
-(
-	detail::fvec4SIMD const & x, 
-	detail::fvec4SIMD const & minVal, 
-	detail::fvec4SIMD const & maxVal
-)
-{
-	return detail::sse_clp_ps(x.Data, minVal.Data, maxVal.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD clamp
-(
-	detail::fvec4SIMD const & x, 
-	float const & minVal, 
-	float const & maxVal
-) 
-{
-	return detail::sse_clp_ps(x.Data, _mm_set1_ps(minVal), _mm_set1_ps(maxVal));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD mix
-(
-	detail::fvec4SIMD const & x, 
-	detail::fvec4SIMD const & y, 
-	detail::fvec4SIMD const & a
-)
-{
-	__m128 Sub0 = _mm_sub_ps(y.Data, x.Data);
-	__m128 Mul0 = _mm_mul_ps(a.Data, Sub0);
-	return _mm_add_ps(x.Data, Mul0);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD step
-(
-	detail::fvec4SIMD const & edge, 
-	detail::fvec4SIMD const & x
-)
-{
-	__m128 cmp0 = _mm_cmpngt_ps(x.Data, edge.Data);
-	return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD step
-(
-	float const & edge, 
-	detail::fvec4SIMD const & x
-)
-{
-	__m128 cmp0 = _mm_cmpngt_ps(x.Data, _mm_set1_ps(edge));
-	return _mm_max_ps(_mm_min_ps(cmp0, _mm_setzero_ps()), detail::one);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep
-(
-	detail::fvec4SIMD const & edge0, 
-	detail::fvec4SIMD const & edge1, 
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_ssp_ps(edge0.Data, edge1.Data, x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD smoothstep
-(
-	float const & edge0, 
-	float const & edge1, 
-	detail::fvec4SIMD const & x
-)
-{
-	return detail::sse_ssp_ps(_mm_set1_ps(edge0), _mm_set1_ps(edge1), x.Data);
-}
-
-//GLM_FUNC_QUALIFIER bvec4 isnan(detail::fvec4SIMD const & x)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER bvec4 isinf(detail::fvec4SIMD const & x)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER detail::ivec4SIMD floatBitsToInt
-//(
-//	detail::fvec4SIMD const & value
-//)
-//{
-
-//}
-
-//GLM_FUNC_QUALIFIER detail::fvec4SIMD intBitsToFloat
-//(
-//	detail::ivec4SIMD const & value
-//)
-//{
-
-//}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fma
-(
-	detail::fvec4SIMD const & a, 
-	detail::fvec4SIMD const & b, 
-	detail::fvec4SIMD const & c
-)
-{
-	return _mm_add_ps(_mm_mul_ps(a.Data, b.Data), c.Data);
-}
-
-GLM_FUNC_QUALIFIER float length
-(
-	detail::fvec4SIMD const & x
-)
-{
-	detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
-	detail::fvec4SIMD sqt0 = sqrt(dot0);
-	float Result = 0;
-	_mm_store_ss(&Result, sqt0.Data);
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER float fastLength
-(
-	detail::fvec4SIMD const & x
-)
-{
-	detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
-	detail::fvec4SIMD sqt0 = fastSqrt(dot0);
-	float Result = 0;
-	_mm_store_ss(&Result, sqt0.Data);
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER float niceLength
-(
-	detail::fvec4SIMD const & x
-)
-{
-	detail::fvec4SIMD dot0 = detail::sse_dot_ss(x.Data, x.Data);
-	detail::fvec4SIMD sqt0 = niceSqrt(dot0);
-	float Result = 0;
-	_mm_store_ss(&Result, sqt0.Data);
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD length4
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return sqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastLength4
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return fastSqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD niceLength4
-(
-	detail::fvec4SIMD const & x
-)
-{
-	return niceSqrt(dot4(x, x));
-}
-
-GLM_FUNC_QUALIFIER float distance
-(
-	detail::fvec4SIMD const & p0,
-	detail::fvec4SIMD const & p1
-)
-{
-	float Result = 0;
-	_mm_store_ss(&Result, detail::sse_dst_ps(p0.Data, p1.Data));
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD distance4
-(
-	detail::fvec4SIMD const & p0,
-	detail::fvec4SIMD const & p1
-)
-{
-	return detail::sse_dst_ps(p0.Data, p1.Data);
-}
-
-GLM_FUNC_QUALIFIER float dot
-(
-	detail::fvec4SIMD const & x,
-	detail::fvec4SIMD const & y
-)
-{
-	float Result = 0;
-	_mm_store_ss(&Result, detail::sse_dot_ss(x.Data, y.Data));
-	return Result;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD dot4
-(
-	detail::fvec4SIMD const & x,
-	detail::fvec4SIMD const & y
-)
-{
-	return detail::sse_dot_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD cross
-(
-	detail::fvec4SIMD const & x,
-	detail::fvec4SIMD const & y
-)
-{
-	return detail::sse_xpd_ps(x.Data, y.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD normalize
-(
-	detail::fvec4SIMD const & x
-)
-{
-	__m128 dot0 = detail::sse_dot_ps(x.Data, x.Data);
-	__m128 isr0 = inversesqrt(detail::fvec4SIMD(dot0)).Data;
-	__m128 mul0 = _mm_mul_ps(x.Data, isr0);
-	return mul0;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastNormalize
-(
-	detail::fvec4SIMD const & x
-)
-{
-	__m128 dot0 = detail::sse_dot_ps(x.Data, x.Data);
-	__m128 isr0 = fastInversesqrt(dot0).Data;
-	__m128 mul0 = _mm_mul_ps(x.Data, isr0);
-	return mul0;
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD faceforward
-(
-	detail::fvec4SIMD const & N,
-	detail::fvec4SIMD const & I,
-	detail::fvec4SIMD const & Nref
-)
-{
-	return detail::sse_ffd_ps(N.Data, I.Data, Nref.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD reflect
-(
-	detail::fvec4SIMD const & I,
-	detail::fvec4SIMD const & N
-)
-{
-	return detail::sse_rfe_ps(I.Data, N.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD refract
-(
-	detail::fvec4SIMD const & I,
-	detail::fvec4SIMD const & N,
-	float const & eta
-)
-{
-	return detail::sse_rfa_ps(I.Data, N.Data, _mm_set1_ps(eta));
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD sqrt(detail::fvec4SIMD const & x)
-{
-	return _mm_mul_ps(inversesqrt(x).Data, x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD niceSqrt(detail::fvec4SIMD const & x)
-{
-	return _mm_sqrt_ps(x.Data);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastSqrt(detail::fvec4SIMD const & x)
-{
-	return _mm_mul_ps(fastInversesqrt(x.Data).Data, x.Data);
-}
-
-// SSE scalar reciprocal sqrt using rsqrt op, plus one Newton-Rhaphson iteration
-// By Elan Ruskin, http://assemblyrequired.crashworks.org/
-GLM_FUNC_QUALIFIER detail::fvec4SIMD inversesqrt(detail::fvec4SIMD const & x)
-{
-	GLM_ALIGN(4) static const __m128 three = {3, 3, 3, 3}; // aligned consts for fast load
-	GLM_ALIGN(4) static const __m128 half = {0.5,0.5,0.5,0.5};
-
-	__m128 recip = _mm_rsqrt_ps(x.Data);  // "estimate" opcode
-	__m128 halfrecip = _mm_mul_ps(half, recip);
-	__m128 threeminus_xrr = _mm_sub_ps(three, _mm_mul_ps(x.Data, _mm_mul_ps(recip, recip)));
-	return _mm_mul_ps(halfrecip, threeminus_xrr);
-}
-
-GLM_FUNC_QUALIFIER detail::fvec4SIMD fastInversesqrt(detail::fvec4SIMD const & x)
-{
-	return _mm_rsqrt_ps(x.Data);
-}
-
-}//namespace glm
diff --git a/external/include/glm/gtx/spline.hpp b/external/include/glm/gtx/spline.hpp
index 333a5bc..f080fec 100644
--- a/external/include/glm/gtx/spline.hpp
+++ b/external/include/glm/gtx/spline.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_spline GLM_GTX_spline
 /// @ingroup gtx
 ///
-/// @brief Spline functions
+/// Include <glm/gtx/spline.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/spline.hpp> need to be included to use these functionalities.
+/// Spline functions
 
 #pragma once
 
@@ -16,6 +16,10 @@
 #include "../glm.hpp"
 #include "../gtx/optimum_pow.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_spline extension included")
 #endif
@@ -27,33 +31,33 @@ namespace glm
 
 	/// Return a point from a catmull rom curve.
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType catmullRom(
-		genType const & v1, 
-		genType const & v2, 
-		genType const & v3, 
-		genType const & v4, 
-		typename genType::value_type const & s);
-		
+		genType const& v1,
+		genType const& v2,
+		genType const& v3,
+		genType const& v4,
+		typename genType::value_type const& s);
+
 	/// Return a point from a hermite curve.
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType hermite(
-		genType const & v1, 
-		genType const & t1, 
-		genType const & v2, 
-		genType const & t2, 
-		typename genType::value_type const & s);
-		
-	/// Return a point from a cubic curve. 
+		genType const& v1,
+		genType const& t1,
+		genType const& v2,
+		genType const& t2,
+		typename genType::value_type const& s);
+
+	/// Return a point from a cubic curve.
 	/// @see gtx_spline extension.
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_DECL genType cubic(
-		genType const & v1, 
-		genType const & v2, 
-		genType const & v3, 
-		genType const & v4, 
-		typename genType::value_type const & s);
+		genType const& v1,
+		genType const& v2,
+		genType const& v3,
+		genType const& v4,
+		typename genType::value_type const& s);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/spline.inl b/external/include/glm/gtx/spline.inl
index fcd3382..ca7b439 100644
--- a/external/include/glm/gtx/spline.inl
+++ b/external/include/glm/gtx/spline.inl
@@ -3,17 +3,16 @@
 
 namespace glm
 {
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType catmullRom
 	(
-		genType const & v1, 
-		genType const & v2, 
-		genType const & v3, 
-		genType const & v4, 
-		typename genType::value_type const & s
+		genType const& v1,
+		genType const& v2,
+		genType const& v3,
+		genType const& v4,
+		typename genType::value_type const& s
 	)
 	{
-		typename genType::value_type s1 = s;
 		typename genType::value_type s2 = pow2(s);
 		typename genType::value_type s3 = pow3(s);
 
@@ -26,17 +25,16 @@ namespace glm
 
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType hermite
 	(
-		genType const & v1, 
-		genType const & t1, 
-		genType const & v2, 
-		genType const & t2, 
-		typename genType::value_type const & s
+		genType const& v1,
+		genType const& t1,
+		genType const& v2,
+		genType const& t2,
+		typename genType::value_type const& s
 	)
 	{
-		typename genType::value_type s1 = s;
 		typename genType::value_type s2 = pow2(s);
 		typename genType::value_type s3 = pow3(s);
 
@@ -48,14 +46,14 @@ namespace glm
 		return f1 * v1 + f2 * v2 + f3 * t1 + f4 * t2;
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType cubic
 	(
-		genType const & v1, 
-		genType const & v2, 
-		genType const & v3, 
-		genType const & v4, 
-		typename genType::value_type const & s
+		genType const& v1,
+		genType const& v2,
+		genType const& v3,
+		genType const& v4,
+		typename genType::value_type const& s
 	)
 	{
 		return ((v1 * s + v2) * s + v3) * s + v4;
diff --git a/external/include/glm/gtx/std_based_type.hpp b/external/include/glm/gtx/std_based_type.hpp
index ea1791b..55a2f07 100644
--- a/external/include/glm/gtx/std_based_type.hpp
+++ b/external/include/glm/gtx/std_based_type.hpp
@@ -7,8 +7,9 @@
 /// @defgroup gtx_std_based_type GLM_GTX_std_based_type
 /// @ingroup gtx
 ///
-/// @brief Adds vector types based on STL value types.
-/// <glm/gtx/std_based_type.hpp> need to be included to use these functionalities.
+/// Include <glm/gtx/std_based_type.hpp> to use the features of this extension.
+///
+/// Adds vector types based on STL value types.
 
 #pragma once
 
@@ -16,6 +17,10 @@
 #include "../glm.hpp"
 #include <cstdlib>
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_std_based_type extension included")
 #endif
@@ -27,35 +32,35 @@ namespace glm
 
 	/// Vector type based of one std::size_t component.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec1<std::size_t, defaultp>		size1;
+	typedef vec<1, std::size_t, defaultp>		size1;
 
 	/// Vector type based of two std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec2<std::size_t, defaultp>		size2;
+	typedef vec<2, std::size_t, defaultp>		size2;
 
 	/// Vector type based of three std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec3<std::size_t, defaultp>		size3;
+	typedef vec<3, std::size_t, defaultp>		size3;
 
 	/// Vector type based of four std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec4<std::size_t, defaultp>		size4;
+	typedef vec<4, std::size_t, defaultp>		size4;
 
 	/// Vector type based of one std::size_t component.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec1<std::size_t, defaultp>		size1_t;
+	typedef vec<1, std::size_t, defaultp>		size1_t;
 
 	/// Vector type based of two std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec2<std::size_t, defaultp>		size2_t;
+	typedef vec<2, std::size_t, defaultp>		size2_t;
 
 	/// Vector type based of three std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec3<std::size_t, defaultp>		size3_t;
+	typedef vec<3, std::size_t, defaultp>		size3_t;
 
 	/// Vector type based of four std::size_t components.
 	/// @see GLM_GTX_std_based_type
-	typedef tvec4<std::size_t, defaultp>		size4_t;
+	typedef vec<4, std::size_t, defaultp>		size4_t;
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/string_cast.hpp b/external/include/glm/gtx/string_cast.hpp
index d2b9fc6..4b4e280 100644
--- a/external/include/glm/gtx/string_cast.hpp
+++ b/external/include/glm/gtx/string_cast.hpp
@@ -2,16 +2,16 @@
 /// @file glm/gtx/string_cast.hpp
 ///
 /// @see core (dependence)
-/// @see gtc_half_float (dependence)
 /// @see gtx_integer (dependence)
 /// @see gtx_quaternion (dependence)
 ///
 /// @defgroup gtx_string_cast GLM_GTX_string_cast
 /// @ingroup gtx
 ///
-/// @brief Setup strings for GLM type values
+/// Include <glm/gtx/string_cast.hpp> to use the features of this extension.
+///
+/// Setup strings for GLM type values
 ///
-/// <glm/gtx/string_cast.hpp> need to be included to use these functionalities.
 /// This extension is not supported with CUDA
 
 #pragma once
@@ -22,6 +22,11 @@
 #include "../gtc/quaternion.hpp"
 #include "../gtx/dual_quaternion.hpp"
 #include <string>
+#include <cmath>
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
 
 #if(GLM_COMPILER & GLM_COMPILER_CUDA)
 #	error "GLM_GTX_string_cast is not supported on CUDA compiler"
@@ -38,8 +43,8 @@ namespace glm
 
 	/// Create a string from a GLM vector or matrix typed variable.
 	/// @see gtx_string_cast extension.
-	template <template <typename, precision> class matType, typename T, precision P>
-	GLM_FUNC_DECL std::string to_string(matType<T, P> const & x);
+	template<typename genType>
+	GLM_FUNC_DECL std::string to_string(genType const& x);
 
 	/// @}
 }//namespace glm
diff --git a/external/include/glm/gtx/string_cast.inl b/external/include/glm/gtx/string_cast.inl
index 19f136b..e237e8e 100644
--- a/external/include/glm/gtx/string_cast.inl
+++ b/external/include/glm/gtx/string_cast.inl
@@ -7,13 +7,25 @@
 namespace glm{
 namespace detail
 {
+	template <typename T>
+	struct cast
+	{
+		typedef T value_type;
+	};
+
+	template <>
+	struct cast<float>
+	{
+		typedef double value_type;
+	};
+
 	GLM_FUNC_QUALIFIER std::string format(const char* msg, ...)
 	{
 		std::size_t const STRING_BUFFER(4096);
 		char text[STRING_BUFFER];
 		va_list list;
 
-		if(msg == 0)
+		if(msg == GLM_NULLPTR)
 			return std::string();
 
 		va_start(list, msg);
@@ -30,119 +42,119 @@ namespace detail
 	static const char* LabelTrue = "true";
 	static const char* LabelFalse = "false";
 
-	template <typename T, bool isFloat = false>
+	template<typename T, bool isFloat = false>
 	struct literal
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "%d";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "%d";}
 	};
 
-	template <typename T>
+	template<typename T>
 	struct literal<T, true>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "%f";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "%f";}
 	};
 
 #	if GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
-	template <>
+	template<>
 	struct literal<uint64_t, false>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";}
 	};
 
-	template <>
+	template<>
 	struct literal<int64_t, false>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "%lld";}
 	};
 #	endif//GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER && GLM_COMPILER_VC
 
-	template <typename T>
+	template<typename T>
 	struct prefix{};
 
-	template <>
+	template<>
 	struct prefix<float>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "";}
 	};
 
-	template <>
+	template<>
 	struct prefix<double>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "d";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "d";}
 	};
 
-	template <>
+	template<>
 	struct prefix<bool>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "b";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "b";}
 	};
 
-	template <>
+	template<>
 	struct prefix<uint8_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "u8";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "u8";}
 	};
 
-	template <>
+	template<>
 	struct prefix<int8_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "i8";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "i8";}
 	};
 
-	template <>
+	template<>
 	struct prefix<uint16_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "u16";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "u16";}
 	};
 
-	template <>
+	template<>
 	struct prefix<int16_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "i16";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "i16";}
 	};
 
-	template <>
+	template<>
 	struct prefix<uint32_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "u";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "u";}
 	};
 
-	template <>
+	template<>
 	struct prefix<int32_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "i";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "i";}
 	};
 
-	template <>
+	template<>
 	struct prefix<uint64_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "u64";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "u64";}
 	};
 
-	template <>
+	template<>
 	struct prefix<int64_t>
 	{
-		GLM_FUNC_QUALIFIER static char const * value() {return "i64";};
+		GLM_FUNC_QUALIFIER static char const * value() {return "i64";}
 	};
 
-	template <template <typename, precision> class matType, typename T, precision P>
+	template<typename matType>
 	struct compute_to_string
 	{};
 
-	template <precision P>
-	struct compute_to_string<tvec1, bool, P>
+	template<qualifier Q>
+	struct compute_to_string<vec<1, bool, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec1<bool, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<1, bool, Q> const& x)
 		{
 			return detail::format("bvec1(%s)",
 				x[0] ? detail::LabelTrue : detail::LabelFalse);
 		}
 	};
 
-	template <precision P>
-	struct compute_to_string<tvec2, bool, P>
+	template<qualifier Q>
+	struct compute_to_string<vec<2, bool, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec2<bool, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<2, bool, Q> const& x)
 		{
 			return detail::format("bvec2(%s, %s)",
 				x[0] ? detail::LabelTrue : detail::LabelFalse,
@@ -150,10 +162,10 @@ namespace detail
 		}
 	};
 
-	template <precision P>
-	struct compute_to_string<tvec3, bool, P>
+	template<qualifier Q>
+	struct compute_to_string<vec<3, bool, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec3<bool, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<3, bool, Q> const& x)
 		{
 			return detail::format("bvec3(%s, %s, %s)",
 				x[0] ? detail::LabelTrue : detail::LabelFalse,
@@ -162,10 +174,10 @@ namespace detail
 		}
 	};
 
-	template <precision P>
-	struct compute_to_string<tvec4, bool, P>
+	template<qualifier Q>
+	struct compute_to_string<vec<4, bool, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec4<bool, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<4, bool, Q> const& x)
 		{
 			return detail::format("bvec4(%s, %s, %s, %s)",
 				x[0] ? detail::LabelTrue : detail::LabelFalse,
@@ -175,10 +187,10 @@ namespace detail
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tvec1, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<vec<1, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec1<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<1, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -186,14 +198,15 @@ namespace detail
 				PrefixStr,
 				LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x[0]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x[0]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tvec2, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<vec<2, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec2<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<2, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -201,14 +214,16 @@ namespace detail
 				PrefixStr,
 				LiteralStr, LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x[0], x[1]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x[0]),
+				static_cast<typename cast<T>::value_type>(x[1]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tvec3, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<vec<3, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec3<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<3, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -216,14 +231,17 @@ namespace detail
 				PrefixStr,
 				LiteralStr, LiteralStr, LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x[0], x[1], x[2]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x[0]),
+				static_cast<typename cast<T>::value_type>(x[1]),
+				static_cast<typename cast<T>::value_type>(x[2]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tvec4, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<vec<4, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tvec4<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(vec<4, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -231,15 +249,19 @@ namespace detail
 				PrefixStr,
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x[0], x[1], x[2], x[3]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x[0]),
+				static_cast<typename cast<T>::value_type>(x[1]),
+				static_cast<typename cast<T>::value_type>(x[2]),
+				static_cast<typename cast<T>::value_type>(x[3]));
 		}
 	};
 
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat2x2, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<2, 2, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat2x2<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<2, 2, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -249,15 +271,15 @@ namespace detail
 				LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1],
-				x[1][0], x[1][1]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat2x3, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<2, 3, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat2x3<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<2, 3, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -267,15 +289,15 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2],
-				x[1][0], x[1][1], x[1][2]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat2x4, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<2, 4, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat2x4<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<2, 4, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -285,15 +307,15 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2], x[0][3],
-				x[1][0], x[1][1], x[1][2], x[1][3]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]), static_cast<typename cast<T>::value_type>(x[0][3]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]), static_cast<typename cast<T>::value_type>(x[1][3]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat3x2, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<3, 2, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat3x2<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<3, 2, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -304,16 +326,16 @@ namespace detail
 				LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1],
-				x[1][0], x[1][1],
-				x[2][0], x[2][1]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat3x3, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<3, 3, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat3x3<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<3, 3, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -324,16 +346,16 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2],
-				x[1][0], x[1][1], x[1][2],
-				x[2][0], x[2][1], x[2][2]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]), static_cast<typename cast<T>::value_type>(x[2][2]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat3x4, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<3, 4, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat3x4<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<3, 4, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -344,16 +366,16 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2], x[0][3],
-				x[1][0], x[1][1], x[1][2], x[1][3],
-				x[2][0], x[2][1], x[2][2], x[2][3]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]), static_cast<typename cast<T>::value_type>(x[0][3]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]), static_cast<typename cast<T>::value_type>(x[1][3]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]), static_cast<typename cast<T>::value_type>(x[2][2]), static_cast<typename cast<T>::value_type>(x[2][3]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat4x2, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<4, 2, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat4x2<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<4, 2, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -365,17 +387,17 @@ namespace detail
 				LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1],
-				x[1][0], x[1][1],
-				x[2][0], x[2][1],
-				x[3][0], x[3][1]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]),
+				static_cast<typename cast<T>::value_type>(x[3][0]), static_cast<typename cast<T>::value_type>(x[3][1]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat4x3, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<4, 3, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat4x3<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<4, 3, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -387,17 +409,17 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2],
-				x[1][0], x[1][1], x[1][2],
-				x[2][0], x[2][1], x[2][2],
-				x[3][0], x[3][1], x[3][2]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]), static_cast<typename cast<T>::value_type>(x[2][2]),
+				static_cast<typename cast<T>::value_type>(x[3][0]), static_cast<typename cast<T>::value_type>(x[3][1]), static_cast<typename cast<T>::value_type>(x[3][2]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tmat4x4, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<mat<4, 4, T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tmat4x4<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(mat<4, 4, T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
@@ -409,50 +431,62 @@ namespace detail
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
 			return detail::format(FormatStr.c_str(),
-				x[0][0], x[0][1], x[0][2], x[0][3],
-				x[1][0], x[1][1], x[1][2], x[1][3],
-				x[2][0], x[2][1], x[2][2], x[2][3],
-				x[3][0], x[3][1], x[3][2], x[3][3]);
+				static_cast<typename cast<T>::value_type>(x[0][0]), static_cast<typename cast<T>::value_type>(x[0][1]), static_cast<typename cast<T>::value_type>(x[0][2]), static_cast<typename cast<T>::value_type>(x[0][3]),
+				static_cast<typename cast<T>::value_type>(x[1][0]), static_cast<typename cast<T>::value_type>(x[1][1]), static_cast<typename cast<T>::value_type>(x[1][2]), static_cast<typename cast<T>::value_type>(x[1][3]),
+				static_cast<typename cast<T>::value_type>(x[2][0]), static_cast<typename cast<T>::value_type>(x[2][1]), static_cast<typename cast<T>::value_type>(x[2][2]), static_cast<typename cast<T>::value_type>(x[2][3]),
+				static_cast<typename cast<T>::value_type>(x[3][0]), static_cast<typename cast<T>::value_type>(x[3][1]), static_cast<typename cast<T>::value_type>(x[3][2]), static_cast<typename cast<T>::value_type>(x[3][3]));
 		}
 	};
 
 
-	template <typename T, precision P>
-	struct compute_to_string<tquat, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<tquat<T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tquat<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(tquat<T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
-			std::string FormatStr(detail::format("%squat(%s, %s, %s, %s)",
+			std::string FormatStr(detail::format("%squat(%s, {%s, %s, %s})",
 				PrefixStr,
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x[0], x[1], x[2], x[3]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x[3]),
+				static_cast<typename cast<T>::value_type>(x[0]),
+				static_cast<typename cast<T>::value_type>(x[1]),
+				static_cast<typename cast<T>::value_type>(x[2]));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_to_string<tdualquat, T, P>
+	template<typename T, qualifier Q>
+	struct compute_to_string<tdualquat<T, Q> >
 	{
-		GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, P> const & x)
+		GLM_FUNC_QUALIFIER static std::string call(tdualquat<T, Q> const& x)
 		{
 			char const * PrefixStr = prefix<T>::value();
 			char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
-			std::string FormatStr(detail::format("%sdualquat((%s, %s, %s, %s), (%s, %s, %s, %s))",
+			std::string FormatStr(detail::format("%sdualquat((%s, {%s, %s, %s}), (%s, {%s, %s, %s}))",
 				PrefixStr,
 				LiteralStr, LiteralStr, LiteralStr, LiteralStr));
 
-			return detail::format(FormatStr.c_str(), x.real[0], x.real[1], x.real[2], x.real[3], x.dual[0], x.dual[1], x.dual[2], x.dual[3]);
+			return detail::format(FormatStr.c_str(),
+				static_cast<typename cast<T>::value_type>(x.real[3]),
+				static_cast<typename cast<T>::value_type>(x.real[0]),
+				static_cast<typename cast<T>::value_type>(x.real[1]),
+				static_cast<typename cast<T>::value_type>(x.real[2]),
+				static_cast<typename cast<T>::value_type>(x.dual[3]),
+				static_cast<typename cast<T>::value_type>(x.dual[0]),
+				static_cast<typename cast<T>::value_type>(x.dual[1]),
+				static_cast<typename cast<T>::value_type>(x.dual[2]));
 		}
 	};
 
 }//namespace detail
 
-template <template <typename, precision> class matType, typename T, precision P>
-GLM_FUNC_QUALIFIER std::string to_string(matType<T, P> const & x)
+template<class matType>
+GLM_FUNC_QUALIFIER std::string to_string(matType const& x)
 {
-	return detail::compute_to_string<matType, T, P>::call(x);
+	return detail::compute_to_string<matType>::call(x);
 }
 
 }//namespace glm
diff --git a/external/include/glm/gtx/texture.hpp b/external/include/glm/gtx/texture.hpp
new file mode 100644
index 0000000..312bf39
--- /dev/null
+++ b/external/include/glm/gtx/texture.hpp
@@ -0,0 +1,46 @@
+/// @ref gtx_texture
+/// @file glm/gtx/texture.hpp
+///
+/// @see core (dependence)
+///
+/// @defgroup gtx_texture GLM_GTX_texture
+/// @ingroup gtx
+///
+/// Include <glm/gtx/texture.hpp> to use the features of this extension.
+///
+/// Wrapping mode of texture coordinates.
+
+#pragma once
+
+// Dependency:
+#include "../glm.hpp"
+#include "../gtc/integer.hpp"
+#include "../gtx/component_wise.hpp"
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
+#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
+#	pragma message("GLM: GLM_GTX_texture extension included")
+#endif
+
+namespace glm
+{
+	/// @addtogroup gtx_texture
+	/// @{
+
+	/// Compute the number of mipmaps levels necessary to create a mipmap complete texture
+	///
+	/// @param Extent Extent of the texture base level mipmap
+	/// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+	/// @tparam T Floating-point or signed integer scalar types
+	/// @tparam Q Value from qualifier enum
+	template <length_t L, typename T, qualifier Q>
+	T levels(vec<L, T, Q> const& Extent);
+
+	/// @}
+}// namespace glm
+
+#include "texture.inl"
+
diff --git a/external/include/glm/gtx/texture.inl b/external/include/glm/gtx/texture.inl
new file mode 100644
index 0000000..7c124f2
--- /dev/null
+++ b/external/include/glm/gtx/texture.inl
@@ -0,0 +1,18 @@
+/// @ref gtx_texture
+/// @file glm/gtx/texture.inl
+
+namespace glm
+{
+	template <length_t L, typename T, qualifier Q>
+	inline T levels(vec<L, T, Q> const& Extent)
+	{
+		return glm::log2(compMax(Extent)) + static_cast<T>(1);
+	}
+
+	template <typename T>
+	inline T levels(T Extent)
+	{
+		return vec<1, T, defaultp>(Extent).x;
+	}
+}//namespace glm
+
diff --git a/external/include/glm/gtx/transform.hpp b/external/include/glm/gtx/transform.hpp
index 365748b..c4467bd 100644
--- a/external/include/glm/gtx/transform.hpp
+++ b/external/include/glm/gtx/transform.hpp
@@ -9,9 +9,9 @@
 /// @defgroup gtx_transform GLM_GTX_transform
 /// @ingroup gtx
 ///
-/// @brief Add transformation matrices
+/// Include <glm/gtx/transform.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/transform.hpp> need to be included to use these functionalities.
+/// Add transformation matrices
 
 #pragma once
 
@@ -19,6 +19,10 @@
 #include "../glm.hpp"
 #include "../gtc/matrix_transform.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_transform extension included")
 #endif
@@ -31,24 +35,24 @@ namespace glm
 	/// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars.
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> translate(
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> translate(
+		vec<3, T, Q> const& v);
 
-	/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in radians. 
+	/// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in radians.
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> rotate(
-		T angle, 
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> rotate(
+		T angle,
+		vec<3, T, Q> const& v);
 
 	/// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components.
 	/// @see gtc_matrix_transform
 	/// @see gtx_transform
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat4x4<T, P> scale(
-		tvec3<T, P> const & v);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> scale(
+		vec<3, T, Q> const& v);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/transform.inl b/external/include/glm/gtx/transform.inl
index 516d866..56bfc90 100644
--- a/external/include/glm/gtx/transform.inl
+++ b/external/include/glm/gtx/transform.inl
@@ -3,22 +3,22 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> translate(tvec3<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> translate(vec<3, T, Q> const& v)
 	{
-		return translate(tmat4x4<T, P>(static_cast<T>(1)), v);
+		return translate(mat<4, 4, T, Q>(static_cast<T>(1)), v);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> rotate(T angle, tvec3<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> rotate(T angle, vec<3, T, Q> const& v)
 	{
-		return rotate(tmat4x4<T, P>(static_cast<T>(1)), angle, v);
+		return rotate(mat<4, 4, T, Q>(static_cast<T>(1)), angle, v);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> scale(tvec3<T, P> const & v)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> scale(vec<3, T, Q> const& v)
 	{
-		return scale(tmat4x4<T, P>(static_cast<T>(1)), v);
+		return scale(mat<4, 4, T, Q>(static_cast<T>(1)), v);
 	}
 
 }//namespace glm
diff --git a/external/include/glm/gtx/transform2.hpp b/external/include/glm/gtx/transform2.hpp
index bf5fbc9..2966cce 100644
--- a/external/include/glm/gtx/transform2.hpp
+++ b/external/include/glm/gtx/transform2.hpp
@@ -7,9 +7,9 @@
 /// @defgroup gtx_transform2 GLM_GTX_transform2
 /// @ingroup gtx
 ///
-/// @brief Add extra transformation matrices
+/// Include <glm/gtx/transform2.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/transform2.hpp> need to be included to use these functionalities.
+/// Add extra transformation matrices
 
 #pragma once
 
@@ -17,6 +17,10 @@
 #include "../glm.hpp"
 #include "../gtx/transform.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_transform2 extension included")
 #endif
@@ -28,78 +32,56 @@ namespace glm
 
 	//! Transforms a matrix with a shearing on X axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL tmat3x3<T, P> shearX2D(
-		tmat3x3<T, P> const & m, 
-		T y);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> shearX2D(mat<3, 3, T, Q> const& m, T y);
 
 	//! Transforms a matrix with a shearing on Y axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat3x3<T, P> shearY2D(
-		tmat3x3<T, P> const & m, 
-		T x);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> shearY2D(mat<3, 3, T, Q> const& m, T x);
 
 	//! Transforms a matrix with a shearing on X axis
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat4x4<T, P> shearX3D(
-		const tmat4x4<T, P> & m,
-		T y, 
-		T z);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> shearX3D(mat<4, 4, T, Q> const& m, T y, T z);
 
 	//! Transforms a matrix with a shearing on Y axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat4x4<T, P> shearY3D(
-		const tmat4x4<T, P> & m, 
-		T x, 
-		T z);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> shearY3D(mat<4, 4, T, Q> const& m, T x, T z);
 
-	//! Transforms a matrix with a shearing on Z axis. 
+	//! Transforms a matrix with a shearing on Z axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat4x4<T, P> shearZ3D(
-		const tmat4x4<T, P> & m, 
-		T x, 
-		T y);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> shearZ3D(mat<4, 4, T, Q> const& m, T x, T y);
 
-	//template <typename T> GLM_FUNC_QUALIFIER tmat4x4<T, P> shear(const tmat4x4<T, P> & m, shearPlane, planePoint, angle)
+	//template<typename T> GLM_FUNC_QUALIFIER mat<4, 4, T, Q> shear(const mat<4, 4, T, Q> & m, shearPlane, planePoint, angle)
 	// Identity + tan(angle) * cross(Normal, OnPlaneVector)     0
 	// - dot(PointOnPlane, normal) * OnPlaneVector              1
 
 	// Reflect functions seem to don't work
-	//template <typename T> tmat3x3<T, P> reflect2D(const tmat3x3<T, P> & m, const tvec3<T, P>& normal){return reflect2DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
-	//template <typename T> tmat4x4<T, P> reflect3D(const tmat4x4<T, P> & m, const tvec3<T, P>& normal){return reflect3DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
-		
+	//template<typename T> mat<3, 3, T, Q> reflect2D(const mat<3, 3, T, Q> & m, const vec<3, T, Q>& normal){return reflect2DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
+	//template<typename T> mat<4, 4, T, Q> reflect3D(const mat<4, 4, T, Q> & m, const vec<3, T, Q>& normal){return reflect3DGTX(m, normal);}									//!< \brief Build a reflection matrix (from GLM_GTX_transform2 extension)
+
 	//! Build planar projection matrix along normal axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat3x3<T, P> proj2D(
-		const tmat3x3<T, P> & m, 
-		const tvec3<T, P>& normal);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<3, 3, T, Q> proj2D(mat<3, 3, T, Q> const& m, vec<3, T, Q> const& normal);
 
 	//! Build planar projection matrix along normal axis.
 	//! From GLM_GTX_transform2 extension.
-	template <typename T, precision P> 
-	GLM_FUNC_DECL tmat4x4<T, P> proj3D(
-		const tmat4x4<T, P> & m, 
-		const tvec3<T, P>& normal);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> proj3D(mat<4, 4, T, Q> const & m, vec<3, T, Q> const& normal);
 
-	//! Build a scale bias matrix. 
+	//! Build a scale bias matrix.
 	//! From GLM_GTX_transform2 extension.
-	template <typename valType, precision P> 
-	GLM_FUNC_DECL tmat4x4<valType, P> scaleBias(
-		valType scale, 
-		valType bias);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> scaleBias(T scale, T bias);
 
 	//! Build a scale bias matrix.
 	//! From GLM_GTX_transform2 extension.
-	template <typename valType, precision P> 
-	GLM_FUNC_DECL tmat4x4<valType, P> scaleBias(
-		tmat4x4<valType, P> const & m, 
-		valType scale, 
-		valType bias);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL mat<4, 4, T, Q> scaleBias(mat<4, 4, T, Q> const& m, T scale, T bias);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/transform2.inl b/external/include/glm/gtx/transform2.inl
index 6e0ab31..59091eb 100644
--- a/external/include/glm/gtx/transform2.inl
+++ b/external/include/glm/gtx/transform2.inl
@@ -3,53 +3,53 @@
 
 namespace glm
 {
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearX2D(tmat3x3<T, P> const& m, T s)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearX2D(mat<3, 3, T, Q> const& m, T s)
 	{
-		tmat3x3<T, P> r(1);
+		mat<3, 3, T, Q> r(1);
 		r[1][0] = s;
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> shearY2D(tmat3x3<T, P> const& m, T s)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> shearY2D(mat<3, 3, T, Q> const& m, T s)
 	{
-		tmat3x3<T, P> r(1);
+		mat<3, 3, T, Q> r(1);
 		r[0][1] = s;
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> shearX3D(tmat4x4<T, P> const& m, T s, T t)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> shearX3D(mat<4, 4, T, Q> const& m, T s, T t)
 	{
-		tmat4x4<T, P> r(1);
+		mat<4, 4, T, Q> r(1);
 		r[0][1] = s;
 		r[0][2] = t;
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> shearY3D(tmat4x4<T, P> const& m, T s, T t)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> shearY3D(mat<4, 4, T, Q> const& m, T s, T t)
 	{
-		tmat4x4<T, P> r(1);
+		mat<4, 4, T, Q> r(1);
 		r[1][0] = s;
 		r[1][2] = t;
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> shearZ3D(tmat4x4<T, P> const& m, T s, T t)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> shearZ3D(mat<4, 4, T, Q> const& m, T s, T t)
 	{
-		tmat4x4<T, P> r(1);
+		mat<4, 4, T, Q> r(1);
 		r[2][0] = s;
 		r[2][1] = t;
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> reflect2D(tmat3x3<T, P> const& m, tvec3<T, P> const& normal)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> reflect2D(mat<3, 3, T, Q> const& m, vec<3, T, Q> const& normal)
 	{
-		tmat3x3<T, P> r(static_cast<T>(1));
+		mat<3, 3, T, Q> r(static_cast<T>(1));
 		r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x;
 		r[0][1] = -static_cast<T>(2) * normal.x * normal.y;
 		r[1][0] = -static_cast<T>(2) * normal.x * normal.y;
@@ -57,10 +57,10 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> reflect3D(tmat4x4<T, P> const& m, tvec3<T, P> const& normal)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> reflect3D(mat<4, 4, T, Q> const& m, vec<3, T, Q> const& normal)
 	{
-		tmat4x4<T, P> r(static_cast<T>(1));
+		mat<4, 4, T, Q> r(static_cast<T>(1));
 		r[0][0] = static_cast<T>(1) - static_cast<T>(2) * normal.x * normal.x;
 		r[0][1] = -static_cast<T>(2) * normal.x * normal.y;
 		r[0][2] = -static_cast<T>(2) * normal.x * normal.z;
@@ -75,12 +75,12 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat3x3<T, P> proj2D(
-		const tmat3x3<T, P>& m, 
-		const tvec3<T, P>& normal)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<3, 3, T, Q> proj2D(
+		const mat<3, 3, T, Q>& m,
+		const vec<3, T, Q>& normal)
 	{
-		tmat3x3<T, P> r(static_cast<T>(1));
+		mat<3, 3, T, Q> r(static_cast<T>(1));
 		r[0][0] = static_cast<T>(1) - normal.x * normal.x;
 		r[0][1] = - normal.x * normal.y;
 		r[1][0] = - normal.x * normal.y;
@@ -88,12 +88,12 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> proj3D(
-		const tmat4x4<T, P>& m, 
-		const tvec3<T, P>& normal)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> proj3D(
+		const mat<4, 4, T, Q>& m,
+		const vec<3, T, Q>& normal)
 	{
-		tmat4x4<T, P> r(static_cast<T>(1));
+		mat<4, 4, T, Q> r(static_cast<T>(1));
 		r[0][0] = static_cast<T>(1) - normal.x * normal.x;
 		r[0][1] = - normal.x * normal.y;
 		r[0][2] = - normal.x * normal.z;
@@ -106,19 +106,19 @@ namespace glm
 		return m * r;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(T scale, T bias)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> scaleBias(T scale, T bias)
 	{
-		tmat4x4<T, P> result;
-		result[3] = tvec4<T, P>(tvec3<T, P>(bias), static_cast<T>(1));
+		mat<4, 4, T, Q> result;
+		result[3] = vec<4, T, Q>(vec<3, T, Q>(bias), static_cast<T>(1));
 		result[0][0] = scale;
 		result[1][1] = scale;
 		result[2][2] = scale;
 		return result;
 	}
 
-	template <typename T, precision P> 
-	GLM_FUNC_QUALIFIER tmat4x4<T, P> scaleBias(tmat4x4<T, P> const& m, T scale, T bias)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER mat<4, 4, T, Q> scaleBias(mat<4, 4, T, Q> const& m, T scale, T bias)
 	{
 		return m * scaleBias(scale, bias);
 	}
diff --git a/external/include/glm/gtx/type_aligned.hpp b/external/include/glm/gtx/type_aligned.hpp
index 8962a6f..fdfadd4 100644
--- a/external/include/glm/gtx/type_aligned.hpp
+++ b/external/include/glm/gtx/type_aligned.hpp
@@ -7,17 +7,21 @@
 /// @defgroup gtx_type_aligned GLM_GTX_type_aligned
 /// @ingroup gtx
 ///
-/// @brief Defines aligned types.
+/// Include <glm/gtx/type_aligned.hpp> to use the features of this extension.
 ///
-/// @ref core_precision defines aligned types.
+/// Defines aligned types.
 ///
-/// <glm/gtx/type_aligned.hpp> need to be included to use these functionalities.
+/// @ref core_precision defines aligned types.
 
 #pragma once
 
 // Dependency:
 #include "../gtc/type_precision.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_type_aligned extension included")
 #endif
@@ -25,296 +29,296 @@
 namespace glm
 {
 	///////////////////////////
-	// Signed int vector types 
+	// Signed int vector types
 
 	/// @addtogroup gtx_type_aligned
 	/// @{
 
-	/// Low precision 8 bit signed integer aligned scalar type.
+	/// Low qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int8, aligned_lowp_int8, 1);
 
-	/// Low precision 16 bit signed integer aligned scalar type.
+	/// Low qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int16, aligned_lowp_int16, 2);
 
-	/// Low precision 32 bit signed integer aligned scalar type.
+	/// Low qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int32, aligned_lowp_int32, 4);
 
-	/// Low precision 64 bit signed integer aligned scalar type.
+	/// Low qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int64, aligned_lowp_int64, 8);
 
 
-	/// Low precision 8 bit signed integer aligned scalar type.
+	/// Low qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int8_t, aligned_lowp_int8_t, 1);
 
-	/// Low precision 16 bit signed integer aligned scalar type.
+	/// Low qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int16_t, aligned_lowp_int16_t, 2);
 
-	/// Low precision 32 bit signed integer aligned scalar type.
+	/// Low qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int32_t, aligned_lowp_int32_t, 4);
 
-	/// Low precision 64 bit signed integer aligned scalar type.
+	/// Low qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_int64_t, aligned_lowp_int64_t, 8);
 
 
-	/// Low precision 8 bit signed integer aligned scalar type.
+	/// Low qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_i8, aligned_lowp_i8, 1);
 
-	/// Low precision 16 bit signed integer aligned scalar type.
+	/// Low qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_i16, aligned_lowp_i16, 2);
 
-	/// Low precision 32 bit signed integer aligned scalar type.
+	/// Low qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_i32, aligned_lowp_i32, 4);
 
-	/// Low precision 64 bit signed integer aligned scalar type.
+	/// Low qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_i64, aligned_lowp_i64, 8);
 
 
-	/// Medium precision 8 bit signed integer aligned scalar type.
+	/// Medium qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int8, aligned_mediump_int8, 1);
 
-	/// Medium precision 16 bit signed integer aligned scalar type.
+	/// Medium qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int16, aligned_mediump_int16, 2);
 
-	/// Medium precision 32 bit signed integer aligned scalar type.
+	/// Medium qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int32, aligned_mediump_int32, 4);
 
-	/// Medium precision 64 bit signed integer aligned scalar type.
+	/// Medium qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int64, aligned_mediump_int64, 8);
 
 
-	/// Medium precision 8 bit signed integer aligned scalar type.
+	/// Medium qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int8_t, aligned_mediump_int8_t, 1);
 
-	/// Medium precision 16 bit signed integer aligned scalar type.
+	/// Medium qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int16_t, aligned_mediump_int16_t, 2);
 
-	/// Medium precision 32 bit signed integer aligned scalar type.
+	/// Medium qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int32_t, aligned_mediump_int32_t, 4);
 
-	/// Medium precision 64 bit signed integer aligned scalar type.
+	/// Medium qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_int64_t, aligned_mediump_int64_t, 8);
 
 
-	/// Medium precision 8 bit signed integer aligned scalar type.
+	/// Medium qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_i8, aligned_mediump_i8, 1);
 
-	/// Medium precision 16 bit signed integer aligned scalar type.
+	/// Medium qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_i16, aligned_mediump_i16, 2);
 
-	/// Medium precision 32 bit signed integer aligned scalar type.
+	/// Medium qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_i32, aligned_mediump_i32, 4);
 
-	/// Medium precision 64 bit signed integer aligned scalar type.
+	/// Medium qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_i64, aligned_mediump_i64, 8);
 
 
-	/// High precision 8 bit signed integer aligned scalar type.
+	/// High qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int8, aligned_highp_int8, 1);
 
-	/// High precision 16 bit signed integer aligned scalar type.
+	/// High qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int16, aligned_highp_int16, 2);
 
-	/// High precision 32 bit signed integer aligned scalar type.
+	/// High qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int32, aligned_highp_int32, 4);
 
-	/// High precision 64 bit signed integer aligned scalar type.
+	/// High qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int64, aligned_highp_int64, 8);
 
 
-	/// High precision 8 bit signed integer aligned scalar type.
+	/// High qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int8_t, aligned_highp_int8_t, 1);
 
-	/// High precision 16 bit signed integer aligned scalar type.
+	/// High qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int16_t, aligned_highp_int16_t, 2);
 
-	/// High precision 32 bit signed integer aligned scalar type.
+	/// High qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int32_t, aligned_highp_int32_t, 4);
 
-	/// High precision 64 bit signed integer aligned scalar type.
+	/// High qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_int64_t, aligned_highp_int64_t, 8);
 
 
-	/// High precision 8 bit signed integer aligned scalar type.
+	/// High qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_i8, aligned_highp_i8, 1);
 
-	/// High precision 16 bit signed integer aligned scalar type.
+	/// High qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_i16, aligned_highp_i16, 2);
 
-	/// High precision 32 bit signed integer aligned scalar type.
+	/// High qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_i32, aligned_highp_i32, 4);
 
-	/// High precision 64 bit signed integer aligned scalar type.
+	/// High qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_i64, aligned_highp_i64, 8);
 
 
-	/// Default precision 8 bit signed integer aligned scalar type.
+	/// Default qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int8, aligned_int8, 1);
 
-	/// Default precision 16 bit signed integer aligned scalar type.
+	/// Default qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int16, aligned_int16, 2);
 
-	/// Default precision 32 bit signed integer aligned scalar type.
+	/// Default qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int32, aligned_int32, 4);
 
-	/// Default precision 64 bit signed integer aligned scalar type.
+	/// Default qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int64, aligned_int64, 8);
 
 
-	/// Default precision 8 bit signed integer aligned scalar type.
+	/// Default qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int8_t, aligned_int8_t, 1);
 
-	/// Default precision 16 bit signed integer aligned scalar type.
+	/// Default qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int16_t, aligned_int16_t, 2);
 
-	/// Default precision 32 bit signed integer aligned scalar type.
+	/// Default qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int32_t, aligned_int32_t, 4);
 
-	/// Default precision 64 bit signed integer aligned scalar type.
+	/// Default qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(int64_t, aligned_int64_t, 8);
 
 
-	/// Default precision 8 bit signed integer aligned scalar type.
+	/// Default qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i8, aligned_i8, 1);
 
-	/// Default precision 16 bit signed integer aligned scalar type.
+	/// Default qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i16, aligned_i16, 2);
 
-	/// Default precision 32 bit signed integer aligned scalar type.
+	/// Default qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i32, aligned_i32, 4);
 
-	/// Default precision 64 bit signed integer aligned scalar type.
+	/// Default qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i64, aligned_i64, 8);
 
 
-	/// Default precision 32 bit signed integer aligned scalar type.
+	/// Default qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(ivec1, aligned_ivec1, 4);
-	
-	/// Default precision 32 bit signed integer aligned vector of 2 components type.
+
+	/// Default qualifier 32 bit signed integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(ivec2, aligned_ivec2, 8);
 
-	/// Default precision 32 bit signed integer aligned vector of 3 components type.
+	/// Default qualifier 32 bit signed integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(ivec3, aligned_ivec3, 16);
 
-	/// Default precision 32 bit signed integer aligned vector of 4 components type.
+	/// Default qualifier 32 bit signed integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(ivec4, aligned_ivec4, 16);
 
 
-	/// Default precision 8 bit signed integer aligned scalar type.
+	/// Default qualifier 8 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i8vec1, aligned_i8vec1, 1);
 
-	/// Default precision 8 bit signed integer aligned vector of 2 components type.
+	/// Default qualifier 8 bit signed integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i8vec2, aligned_i8vec2, 2);
 
-	/// Default precision 8 bit signed integer aligned vector of 3 components type.
+	/// Default qualifier 8 bit signed integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i8vec3, aligned_i8vec3, 4);
 
-	/// Default precision 8 bit signed integer aligned vector of 4 components type.
+	/// Default qualifier 8 bit signed integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i8vec4, aligned_i8vec4, 4);
 
 
-	/// Default precision 16 bit signed integer aligned scalar type.
+	/// Default qualifier 16 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i16vec1, aligned_i16vec1, 2);
-	
-	/// Default precision 16 bit signed integer aligned vector of 2 components type.
+
+	/// Default qualifier 16 bit signed integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i16vec2, aligned_i16vec2, 4);
 
-	/// Default precision 16 bit signed integer aligned vector of 3 components type.
+	/// Default qualifier 16 bit signed integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i16vec3, aligned_i16vec3, 8);
 
-	/// Default precision 16 bit signed integer aligned vector of 4 components type.
+	/// Default qualifier 16 bit signed integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i16vec4, aligned_i16vec4, 8);
 
 
-	/// Default precision 32 bit signed integer aligned scalar type.
+	/// Default qualifier 32 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i32vec1, aligned_i32vec1, 4);
-	
-	/// Default precision 32 bit signed integer aligned vector of 2 components type.
+
+	/// Default qualifier 32 bit signed integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i32vec2, aligned_i32vec2, 8);
 
-	/// Default precision 32 bit signed integer aligned vector of 3 components type.
+	/// Default qualifier 32 bit signed integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i32vec3, aligned_i32vec3, 16);
 
-	/// Default precision 32 bit signed integer aligned vector of 4 components type.
+	/// Default qualifier 32 bit signed integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i32vec4, aligned_i32vec4, 16);
 
 
-	/// Default precision 64 bit signed integer aligned scalar type.
+	/// Default qualifier 64 bit signed integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i64vec1, aligned_i64vec1, 8);
-	
-	/// Default precision 64 bit signed integer aligned vector of 2 components type.
+
+	/// Default qualifier 64 bit signed integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i64vec2, aligned_i64vec2, 16);
 
-	/// Default precision 64 bit signed integer aligned vector of 3 components type.
+	/// Default qualifier 64 bit signed integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i64vec3, aligned_i64vec3, 32);
 
-	/// Default precision 64 bit signed integer aligned vector of 4 components type.
+	/// Default qualifier 64 bit signed integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(i64vec4, aligned_i64vec4, 32);
 
@@ -322,291 +326,291 @@ namespace glm
 	/////////////////////////////
 	// Unsigned int vector types
 
-	/// Low precision 8 bit unsigned integer aligned scalar type.
+	/// Low qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint8, aligned_lowp_uint8, 1);
 
-	/// Low precision 16 bit unsigned integer aligned scalar type.
+	/// Low qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint16, aligned_lowp_uint16, 2);
 
-	/// Low precision 32 bit unsigned integer aligned scalar type.
+	/// Low qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint32, aligned_lowp_uint32, 4);
 
-	/// Low precision 64 bit unsigned integer aligned scalar type.
+	/// Low qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint64, aligned_lowp_uint64, 8);
 
 
-	/// Low precision 8 bit unsigned integer aligned scalar type.
+	/// Low qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint8_t, aligned_lowp_uint8_t, 1);
 
-	/// Low precision 16 bit unsigned integer aligned scalar type.
+	/// Low qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint16_t, aligned_lowp_uint16_t, 2);
 
-	/// Low precision 32 bit unsigned integer aligned scalar type.
+	/// Low qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint32_t, aligned_lowp_uint32_t, 4);
 
-	/// Low precision 64 bit unsigned integer aligned scalar type.
+	/// Low qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_uint64_t, aligned_lowp_uint64_t, 8);
 
 
-	/// Low precision 8 bit unsigned integer aligned scalar type.
+	/// Low qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_u8, aligned_lowp_u8, 1);
 
-	/// Low precision 16 bit unsigned integer aligned scalar type.
+	/// Low qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_u16, aligned_lowp_u16, 2);
 
-	/// Low precision 32 bit unsigned integer aligned scalar type.
+	/// Low qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_u32, aligned_lowp_u32, 4);
 
-	/// Low precision 64 bit unsigned integer aligned scalar type.
+	/// Low qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(lowp_u64, aligned_lowp_u64, 8);
 
 
-	/// Medium precision 8 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint8, aligned_mediump_uint8, 1);
 
-	/// Medium precision 16 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint16, aligned_mediump_uint16, 2);
 
-	/// Medium precision 32 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint32, aligned_mediump_uint32, 4);
 
-	/// Medium precision 64 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint64, aligned_mediump_uint64, 8);
 
 
-	/// Medium precision 8 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint8_t, aligned_mediump_uint8_t, 1);
 
-	/// Medium precision 16 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint16_t, aligned_mediump_uint16_t, 2);
 
-	/// Medium precision 32 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint32_t, aligned_mediump_uint32_t, 4);
 
-	/// Medium precision 64 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_uint64_t, aligned_mediump_uint64_t, 8);
 
 
-	/// Medium precision 8 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_u8, aligned_mediump_u8, 1);
 
-	/// Medium precision 16 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_u16, aligned_mediump_u16, 2);
 
-	/// Medium precision 32 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_u32, aligned_mediump_u32, 4);
 
-	/// Medium precision 64 bit unsigned integer aligned scalar type.
+	/// Medium qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mediump_u64, aligned_mediump_u64, 8);
 
 
-	/// High precision 8 bit unsigned integer aligned scalar type.
+	/// High qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint8, aligned_highp_uint8, 1);
 
-	/// High precision 16 bit unsigned integer aligned scalar type.
+	/// High qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint16, aligned_highp_uint16, 2);
 
-	/// High precision 32 bit unsigned integer aligned scalar type.
+	/// High qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint32, aligned_highp_uint32, 4);
 
-	/// High precision 64 bit unsigned integer aligned scalar type.
+	/// High qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint64, aligned_highp_uint64, 8);
 
 
-	/// High precision 8 bit unsigned integer aligned scalar type.
+	/// High qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint8_t, aligned_highp_uint8_t, 1);
 
-	/// High precision 16 bit unsigned integer aligned scalar type.
+	/// High qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint16_t, aligned_highp_uint16_t, 2);
 
-	/// High precision 32 bit unsigned integer aligned scalar type.
+	/// High qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint32_t, aligned_highp_uint32_t, 4);
 
-	/// High precision 64 bit unsigned integer aligned scalar type.
+	/// High qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_uint64_t, aligned_highp_uint64_t, 8);
 
 
-	/// High precision 8 bit unsigned integer aligned scalar type.
+	/// High qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_u8, aligned_highp_u8, 1);
 
-	/// High precision 16 bit unsigned integer aligned scalar type.
+	/// High qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_u16, aligned_highp_u16, 2);
 
-	/// High precision 32 bit unsigned integer aligned scalar type.
+	/// High qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_u32, aligned_highp_u32, 4);
 
-	/// High precision 64 bit unsigned integer aligned scalar type.
+	/// High qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(highp_u64, aligned_highp_u64, 8);
 
 
-	/// Default precision 8 bit unsigned integer aligned scalar type.
+	/// Default qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint8, aligned_uint8, 1);
 
-	/// Default precision 16 bit unsigned integer aligned scalar type.
+	/// Default qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint16, aligned_uint16, 2);
 
-	/// Default precision 32 bit unsigned integer aligned scalar type.
+	/// Default qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint32, aligned_uint32, 4);
 
-	/// Default precision 64 bit unsigned integer aligned scalar type.
+	/// Default qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint64, aligned_uint64, 8);
 
 
-	/// Default precision 8 bit unsigned integer aligned scalar type.
+	/// Default qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint8_t, aligned_uint8_t, 1);
 
-	/// Default precision 16 bit unsigned integer aligned scalar type.
+	/// Default qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint16_t, aligned_uint16_t, 2);
 
-	/// Default precision 32 bit unsigned integer aligned scalar type.
+	/// Default qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint32_t, aligned_uint32_t, 4);
 
-	/// Default precision 64 bit unsigned integer aligned scalar type.
+	/// Default qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uint64_t, aligned_uint64_t, 8);
 
 
-	/// Default precision 8 bit unsigned integer aligned scalar type.
+	/// Default qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u8, aligned_u8, 1);
 
-	/// Default precision 16 bit unsigned integer aligned scalar type.
+	/// Default qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u16, aligned_u16, 2);
 
-	/// Default precision 32 bit unsigned integer aligned scalar type.
+	/// Default qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u32, aligned_u32, 4);
 
-	/// Default precision 64 bit unsigned integer aligned scalar type.
+	/// Default qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u64, aligned_u64, 8);
 
 
-	/// Default precision 32 bit unsigned integer aligned scalar type.
+	/// Default qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uvec1, aligned_uvec1, 4);
-	
-	/// Default precision 32 bit unsigned integer aligned vector of 2 components type.
+
+	/// Default qualifier 32 bit unsigned integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uvec2, aligned_uvec2, 8);
 
-	/// Default precision 32 bit unsigned integer aligned vector of 3 components type.
+	/// Default qualifier 32 bit unsigned integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uvec3, aligned_uvec3, 16);
 
-	/// Default precision 32 bit unsigned integer aligned vector of 4 components type.
+	/// Default qualifier 32 bit unsigned integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(uvec4, aligned_uvec4, 16);
 
 
-	/// Default precision 8 bit unsigned integer aligned scalar type.
+	/// Default qualifier 8 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u8vec1, aligned_u8vec1, 1);
 
-	/// Default precision 8 bit unsigned integer aligned vector of 2 components type.
+	/// Default qualifier 8 bit unsigned integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u8vec2, aligned_u8vec2, 2);
 
-	/// Default precision 8 bit unsigned integer aligned vector of 3 components type.
+	/// Default qualifier 8 bit unsigned integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u8vec3, aligned_u8vec3, 4);
 
-	/// Default precision 8 bit unsigned integer aligned vector of 4 components type.
+	/// Default qualifier 8 bit unsigned integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u8vec4, aligned_u8vec4, 4);
 
 
-	/// Default precision 16 bit unsigned integer aligned scalar type.
+	/// Default qualifier 16 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u16vec1, aligned_u16vec1, 2);
-	
-	/// Default precision 16 bit unsigned integer aligned vector of 2 components type.
+
+	/// Default qualifier 16 bit unsigned integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u16vec2, aligned_u16vec2, 4);
 
-	/// Default precision 16 bit unsigned integer aligned vector of 3 components type.
+	/// Default qualifier 16 bit unsigned integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u16vec3, aligned_u16vec3, 8);
 
-	/// Default precision 16 bit unsigned integer aligned vector of 4 components type.
+	/// Default qualifier 16 bit unsigned integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u16vec4, aligned_u16vec4, 8);
 
 
-	/// Default precision 32 bit unsigned integer aligned scalar type.
+	/// Default qualifier 32 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u32vec1, aligned_u32vec1, 4);
-	
-	/// Default precision 32 bit unsigned integer aligned vector of 2 components type.
+
+	/// Default qualifier 32 bit unsigned integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u32vec2, aligned_u32vec2, 8);
 
-	/// Default precision 32 bit unsigned integer aligned vector of 3 components type.
+	/// Default qualifier 32 bit unsigned integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u32vec3, aligned_u32vec3, 16);
 
-	/// Default precision 32 bit unsigned integer aligned vector of 4 components type.
+	/// Default qualifier 32 bit unsigned integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u32vec4, aligned_u32vec4, 16);
 
 
-	/// Default precision 64 bit unsigned integer aligned scalar type.
+	/// Default qualifier 64 bit unsigned integer aligned scalar type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u64vec1, aligned_u64vec1, 8);
-	
-	/// Default precision 64 bit unsigned integer aligned vector of 2 components type.
+
+	/// Default qualifier 64 bit unsigned integer aligned vector of 2 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u64vec2, aligned_u64vec2, 16);
 
-	/// Default precision 64 bit unsigned integer aligned vector of 3 components type.
+	/// Default qualifier 64 bit unsigned integer aligned vector of 3 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u64vec3, aligned_u64vec3, 32);
 
-	/// Default precision 64 bit unsigned integer aligned vector of 4 components type.
+	/// Default qualifier 64 bit unsigned integer aligned vector of 4 components type.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(u64vec4, aligned_u64vec4, 32);
 
@@ -614,352 +618,365 @@ namespace glm
 	//////////////////////
 	// Float vector types
 
-	/// 32 bit single-precision floating-point aligned scalar.
+	/// 32 bit single-qualifier floating-point aligned scalar.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(float32, aligned_float32, 4);
 
-	/// 64 bit double-precision floating-point aligned scalar.
-	/// @see gtx_type_aligned
-	GLM_ALIGNED_TYPEDEF(float64, aligned_float64, 8);
-
-
-	/// 32 bit single-precision floating-point aligned scalar.
+	/// 32 bit single-qualifier floating-point aligned scalar.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(float32_t, aligned_float32_t, 4);
 
-	/// 64 bit double-precision floating-point aligned scalar.
+	/// 32 bit single-qualifier floating-point aligned scalar.
 	/// @see gtx_type_aligned
-	GLM_ALIGNED_TYPEDEF(float64_t, aligned_float64_t, 8);
+	GLM_ALIGNED_TYPEDEF(float32, aligned_f32, 4);
 
+#	ifndef GLM_FORCE_SINGLE_ONLY
 
-	/// 32 bit single-precision floating-point aligned scalar.
+	/// 64 bit double-qualifier floating-point aligned scalar.
 	/// @see gtx_type_aligned
-	GLM_ALIGNED_TYPEDEF(float32, aligned_f32, 4);
+	GLM_ALIGNED_TYPEDEF(float64, aligned_float64, 8);
+
+	/// 64 bit double-qualifier floating-point aligned scalar.
+	/// @see gtx_type_aligned
+	GLM_ALIGNED_TYPEDEF(float64_t, aligned_float64_t, 8);
 
-	/// 64 bit double-precision floating-point aligned scalar.
+	/// 64 bit double-qualifier floating-point aligned scalar.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(float64, aligned_f64, 8);
 
+#	endif//GLM_FORCE_SINGLE_ONLY
 
-	/// Single-precision floating-point aligned vector of 1 component.
+
+	/// Single-qualifier floating-point aligned vector of 1 component.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(vec1, aligned_vec1, 4);
 
-	/// Single-precision floating-point aligned vector of 2 components.
+	/// Single-qualifier floating-point aligned vector of 2 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(vec2, aligned_vec2, 8);
 
-	/// Single-precision floating-point aligned vector of 3 components.
+	/// Single-qualifier floating-point aligned vector of 3 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(vec3, aligned_vec3, 16);
 
-	/// Single-precision floating-point aligned vector of 4 components.
+	/// Single-qualifier floating-point aligned vector of 4 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(vec4, aligned_vec4, 16);
 
 
-	/// Single-precision floating-point aligned vector of 1 component.
+	/// Single-qualifier floating-point aligned vector of 1 component.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fvec1, aligned_fvec1, 4);
 
-	/// Single-precision floating-point aligned vector of 2 components.
+	/// Single-qualifier floating-point aligned vector of 2 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fvec2, aligned_fvec2, 8);
 
-	/// Single-precision floating-point aligned vector of 3 components.
+	/// Single-qualifier floating-point aligned vector of 3 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fvec3, aligned_fvec3, 16);
 
-	/// Single-precision floating-point aligned vector of 4 components.
+	/// Single-qualifier floating-point aligned vector of 4 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fvec4, aligned_fvec4, 16);
 
-	
-	/// Single-precision floating-point aligned vector of 1 component.
+
+	/// Single-qualifier floating-point aligned vector of 1 component.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32vec1, aligned_f32vec1, 4);
 
-	/// Single-precision floating-point aligned vector of 2 components.
+	/// Single-qualifier floating-point aligned vector of 2 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32vec2, aligned_f32vec2, 8);
 
-	/// Single-precision floating-point aligned vector of 3 components.
+	/// Single-qualifier floating-point aligned vector of 3 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32vec3, aligned_f32vec3, 16);
 
-	/// Single-precision floating-point aligned vector of 4 components.
+	/// Single-qualifier floating-point aligned vector of 4 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32vec4, aligned_f32vec4, 16);
 
 
-	/// Double-precision floating-point aligned vector of 1 component.
+	/// Double-qualifier floating-point aligned vector of 1 component.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(dvec1, aligned_dvec1, 8);
 
-	/// Double-precision floating-point aligned vector of 2 components.
+	/// Double-qualifier floating-point aligned vector of 2 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(dvec2, aligned_dvec2, 16);
 
-	/// Double-precision floating-point aligned vector of 3 components.
+	/// Double-qualifier floating-point aligned vector of 3 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(dvec3, aligned_dvec3, 32);
 
-	/// Double-precision floating-point aligned vector of 4 components.
+	/// Double-qualifier floating-point aligned vector of 4 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(dvec4, aligned_dvec4, 32);
 
 
-	/// Double-precision floating-point aligned vector of 1 component.
+#	ifndef GLM_FORCE_SINGLE_ONLY
+
+	/// Double-qualifier floating-point aligned vector of 1 component.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64vec1, aligned_f64vec1, 8);
 
-	/// Double-precision floating-point aligned vector of 2 components.
+	/// Double-qualifier floating-point aligned vector of 2 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64vec2, aligned_f64vec2, 16);
 
-	/// Double-precision floating-point aligned vector of 3 components.
+	/// Double-qualifier floating-point aligned vector of 3 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64vec3, aligned_f64vec3, 32);
 
-	/// Double-precision floating-point aligned vector of 4 components.
+	/// Double-qualifier floating-point aligned vector of 4 components.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64vec4, aligned_f64vec4, 32);
 
+#	endif//GLM_FORCE_SINGLE_ONLY
 
 	//////////////////////
-	// Float matrix types 
+	// Float matrix types
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef detail::tmat1<f32> mat1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat2, aligned_mat2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat3, aligned_mat3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat4, aligned_mat4, 16);
 
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef detail::tmat1x1<f32> mat1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat2x2, aligned_mat2x2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat3x3, aligned_mat3x3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(mat4x4, aligned_mat4x4, 16);
 
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef detail::tmat1x1<f32> fmat1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4, 16);
 
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef f32 fmat1x1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2x2, 16);
 
-	/// Single-precision floating-point aligned 2x3 matrix.
+	/// Single-qualifier floating-point aligned 2x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat2x3, aligned_fmat2x3, 16);
 
-	/// Single-precision floating-point aligned 2x4 matrix.
+	/// Single-qualifier floating-point aligned 2x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat2x4, aligned_fmat2x4, 16);
 
-	/// Single-precision floating-point aligned 3x2 matrix.
+	/// Single-qualifier floating-point aligned 3x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat3x2, aligned_fmat3x2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3x3, 16);
 
-	/// Single-precision floating-point aligned 3x4 matrix.
+	/// Single-qualifier floating-point aligned 3x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat3x4, aligned_fmat3x4, 16);
 
-	/// Single-precision floating-point aligned 4x2 matrix.
+	/// Single-qualifier floating-point aligned 4x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat4x2, aligned_fmat4x2, 16);
 
-	/// Single-precision floating-point aligned 4x3 matrix.
+	/// Single-qualifier floating-point aligned 4x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat4x3, aligned_fmat4x3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4x4, 16);
 
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef detail::tmat1x1<f32, defaultp> f32mat1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4, 16);
 
 
-	/// Single-precision floating-point aligned 1x1 matrix.
+	/// Single-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef f32 f32mat1x1;
 
-	/// Single-precision floating-point aligned 2x2 matrix.
+	/// Single-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2x2, 16);
 
-	/// Single-precision floating-point aligned 2x3 matrix.
+	/// Single-qualifier floating-point aligned 2x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat2x3, aligned_f32mat2x3, 16);
 
-	/// Single-precision floating-point aligned 2x4 matrix.
+	/// Single-qualifier floating-point aligned 2x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat2x4, aligned_f32mat2x4, 16);
 
-	/// Single-precision floating-point aligned 3x2 matrix.
+	/// Single-qualifier floating-point aligned 3x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat3x2, aligned_f32mat3x2, 16);
 
-	/// Single-precision floating-point aligned 3x3 matrix.
+	/// Single-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3x3, 16);
 
-	/// Single-precision floating-point aligned 3x4 matrix.
+	/// Single-qualifier floating-point aligned 3x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat3x4, aligned_f32mat3x4, 16);
 
-	/// Single-precision floating-point aligned 4x2 matrix.
+	/// Single-qualifier floating-point aligned 4x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat4x2, aligned_f32mat4x2, 16);
 
-	/// Single-precision floating-point aligned 4x3 matrix.
+	/// Single-qualifier floating-point aligned 4x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat4x3, aligned_f32mat4x3, 16);
 
-	/// Single-precision floating-point aligned 4x4 matrix.
+	/// Single-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4x4, 16);
 
 
-	/// Double-precision floating-point aligned 1x1 matrix.
+#	ifndef GLM_FORCE_SINGLE_ONLY
+
+	/// Double-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef detail::tmat1x1<f64, defaultp> f64mat1;
 
-	/// Double-precision floating-point aligned 2x2 matrix.
+	/// Double-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2, 32);
 
-	/// Double-precision floating-point aligned 3x3 matrix.
+	/// Double-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3, 32);
 
-	/// Double-precision floating-point aligned 4x4 matrix.
+	/// Double-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4, 32);
 
 
-	/// Double-precision floating-point aligned 1x1 matrix.
+	/// Double-qualifier floating-point aligned 1x1 matrix.
 	/// @see gtx_type_aligned
 	//typedef f64 f64mat1x1;
 
-	/// Double-precision floating-point aligned 2x2 matrix.
+	/// Double-qualifier floating-point aligned 2x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2x2, 32);
 
-	/// Double-precision floating-point aligned 2x3 matrix.
+	/// Double-qualifier floating-point aligned 2x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat2x3, aligned_f64mat2x3, 32);
 
-	/// Double-precision floating-point aligned 2x4 matrix.
+	/// Double-qualifier floating-point aligned 2x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat2x4, aligned_f64mat2x4, 32);
 
-	/// Double-precision floating-point aligned 3x2 matrix.
+	/// Double-qualifier floating-point aligned 3x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat3x2, aligned_f64mat3x2, 32);
 
-	/// Double-precision floating-point aligned 3x3 matrix.
+	/// Double-qualifier floating-point aligned 3x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3x3, 32);
 
-	/// Double-precision floating-point aligned 3x4 matrix.
+	/// Double-qualifier floating-point aligned 3x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat3x4, aligned_f64mat3x4, 32);
 
-	/// Double-precision floating-point aligned 4x2 matrix.
+	/// Double-qualifier floating-point aligned 4x2 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat4x2, aligned_f64mat4x2, 32);
 
-	/// Double-precision floating-point aligned 4x3 matrix.
+	/// Double-qualifier floating-point aligned 4x3 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat4x3, aligned_f64mat4x3, 32);
 
-	/// Double-precision floating-point aligned 4x4 matrix.
+	/// Double-qualifier floating-point aligned 4x4 matrix.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4x4, 32);
 
+#	endif//GLM_FORCE_SINGLE_ONLY
+
 
 	//////////////////////////
 	// Quaternion types
 
-	/// Single-precision floating-point aligned quaternion.
+	/// Single-qualifier floating-point aligned quaternion.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(quat, aligned_quat, 16);
 
-	/// Single-precision floating-point aligned quaternion.
+	/// Single-qualifier floating-point aligned quaternion.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(fquat, aligned_fquat, 16);
 
-	/// Double-precision floating-point aligned quaternion.
+	/// Double-qualifier floating-point aligned quaternion.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(dquat, aligned_dquat, 32);
 
-	/// Single-precision floating-point aligned quaternion.
+	/// Single-qualifier floating-point aligned quaternion.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f32quat, aligned_f32quat, 16);
 
-	/// Double-precision floating-point aligned quaternion.
+#	ifndef GLM_FORCE_SINGLE_ONLY
+
+	/// Double-qualifier floating-point aligned quaternion.
 	/// @see gtx_type_aligned
 	GLM_ALIGNED_TYPEDEF(f64quat, aligned_f64quat, 32);
 
+#	endif//GLM_FORCE_SINGLE_ONLY
+
 	/// @}
 }//namespace glm
 
diff --git a/external/include/glm/gtx/type_trait.hpp b/external/include/glm/gtx/type_trait.hpp
index 0207a06..637bbd1 100644
--- a/external/include/glm/gtx/type_trait.hpp
+++ b/external/include/glm/gtx/type_trait.hpp
@@ -6,25 +6,18 @@
 /// @defgroup gtx_type_trait GLM_GTX_type_trait
 /// @ingroup gtx
 ///
-/// @brief Defines traits for each type.
+/// Include <glm/gtx/type_trait.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/type_trait.hpp> need to be included to use these functionalities.
+/// Defines traits for each type.
 
 #pragma once
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 // Dependency:
-#include "../detail/type_vec2.hpp"
-#include "../detail/type_vec3.hpp"
-#include "../detail/type_vec4.hpp"
-#include "../detail/type_mat2x2.hpp"
-#include "../detail/type_mat2x3.hpp"
-#include "../detail/type_mat2x4.hpp"
-#include "../detail/type_mat3x2.hpp"
-#include "../detail/type_mat3x3.hpp"
-#include "../detail/type_mat3x4.hpp"
-#include "../detail/type_mat4x2.hpp"
-#include "../detail/type_mat4x3.hpp"
-#include "../detail/type_mat4x4.hpp"
+#include "../detail/qualifier.hpp"
 #include "../gtc/quaternion.hpp"
 #include "../gtx/dual_quaternion.hpp"
 
@@ -37,7 +30,7 @@ namespace glm
 	/// @addtogroup gtx_type_trait
 	/// @{
 
-	template <template <typename, precision> class genType, typename T, precision P>
+	template<typename T>
 	struct type
 	{
 		static bool const is_vec = false;
@@ -48,202 +41,42 @@ namespace glm
 		static length_t const rows = 0;
 	};
 
-	template <typename T, precision P>
-	struct type<tvec1, T, P>
-	{
-		static bool const is_vec = true;
-		static bool const is_mat = false;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 1
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tvec2, T, P>
-	{
-		static bool const is_vec = true;
-		static bool const is_mat = false;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tvec3, T, P>
-	{
-		static bool const is_vec = true;
-		static bool const is_mat = false;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tvec4, T, P>
+	template<length_t L, typename T, qualifier Q>
+	struct type<vec<L, T, Q> >
 	{
 		static bool const is_vec = true;
 		static bool const is_mat = false;
 		static bool const is_quat = false;
-		enum
-		{
-			components = 4
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat2x2, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 2
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat2x3, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 3
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat2x4, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 2,
-			cols = 2,
-			rows = 4
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat3x2, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 2
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat3x3, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 3
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat3x4, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 3,
-			cols = 3,
-			rows = 4
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat4x2, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 2
-		};
-	};
-
-	template <typename T, precision P>
-	struct type<tmat4x3, T, P>
-	{
-		static bool const is_vec = false;
-		static bool const is_mat = true;
-		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 3
-		};
+		static length_t const components = L;
 	};
 
-	template <typename T, precision P>
-	struct type<tmat4x4, T, P>
+	template<length_t C, length_t R, typename T, qualifier Q>
+	struct type<mat<C, R, T, Q> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = true;
 		static bool const is_quat = false;
-		enum
-		{
-			components = 4,
-			cols = 4,
-			rows = 4
-		};
+		static length_t const components = C;
+		static length_t const cols = C;
+		static length_t const rows = R;
 	};
 
-	template <typename T, precision P>
-	struct type<tquat, T, P>
+	template<typename T, qualifier Q>
+	struct type<tquat<T, Q> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = false;
 		static bool const is_quat = true;
-		enum
-		{
-			components = 4
-		};
+		static length_t const components = 4;
 	};
 
-	template <typename T, precision P>
-	struct type<tdualquat, T, P>
+	template<typename T, qualifier Q>
+	struct type<tdualquat<T, Q> >
 	{
 		static bool const is_vec = false;
 		static bool const is_mat = false;
 		static bool const is_quat = true;
-		enum
-		{
-			components = 8
-		};
+		static length_t const components = 8;
 	};
 
 	/// @}
diff --git a/external/include/glm/gtx/type_trait.inl b/external/include/glm/gtx/type_trait.inl
index e69de29..1cdf332 100644
--- a/external/include/glm/gtx/type_trait.inl
+++ b/external/include/glm/gtx/type_trait.inl
@@ -0,0 +1,62 @@
+/// @ref gtx_type_trait
+/// @file glm/gtx/type_trait.inl
+
+namespace glm
+{
+	template<typename T>
+	bool const type<T>::is_vec;
+	template<typename T>
+	bool const type<T>::is_mat;
+	template<typename T>
+	bool const type<T>::is_quat;
+	template<typename T>
+	length_t const type<T>::components;
+	template<typename T>
+	length_t const type<T>::cols;
+	template<typename T>
+	length_t const type<T>::rows;
+
+	// vec
+	template<length_t L, typename T, qualifier Q>
+	bool const type<vec<L, T, Q> >::is_vec;
+	template<length_t L, typename T, qualifier Q>
+	bool const type<vec<L, T, Q> >::is_mat;
+	template<length_t L, typename T, qualifier Q>
+	bool const type<vec<L, T, Q> >::is_quat;
+	template<length_t L, typename T, qualifier Q>
+	length_t const type<vec<L, T, Q> >::components;
+
+	// mat
+	template<length_t C, length_t R, typename T, qualifier Q>
+	bool const type<mat<C, R, T, Q> >::is_vec;
+	template<length_t C, length_t R, typename T, qualifier Q>
+	bool const type<mat<C, R, T, Q> >::is_mat;
+	template<length_t C, length_t R, typename T, qualifier Q>
+	bool const type<mat<C, R, T, Q> >::is_quat;
+	template<length_t C, length_t R, typename T, qualifier Q>
+	length_t const type<mat<C, R, T, Q> >::components;
+	template<length_t C, length_t R, typename T, qualifier Q>
+	length_t const type<mat<C, R, T, Q> >::cols;
+	template<length_t C, length_t R, typename T, qualifier Q>
+	length_t const type<mat<C, R, T, Q> >::rows;
+
+	// tquat
+	template<typename T, qualifier Q>
+	bool const type<tquat<T, Q> >::is_vec;
+	template<typename T, qualifier Q>
+	bool const type<tquat<T, Q> >::is_mat;
+	template<typename T, qualifier Q>
+	bool const type<tquat<T, Q> >::is_quat;
+	template<typename T, qualifier Q>
+	length_t const type<tquat<T, Q> >::components;
+
+	// tdualquat
+	template<typename T, qualifier Q>
+	bool const type<tdualquat<T, Q> >::is_vec;
+	template<typename T, qualifier Q>
+	bool const type<tdualquat<T, Q> >::is_mat;
+	template<typename T, qualifier Q>
+	bool const type<tdualquat<T, Q> >::is_quat;
+	template<typename T, qualifier Q>
+	length_t const type<tdualquat<T, Q> >::components;
+}//namespace glm
diff --git a/external/include/glm/gtx/vec_swizzle.hpp b/external/include/glm/gtx/vec_swizzle.hpp
new file mode 100644
index 0000000..daebac3
--- /dev/null
+++ b/external/include/glm/gtx/vec_swizzle.hpp
@@ -0,0 +1,2778 @@
+/// @ref gtx_vec_swizzle
+/// @file glm/gtx/vec_swizzle.hpp
+///
+/// @see core (dependence)
+///
+/// @defgroup gtx_vec_swizzle GLM_GTX_vec_swizzle
+/// @ingroup gtx
+///
+/// Include <glm/gtx/vec_swizzle.hpp> to use the features of this extension.
+///
+/// Functions to perform swizzle operation.
+
+#pragma once
+
+#include "../glm.hpp"
+
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
+namespace glm {
+	// xx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xx(const glm::vec<1, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.x);
+	}
+
+	// xy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.y);
+	}
+
+	// xz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.z);
+	}
+
+	// xw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> xw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.x, v.w);
+	}
+
+	// yx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.x);
+	}
+
+	// yy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.y);
+	}
+
+	// yz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.z);
+	}
+
+	// yw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> yw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.y, v.w);
+	}
+
+	// zx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.x);
+	}
+
+	// zy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.y);
+	}
+
+	// zz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.z);
+	}
+
+	// zw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> zw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.z, v.w);
+	}
+
+	// wx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> wx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.w, v.x);
+	}
+
+	// wy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> wy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.w, v.y);
+	}
+
+	// wz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> wz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.w, v.z);
+	}
+
+	// ww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<2, T, Q> ww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<2, T, Q>(v.w, v.w);
+	}
+
+	// xxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxx(const glm::vec<1, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.x);
+	}
+
+	// xxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.y);
+	}
+
+	// xxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.z);
+	}
+
+	// xxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.x, v.w);
+	}
+
+	// xyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.x);
+	}
+
+	// xyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.y);
+	}
+
+	// xyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.z);
+	}
+
+	// xyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.y, v.w);
+	}
+
+	// xzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.x);
+	}
+
+	// xzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.y);
+	}
+
+	// xzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.z);
+	}
+
+	// xzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.z, v.w);
+	}
+
+	// xwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.w, v.x);
+	}
+
+	// xwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.w, v.y);
+	}
+
+	// xwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.w, v.z);
+	}
+
+	// xww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> xww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.x, v.w, v.w);
+	}
+
+	// yxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.x);
+	}
+
+	// yxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.y);
+	}
+
+	// yxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.z);
+	}
+
+	// yxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.x, v.w);
+	}
+
+	// yyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.x);
+	}
+
+	// yyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.y);
+	}
+
+	// yyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.z);
+	}
+
+	// yyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.y, v.w);
+	}
+
+	// yzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.x);
+	}
+
+	// yzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.y);
+	}
+
+	// yzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.z);
+	}
+
+	// yzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.z, v.w);
+	}
+
+	// ywx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> ywx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.w, v.x);
+	}
+
+	// ywy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> ywy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.w, v.y);
+	}
+
+	// ywz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> ywz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.w, v.z);
+	}
+
+	// yww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> yww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.y, v.w, v.w);
+	}
+
+	// zxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.x);
+	}
+
+	// zxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.y);
+	}
+
+	// zxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.z);
+	}
+
+	// zxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.x, v.w);
+	}
+
+	// zyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.x);
+	}
+
+	// zyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.y);
+	}
+
+	// zyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.z);
+	}
+
+	// zyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.y, v.w);
+	}
+
+	// zzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.x);
+	}
+
+	// zzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.y);
+	}
+
+	// zzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.z);
+	}
+
+	// zzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.z, v.w);
+	}
+
+	// zwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.w, v.x);
+	}
+
+	// zwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.w, v.y);
+	}
+
+	// zwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.w, v.z);
+	}
+
+	// zww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> zww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.z, v.w, v.w);
+	}
+
+	// wxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.x, v.x);
+	}
+
+	// wxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.x, v.y);
+	}
+
+	// wxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.x, v.z);
+	}
+
+	// wxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.x, v.w);
+	}
+
+	// wyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.y, v.x);
+	}
+
+	// wyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.y, v.y);
+	}
+
+	// wyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.y, v.z);
+	}
+
+	// wyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.y, v.w);
+	}
+
+	// wzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.z, v.x);
+	}
+
+	// wzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.z, v.y);
+	}
+
+	// wzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.z, v.z);
+	}
+
+	// wzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.z, v.w);
+	}
+
+	// wwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.w, v.x);
+	}
+
+	// wwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.w, v.y);
+	}
+
+	// wwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> wwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.w, v.z);
+	}
+
+	// www
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<3, T, Q> www(const glm::vec<4, T, Q> &v) {
+		return glm::vec<3, T, Q>(v.w, v.w, v.w);
+	}
+
+	// xxxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxx(const glm::vec<1, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.x);
+	}
+
+	// xxxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.y);
+	}
+
+	// xxxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.z);
+	}
+
+	// xxxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.x, v.w);
+	}
+
+	// xxyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.x);
+	}
+
+	// xxyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.y);
+	}
+
+	// xxyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.z);
+	}
+
+	// xxyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.y, v.w);
+	}
+
+	// xxzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.x);
+	}
+
+	// xxzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.y);
+	}
+
+	// xxzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.z);
+	}
+
+	// xxzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.z, v.w);
+	}
+
+	// xxwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.w, v.x);
+	}
+
+	// xxwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.w, v.y);
+	}
+
+	// xxwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.w, v.z);
+	}
+
+	// xxww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xxww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.x, v.w, v.w);
+	}
+
+	// xyxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.x);
+	}
+
+	// xyxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.y);
+	}
+
+	// xyxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.z);
+	}
+
+	// xyxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.x, v.w);
+	}
+
+	// xyyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.x);
+	}
+
+	// xyyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.y);
+	}
+
+	// xyyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.z);
+	}
+
+	// xyyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.y, v.w);
+	}
+
+	// xyzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.x);
+	}
+
+	// xyzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.y);
+	}
+
+	// xyzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.z);
+	}
+
+	// xyzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.z, v.w);
+	}
+
+	// xywx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xywx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.w, v.x);
+	}
+
+	// xywy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xywy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.w, v.y);
+	}
+
+	// xywz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xywz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.w, v.z);
+	}
+
+	// xyww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xyww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.y, v.w, v.w);
+	}
+
+	// xzxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.x);
+	}
+
+	// xzxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.y);
+	}
+
+	// xzxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.z);
+	}
+
+	// xzxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.x, v.w);
+	}
+
+	// xzyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.x);
+	}
+
+	// xzyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.y);
+	}
+
+	// xzyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.z);
+	}
+
+	// xzyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.y, v.w);
+	}
+
+	// xzzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.x);
+	}
+
+	// xzzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.y);
+	}
+
+	// xzzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.z);
+	}
+
+	// xzzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.z, v.w);
+	}
+
+	// xzwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.w, v.x);
+	}
+
+	// xzwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.w, v.y);
+	}
+
+	// xzwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.w, v.z);
+	}
+
+	// xzww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xzww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.z, v.w, v.w);
+	}
+
+	// xwxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.x, v.x);
+	}
+
+	// xwxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.x, v.y);
+	}
+
+	// xwxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.x, v.z);
+	}
+
+	// xwxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.x, v.w);
+	}
+
+	// xwyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.y, v.x);
+	}
+
+	// xwyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.y, v.y);
+	}
+
+	// xwyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.y, v.z);
+	}
+
+	// xwyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.y, v.w);
+	}
+
+	// xwzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.z, v.x);
+	}
+
+	// xwzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.z, v.y);
+	}
+
+	// xwzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.z, v.z);
+	}
+
+	// xwzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.z, v.w);
+	}
+
+	// xwwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.w, v.x);
+	}
+
+	// xwwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.w, v.y);
+	}
+
+	// xwwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.w, v.z);
+	}
+
+	// xwww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> xwww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.x, v.w, v.w, v.w);
+	}
+
+	// yxxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.x);
+	}
+
+	// yxxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.y);
+	}
+
+	// yxxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.z);
+	}
+
+	// yxxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.x, v.w);
+	}
+
+	// yxyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.x);
+	}
+
+	// yxyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.y);
+	}
+
+	// yxyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.z);
+	}
+
+	// yxyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.y, v.w);
+	}
+
+	// yxzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.x);
+	}
+
+	// yxzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.y);
+	}
+
+	// yxzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.z);
+	}
+
+	// yxzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.z, v.w);
+	}
+
+	// yxwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.w, v.x);
+	}
+
+	// yxwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.w, v.y);
+	}
+
+	// yxwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.w, v.z);
+	}
+
+	// yxww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yxww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.x, v.w, v.w);
+	}
+
+	// yyxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.x);
+	}
+
+	// yyxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.y);
+	}
+
+	// yyxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.z);
+	}
+
+	// yyxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.x, v.w);
+	}
+
+	// yyyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyx(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.x);
+	}
+
+	// yyyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyy(const glm::vec<2, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.y);
+	}
+
+	// yyyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.z);
+	}
+
+	// yyyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.y, v.w);
+	}
+
+	// yyzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.x);
+	}
+
+	// yyzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.y);
+	}
+
+	// yyzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.z);
+	}
+
+	// yyzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.z, v.w);
+	}
+
+	// yywx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yywx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.w, v.x);
+	}
+
+	// yywy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yywy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.w, v.y);
+	}
+
+	// yywz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yywz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.w, v.z);
+	}
+
+	// yyww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yyww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.y, v.w, v.w);
+	}
+
+	// yzxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.x);
+	}
+
+	// yzxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.y);
+	}
+
+	// yzxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.z);
+	}
+
+	// yzxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.x, v.w);
+	}
+
+	// yzyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.x);
+	}
+
+	// yzyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.y);
+	}
+
+	// yzyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.z);
+	}
+
+	// yzyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.y, v.w);
+	}
+
+	// yzzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.x);
+	}
+
+	// yzzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.y);
+	}
+
+	// yzzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.z);
+	}
+
+	// yzzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.z, v.w);
+	}
+
+	// yzwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.w, v.x);
+	}
+
+	// yzwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.w, v.y);
+	}
+
+	// yzwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.w, v.z);
+	}
+
+	// yzww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> yzww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.z, v.w, v.w);
+	}
+
+	// ywxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.x, v.x);
+	}
+
+	// ywxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.x, v.y);
+	}
+
+	// ywxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.x, v.z);
+	}
+
+	// ywxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.x, v.w);
+	}
+
+	// ywyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.y, v.x);
+	}
+
+	// ywyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.y, v.y);
+	}
+
+	// ywyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.y, v.z);
+	}
+
+	// ywyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.y, v.w);
+	}
+
+	// ywzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.z, v.x);
+	}
+
+	// ywzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.z, v.y);
+	}
+
+	// ywzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.z, v.z);
+	}
+
+	// ywzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.z, v.w);
+	}
+
+	// ywwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.w, v.x);
+	}
+
+	// ywwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.w, v.y);
+	}
+
+	// ywwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.w, v.z);
+	}
+
+	// ywww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> ywww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.y, v.w, v.w, v.w);
+	}
+
+	// zxxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.x);
+	}
+
+	// zxxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.y);
+	}
+
+	// zxxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.z);
+	}
+
+	// zxxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.x, v.w);
+	}
+
+	// zxyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.x);
+	}
+
+	// zxyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.y);
+	}
+
+	// zxyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.z);
+	}
+
+	// zxyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.y, v.w);
+	}
+
+	// zxzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.x);
+	}
+
+	// zxzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.y);
+	}
+
+	// zxzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.z);
+	}
+
+	// zxzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.z, v.w);
+	}
+
+	// zxwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.w, v.x);
+	}
+
+	// zxwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.w, v.y);
+	}
+
+	// zxwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.w, v.z);
+	}
+
+	// zxww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zxww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.x, v.w, v.w);
+	}
+
+	// zyxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.x);
+	}
+
+	// zyxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.y);
+	}
+
+	// zyxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.z);
+	}
+
+	// zyxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.x, v.w);
+	}
+
+	// zyyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.x);
+	}
+
+	// zyyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.y);
+	}
+
+	// zyyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.z);
+	}
+
+	// zyyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.y, v.w);
+	}
+
+	// zyzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.x);
+	}
+
+	// zyzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.y);
+	}
+
+	// zyzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.z);
+	}
+
+	// zyzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.z, v.w);
+	}
+
+	// zywx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zywx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.w, v.x);
+	}
+
+	// zywy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zywy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.w, v.y);
+	}
+
+	// zywz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zywz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.w, v.z);
+	}
+
+	// zyww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zyww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.y, v.w, v.w);
+	}
+
+	// zzxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.x);
+	}
+
+	// zzxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.y);
+	}
+
+	// zzxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.z);
+	}
+
+	// zzxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.x, v.w);
+	}
+
+	// zzyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.x);
+	}
+
+	// zzyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.y);
+	}
+
+	// zzyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.z);
+	}
+
+	// zzyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.y, v.w);
+	}
+
+	// zzzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzx(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.x);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.x);
+	}
+
+	// zzzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzy(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.y);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.y);
+	}
+
+	// zzzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzz(const glm::vec<3, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.z);
+	}
+
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.z);
+	}
+
+	// zzzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.z, v.w);
+	}
+
+	// zzwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.w, v.x);
+	}
+
+	// zzwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.w, v.y);
+	}
+
+	// zzwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.w, v.z);
+	}
+
+	// zzww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zzww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.z, v.w, v.w);
+	}
+
+	// zwxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.x, v.x);
+	}
+
+	// zwxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.x, v.y);
+	}
+
+	// zwxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.x, v.z);
+	}
+
+	// zwxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.x, v.w);
+	}
+
+	// zwyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.y, v.x);
+	}
+
+	// zwyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.y, v.y);
+	}
+
+	// zwyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.y, v.z);
+	}
+
+	// zwyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.y, v.w);
+	}
+
+	// zwzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.z, v.x);
+	}
+
+	// zwzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.z, v.y);
+	}
+
+	// zwzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.z, v.z);
+	}
+
+	// zwzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.z, v.w);
+	}
+
+	// zwwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.w, v.x);
+	}
+
+	// zwwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.w, v.y);
+	}
+
+	// zwwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.w, v.z);
+	}
+
+	// zwww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> zwww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.z, v.w, v.w, v.w);
+	}
+
+	// wxxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.x, v.x);
+	}
+
+	// wxxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.x, v.y);
+	}
+
+	// wxxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.x, v.z);
+	}
+
+	// wxxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.x, v.w);
+	}
+
+	// wxyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.y, v.x);
+	}
+
+	// wxyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.y, v.y);
+	}
+
+	// wxyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.y, v.z);
+	}
+
+	// wxyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.y, v.w);
+	}
+
+	// wxzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.z, v.x);
+	}
+
+	// wxzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.z, v.y);
+	}
+
+	// wxzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.z, v.z);
+	}
+
+	// wxzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.z, v.w);
+	}
+
+	// wxwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.w, v.x);
+	}
+
+	// wxwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.w, v.y);
+	}
+
+	// wxwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.w, v.z);
+	}
+
+	// wxww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wxww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.x, v.w, v.w);
+	}
+
+	// wyxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.x, v.x);
+	}
+
+	// wyxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.x, v.y);
+	}
+
+	// wyxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.x, v.z);
+	}
+
+	// wyxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.x, v.w);
+	}
+
+	// wyyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.y, v.x);
+	}
+
+	// wyyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.y, v.y);
+	}
+
+	// wyyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.y, v.z);
+	}
+
+	// wyyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.y, v.w);
+	}
+
+	// wyzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.z, v.x);
+	}
+
+	// wyzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.z, v.y);
+	}
+
+	// wyzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.z, v.z);
+	}
+
+	// wyzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.z, v.w);
+	}
+
+	// wywx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wywx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.w, v.x);
+	}
+
+	// wywy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wywy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.w, v.y);
+	}
+
+	// wywz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wywz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.w, v.z);
+	}
+
+	// wyww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wyww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.y, v.w, v.w);
+	}
+
+	// wzxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.x, v.x);
+	}
+
+	// wzxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.x, v.y);
+	}
+
+	// wzxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.x, v.z);
+	}
+
+	// wzxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.x, v.w);
+	}
+
+	// wzyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.y, v.x);
+	}
+
+	// wzyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.y, v.y);
+	}
+
+	// wzyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.y, v.z);
+	}
+
+	// wzyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.y, v.w);
+	}
+
+	// wzzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.z, v.x);
+	}
+
+	// wzzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.z, v.y);
+	}
+
+	// wzzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.z, v.z);
+	}
+
+	// wzzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.z, v.w);
+	}
+
+	// wzwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.w, v.x);
+	}
+
+	// wzwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.w, v.y);
+	}
+
+	// wzwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.w, v.z);
+	}
+
+	// wzww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wzww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.z, v.w, v.w);
+	}
+
+	// wwxx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwxx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.x, v.x);
+	}
+
+	// wwxy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwxy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.x, v.y);
+	}
+
+	// wwxz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwxz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.x, v.z);
+	}
+
+	// wwxw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwxw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.x, v.w);
+	}
+
+	// wwyx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwyx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.y, v.x);
+	}
+
+	// wwyy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwyy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.y, v.y);
+	}
+
+	// wwyz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwyz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.y, v.z);
+	}
+
+	// wwyw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwyw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.y, v.w);
+	}
+
+	// wwzx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwzx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.z, v.x);
+	}
+
+	// wwzy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwzy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.z, v.y);
+	}
+
+	// wwzz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwzz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.z, v.z);
+	}
+
+	// wwzw
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwzw(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.z, v.w);
+	}
+
+	// wwwx
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwwx(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.w, v.x);
+	}
+
+	// wwwy
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwwy(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.w, v.y);
+	}
+
+	// wwwz
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwwz(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.w, v.z);
+	}
+
+	// wwww
+	template<typename T, qualifier Q>
+	GLM_INLINE glm::vec<4, T, Q> wwww(const glm::vec<4, T, Q> &v) {
+		return glm::vec<4, T, Q>(v.w, v.w, v.w, v.w);
+	}
+
+}
diff --git a/external/include/glm/gtx/vector_angle.hpp b/external/include/glm/gtx/vector_angle.hpp
index d52d3f8..401a47e 100644
--- a/external/include/glm/gtx/vector_angle.hpp
+++ b/external/include/glm/gtx/vector_angle.hpp
@@ -8,9 +8,9 @@
 /// @defgroup gtx_vector_angle GLM_GTX_vector_angle
 /// @ingroup gtx
 ///
-/// @brief Compute angle between vectors
+/// Include <glm/gtx/vector_angle.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/vector_angle.hpp> need to be included to use these functionalities.
+/// Compute angle between vectors
 
 #pragma once
 
@@ -20,6 +20,10 @@
 #include "../gtx/quaternion.hpp"
 #include "../gtx/rotate_vector.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_vector_angle extension included")
 #endif
@@ -32,27 +36,20 @@ namespace glm
 	//! Returns the absolute angle between two vectors.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename vecType>
-	GLM_FUNC_DECL typename vecType::value_type angle(
-		vecType const & x, 
-		vecType const & y);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL T angle(vec<L, T, Q> const& x, vec<L, T, Q> const& y);
 
 	//! Returns the oriented angle between two 2d vectors.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T orientedAngle(
-		tvec2<T, P> const & x,
-		tvec2<T, P> const & y);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T orientedAngle(vec<2, T, Q> const& x, vec<2, T, Q> const& y);
 
 	//! Returns the oriented angle between two 3d vectors based from a reference axis.
 	//! Parameters need to be normalized.
 	/// @see gtx_vector_angle extension.
-	template <typename T, precision P>
-	GLM_FUNC_DECL T orientedAngle(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		tvec3<T, P> const & ref);
+	template<typename T, qualifier Q>
+	GLM_FUNC_DECL T orientedAngle(vec<3, T, Q> const& x, vec<3, T, Q> const& y, vec<3, T, Q> const& ref);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/vector_angle.inl b/external/include/glm/gtx/vector_angle.inl
index 05c3028..38f8b8c 100644
--- a/external/include/glm/gtx/vector_angle.inl
+++ b/external/include/glm/gtx/vector_angle.inl
@@ -3,35 +3,27 @@
 
 namespace glm
 {
-	template <typename genType> 
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType angle
 	(
-		genType const & x,
-		genType const & y
+		genType const& x,
+		genType const& y
 	)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<genType>::is_iec559, "'angle' only accept floating-point inputs");
 		return acos(clamp(dot(x, y), genType(-1), genType(1)));
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType> 
-	GLM_FUNC_QUALIFIER T angle
-	(
-		vecType<T, P> const & x,
-		vecType<T, P> const & y
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T angle(vec<L, T, Q> const& x, vec<L, T, Q> const& y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'angle' only accept floating-point inputs");
 		return acos(clamp(dot(x, y), T(-1), T(1)));
 	}
 
 	//! \todo epsilon is hard coded to 0.01
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T orientedAngle
-	(
-		tvec2<T, P> const & x,
-		tvec2<T, P> const & y
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T orientedAngle(vec<2, T, Q> const& x, vec<2, T, Q> const& y)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
 		T const Angle(acos(clamp(dot(x, y), T(-1), T(1))));
@@ -42,13 +34,8 @@ namespace glm
 			return -Angle;
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER T orientedAngle
-	(
-		tvec3<T, P> const & x,
-		tvec3<T, P> const & y,
-		tvec3<T, P> const & ref
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER T orientedAngle(vec<3, T, Q> const& x, vec<3, T, Q> const& y, vec<3, T, Q> const& ref)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'orientedAngle' only accept floating-point inputs");
 
diff --git a/external/include/glm/gtx/vector_query.hpp b/external/include/glm/gtx/vector_query.hpp
index 2c0d022..52ba57b 100644
--- a/external/include/glm/gtx/vector_query.hpp
+++ b/external/include/glm/gtx/vector_query.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_vector_query GLM_GTX_vector_query
 /// @ingroup gtx
 ///
-/// @brief Query informations of vector types
+/// Include <glm/gtx/vector_query.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/vector_query.hpp> need to be included to use these functionalities.
+/// Query informations of vector types
 
 #pragma once
 
@@ -17,6 +17,10 @@
 #include <cfloat>
 #include <limits>
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_vector_query extension included")
 #endif
@@ -28,33 +32,33 @@ namespace glm
 
 	//! Check whether two vectors are collinears.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL bool areCollinear(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
-		
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL bool areCollinear(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon);
+
 	//! Check whether two vectors are orthogonals.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL bool areOrthogonal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL bool areOrthogonal(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon);
 
 	//! Check whether a vector is normalized.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL bool isNormalized(vecType<T, P> const & v, T const & epsilon);
-		
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNormalized(vec<L, T, Q> const& v, T const& epsilon);
+
 	//! Check whether a vector is null.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL bool isNull(vecType<T, P> const & v, T const & epsilon);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL bool isNull(vec<L, T, Q> const& v, T const& epsilon);
 
 	//! Check whether a each component of a vector is null.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL vecType<bool, P> isCompNull(vecType<T, P> const & v, T const & epsilon);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL vec<L, bool, Q> isCompNull(vec<L, T, Q> const& v, T const& epsilon);
 
 	//! Check whether two vectors are orthonormal.
 	/// @see gtx_vector_query extensions.
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_DECL bool areOrthonormal(vecType<T, P> const & v0, vecType<T, P> const & v1, T const & epsilon);
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_DECL bool areOrthonormal(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon);
 
 	/// @}
 }// namespace glm
diff --git a/external/include/glm/gtx/vector_query.inl b/external/include/glm/gtx/vector_query.inl
index 85ea5e5..0d8cddc 100644
--- a/external/include/glm/gtx/vector_query.inl
+++ b/external/include/glm/gtx/vector_query.inl
@@ -6,68 +6,68 @@
 namespace glm{
 namespace detail
 {
-	template <typename T, precision P, template <typename, precision> class vecType>
+	template<length_t L, typename T, qualifier Q>
 	struct compute_areCollinear{};
 
-	template <typename T, precision P>
-	struct compute_areCollinear<T, P, tvec2>
+	template<typename T, qualifier Q>
+	struct compute_areCollinear<2, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static bool call(tvec2<T, P> const & v0, tvec2<T, P> const & v1, T const & epsilon)
+		GLM_FUNC_QUALIFIER static bool call(vec<2, T, Q> const& v0, vec<2, T, Q> const& v1, T const& epsilon)
 		{
-			return length(cross(tvec3<T, P>(v0, static_cast<T>(0)), tvec3<T, P>(v1, static_cast<T>(0)))) < epsilon;
+			return length(cross(vec<3, T, Q>(v0, static_cast<T>(0)), vec<3, T, Q>(v1, static_cast<T>(0)))) < epsilon;
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_areCollinear<T, P, tvec3>
+	template<typename T, qualifier Q>
+	struct compute_areCollinear<3, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static bool call(tvec3<T, P> const & v0, tvec3<T, P> const & v1, T const & epsilon)
+		GLM_FUNC_QUALIFIER static bool call(vec<3, T, Q> const& v0, vec<3, T, Q> const& v1, T const& epsilon)
 		{
 			return length(cross(v0, v1)) < epsilon;
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_areCollinear<T, P, tvec4>
+	template<typename T, qualifier Q>
+	struct compute_areCollinear<4, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static bool call(tvec4<T, P> const & v0, tvec4<T, P> const & v1, T const & epsilon)
+		GLM_FUNC_QUALIFIER static bool call(vec<4, T, Q> const& v0, vec<4, T, Q> const& v1, T const& epsilon)
 		{
-			return length(cross(tvec3<T, P>(v0), tvec3<T, P>(v1))) < epsilon;
+			return length(cross(vec<3, T, Q>(v0), vec<3, T, Q>(v1))) < epsilon;
 		}
 	};
 
-	template <typename T, precision P, template <typename, precision> class vecType>
+	template<length_t L, typename T, qualifier Q>
 	struct compute_isCompNull{};
 
-	template <typename T, precision P>
-	struct compute_isCompNull<T, P, tvec2>
+	template<typename T, qualifier Q>
+	struct compute_isCompNull<2, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static tvec2<bool, P> call(tvec2<T, P> const & v, T const & epsilon)
+		GLM_FUNC_QUALIFIER static vec<2, bool, Q> call(vec<2, T, Q> const& v, T const& epsilon)
 		{
-			return tvec2<bool, P>(
+			return vec<2, bool, Q>(
 				(abs(v.x) < epsilon),
 				(abs(v.y) < epsilon));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_isCompNull<T, P, tvec3>
+	template<typename T, qualifier Q>
+	struct compute_isCompNull<3, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static tvec3<bool, P> call(tvec3<T, P> const & v, T const & epsilon)
+		GLM_FUNC_QUALIFIER static vec<3, bool, Q> call(vec<3, T, Q> const& v, T const& epsilon)
 		{
-			return tvec3<bool, P>(
+			return vec<3, bool, Q>(
 				(abs(v.x) < epsilon),
 				(abs(v.y) < epsilon),
 				(abs(v.z) < epsilon));
 		}
 	};
 
-	template <typename T, precision P>
-	struct compute_isCompNull<T, P, tvec4>
+	template<typename T, qualifier Q>
+	struct compute_isCompNull<4, T, Q>
 	{
-		GLM_FUNC_QUALIFIER static tvec4<bool, P> call(tvec4<T, P> const & v, T const & epsilon)
+		GLM_FUNC_QUALIFIER static vec<4, bool, Q> call(vec<4, T, Q> const& v, T const& epsilon)
 		{
-			return tvec4<bool, P>(
+			return vec<4, bool, Q>(
 				(abs(v.x) < epsilon),
 				(abs(v.y) < epsilon),
 				(abs(v.z) < epsilon),
@@ -77,26 +77,16 @@ namespace detail
 
 }//namespace detail
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool areCollinear
-	(
-		vecType<T, P> const & v0,
-		vecType<T, P> const & v1,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool areCollinear(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areCollinear' only accept floating-point inputs");
 
-		return detail::compute_areCollinear<T, P, vecType>::call(v0, v1, epsilon);
+		return detail::compute_areCollinear<L, T, Q>::call(v0, v1, epsilon);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool areOrthogonal
-	(
-		vecType<T, P> const & v0,
-		vecType<T, P> const & v1,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool areOrthogonal(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'areOrthogonal' only accept floating-point inputs");
 
@@ -105,87 +95,59 @@ namespace detail
 			length(v0)) * max(static_cast<T>(1), length(v1)) * epsilon;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool isNormalized
-	(
-		vecType<T, P> const & v,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNormalized(vec<L, T, Q> const& v, T const& epsilon)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNormalized' only accept floating-point inputs");
 
 		return abs(length(v) - static_cast<T>(1)) <= static_cast<T>(2) * epsilon;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool isNull
-	(
-		vecType<T, P> const & v,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool isNull(vec<L, T, Q> const& v, T const& epsilon)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isNull' only accept floating-point inputs");
 
 		return length(v) <= epsilon;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<bool, P> isCompNull
-	(
-		vecType<T, P> const & v,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, bool, Q> isCompNull(vec<L, T, Q> const& v, T const& epsilon)
 	{
 		GLM_STATIC_ASSERT(std::numeric_limits<T>::is_iec559, "'isCompNull' only accept floating-point inputs");
 
-		return detail::compute_isCompNull<T, P, vecType>::call(v, epsilon);
+		return detail::compute_isCompNull<L, T, Q>::call(v, epsilon);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec2<bool, P> isCompNull
-	(
-		tvec2<T, P> const & v,
-		T const & epsilon)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<2, bool, Q> isCompNull(vec<2, T, Q> const& v, T const& epsilon)
 	{
-		return tvec2<bool, P>(
+		return vec<2, bool, Q>(
 			abs(v.x) < epsilon,
 			abs(v.y) < epsilon);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec3<bool, P> isCompNull
-	(
-		tvec3<T, P> const & v,
-		T const & epsilon
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<3, bool, Q> isCompNull(vec<3, T, Q> const& v, T const& epsilon)
 	{
-		return tvec3<bool, P>(
+		return vec<3, bool, Q>(
 			abs(v.x) < epsilon,
 			abs(v.y) < epsilon,
 			abs(v.z) < epsilon);
 	}
 
-	template <typename T, precision P>
-	GLM_FUNC_QUALIFIER tvec4<bool, P> isCompNull
-	(
-		tvec4<T, P> const & v,
-		T const & epsilon
-	)
+	template<typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<4, bool, Q> isCompNull(vec<4, T, Q> const& v, T const& epsilon)
 	{
-		return tvec4<bool, P>(
+		return vec<4, bool, Q>(
 			abs(v.x) < epsilon,
 			abs(v.y) < epsilon,
 			abs(v.z) < epsilon,
 			abs(v.w) < epsilon);
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER bool areOrthonormal
-	(
-		vecType<T, P> const & v0,
-		vecType<T, P> const & v1,
-		T const & epsilon
-	)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER bool areOrthonormal(vec<L, T, Q> const& v0, vec<L, T, Q> const& v1, T const& epsilon)
 	{
 		return isNormalized(v0, epsilon) && isNormalized(v1, epsilon) && (abs(dot(v0, v1)) <= epsilon);
 	}
diff --git a/external/include/glm/gtx/wrap.hpp b/external/include/glm/gtx/wrap.hpp
index 0060073..2c4b55d 100644
--- a/external/include/glm/gtx/wrap.hpp
+++ b/external/include/glm/gtx/wrap.hpp
@@ -6,9 +6,9 @@
 /// @defgroup gtx_wrap GLM_GTX_wrap
 /// @ingroup gtx
 ///
-/// @brief Wrapping mode of texture coordinates.
+/// Include <glm/gtx/wrap.hpp> to use the features of this extension.
 ///
-/// <glm/gtx/wrap.hpp> need to be included to use these functionalities.
+/// Wrapping mode of texture coordinates.
 
 #pragma once
 
@@ -16,6 +16,10 @@
 #include "../glm.hpp"
 #include "../gtc/vec1.hpp"
 
+#ifndef GLM_ENABLE_EXPERIMENTAL
+#	error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
 #	pragma message("GLM: GLM_GTX_wrap extension included")
 #endif
@@ -27,22 +31,22 @@ namespace glm
 
 	/// Simulate GL_CLAMP OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType clamp(genType const& Texcoord);
 
 	/// Simulate GL_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType repeat(genType const& Texcoord);
 
 	/// Simulate GL_MIRRORED_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType mirrorClamp(genType const& Texcoord);
 
 	/// Simulate GL_MIRROR_REPEAT OpenGL wrap mode
 	/// @see gtx_wrap extension.
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_DECL genType mirrorRepeat(genType const& Texcoord);
 
 	/// @}
diff --git a/external/include/glm/gtx/wrap.inl b/external/include/glm/gtx/wrap.inl
index 941a803..83e350f 100644
--- a/external/include/glm/gtx/wrap.inl
+++ b/external/include/glm/gtx/wrap.inl
@@ -3,56 +3,56 @@
 
 namespace glm
 {
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> clamp(vecType<T, P> const& Texcoord)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> clamp(vec<L, T, Q> const& Texcoord)
 	{
-		return glm::clamp(Texcoord, vecType<T, P>(0), vecType<T, P>(1));
+		return glm::clamp(Texcoord, vec<L, T, Q>(0), vec<L, T, Q>(1));
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType clamp(genType const & Texcoord)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType clamp(genType const& Texcoord)
 	{
-		return clamp(tvec1<genType, defaultp>(Texcoord)).x;
+		return clamp(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> repeat(vecType<T, P> const& Texcoord)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> repeat(vec<L, T, Q> const& Texcoord)
 	{
 		return glm::fract(Texcoord);
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType repeat(genType const & Texcoord)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType repeat(genType const& Texcoord)
 	{
-		return repeat(tvec1<genType, defaultp>(Texcoord)).x;
+		return repeat(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> mirrorClamp(vecType<T, P> const& Texcoord)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> mirrorClamp(vec<L, T, Q> const& Texcoord)
 	{
 		return glm::fract(glm::abs(Texcoord));
 	}
 
-	template <typename genType>
-	GLM_FUNC_QUALIFIER genType mirrorClamp(genType const & Texcoord)
+	template<typename genType>
+	GLM_FUNC_QUALIFIER genType mirrorClamp(genType const& Texcoord)
 	{
-		return mirrorClamp(tvec1<genType, defaultp>(Texcoord)).x;
+		return mirrorClamp(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 
-	template <typename T, precision P, template <typename, precision> class vecType>
-	GLM_FUNC_QUALIFIER vecType<T, P> mirrorRepeat(vecType<T, P> const& Texcoord)
+	template<length_t L, typename T, qualifier Q>
+	GLM_FUNC_QUALIFIER vec<L, T, Q> mirrorRepeat(vec<L, T, Q> const& Texcoord)
 	{
-		vecType<T, P> const Abs = glm::abs(Texcoord);
-		vecType<T, P> const Clamp = glm::mod(glm::floor(Abs), vecType<T, P>(2));
-		vecType<T, P> const Floor = glm::floor(Abs);
-		vecType<T, P> const Rest = Abs - Floor;
-		vecType<T, P> const Mirror = Clamp + Rest;
-		return mix(Rest, vecType<T, P>(1) - Rest, glm::greaterThanEqual(Mirror, vecType<T, P>(1)));
+		vec<L, T, Q> const Abs = glm::abs(Texcoord);
+		vec<L, T, Q> const Clamp = glm::mod(glm::floor(Abs), vec<L, T, Q>(2));
+		vec<L, T, Q> const Floor = glm::floor(Abs);
+		vec<L, T, Q> const Rest = Abs - Floor;
+		vec<L, T, Q> const Mirror = Clamp + Rest;
+		return mix(Rest, vec<L, T, Q>(1) - Rest, glm::greaterThanEqual(Mirror, vec<L, T, Q>(1)));
 	}
 
-	template <typename genType>
+	template<typename genType>
 	GLM_FUNC_QUALIFIER genType mirrorRepeat(genType const& Texcoord)
 	{
-		return mirrorRepeat(tvec1<genType, defaultp>(Texcoord)).x;
+		return mirrorRepeat(vec<1, genType, defaultp>(Texcoord)).x;
 	}
 }//namespace glm