From 7795de4ac2c4c8bf177d289c4f66ecd2f9a0fd4c Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Fri, 19 Apr 2019 16:26:40 -0700
Subject: [PATCH] added vec{2|3|4}<T>

We can now use for e.g. vec4<float> instead of float4, this is
useful for templated code. The existing solution was to reach
out to the math::detail::TVec<> class.
---
 libs/math/include/math/vec2.h | 23 +++++++++++++----------
 libs/math/include/math/vec3.h | 23 +++++++++++++----------
 libs/math/include/math/vec4.h | 23 +++++++++++++----------
 3 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/libs/math/include/math/vec2.h b/libs/math/include/math/vec2.h
index 6489dfd2a6..aaa0f30a84 100644
--- a/libs/math/include/math/vec2.h
+++ b/libs/math/include/math/vec2.h
@@ -95,16 +95,19 @@ public:
 
 // ----------------------------------------------------------------------------------------
 
-typedef details::TVec2<double> double2;
-typedef details::TVec2<float> float2;
-typedef details::TVec2<half> half2;
-typedef details::TVec2<int32_t> int2;
-typedef details::TVec2<uint32_t> uint2;
-typedef details::TVec2<int16_t> short2;
-typedef details::TVec2<uint16_t> ushort2;
-typedef details::TVec2<int8_t> byte2;
-typedef details::TVec2<uint8_t> ubyte2;
-typedef details::TVec2<bool> bool2;
+template <typename T, typename = typename std::enable_if<std::is_arithmetic<T>::value >::type>
+using vec2 = details::TVec2<T>;
+
+using double2 = vec2<double>;
+using float2 = vec2<float>;
+using half2 = vec2<half>;
+using int2 = vec2<int32_t>;
+using uint2 = vec2<uint32_t>;
+using short2 = vec2<int16_t>;
+using ushort2 = vec2<uint16_t>;
+using byte2 = vec2<int8_t>;
+using ubyte2 = vec2<uint8_t>;
+using bool2 = vec2<bool>;
 
 // ----------------------------------------------------------------------------------------
 }  // namespace math
diff --git a/libs/math/include/math/vec3.h b/libs/math/include/math/vec3.h
index 8829a3ac1f..ac541fe4c9 100644
--- a/libs/math/include/math/vec3.h
+++ b/libs/math/include/math/vec3.h
@@ -114,16 +114,19 @@ public:
 
 // ----------------------------------------------------------------------------------------
 
-typedef details::TVec3<double> double3;
-typedef details::TVec3<float> float3;
-typedef details::TVec3<half> half3;
-typedef details::TVec3<int32_t> int3;
-typedef details::TVec3<uint32_t> uint3;
-typedef details::TVec3<int16_t> short3;
-typedef details::TVec3<uint16_t> ushort3;
-typedef details::TVec3<int8_t> byte3;
-typedef details::TVec3<uint8_t> ubyte3;
-typedef details::TVec3<bool> bool3;
+template <typename T, typename = typename std::enable_if<std::is_arithmetic<T>::value >::type>
+using vec3 = details::TVec3<T>;
+
+using double3 = vec3<double>;
+using float3 = vec3<float>;
+using half3 = vec3<half>;
+using int3 = vec3<int32_t>;
+using uint3 = vec3<uint32_t>;
+using short3 = vec3<int16_t>;
+using ushort3 = vec3<uint16_t>;
+using byte3 = vec3<int8_t>;
+using ubyte3 = vec3<uint8_t>;
+using bool3 = vec3<bool>;
 
 // ----------------------------------------------------------------------------------------
 }  // namespace math
diff --git a/libs/math/include/math/vec4.h b/libs/math/include/math/vec4.h
index 48cbd314d7..6c82c2efca 100644
--- a/libs/math/include/math/vec4.h
+++ b/libs/math/include/math/vec4.h
@@ -106,16 +106,19 @@ public:
 
 // ----------------------------------------------------------------------------------------
 
-typedef details::TVec4<double> double4;
-typedef details::TVec4<float> float4;
-typedef details::TVec4<half> half4;
-typedef details::TVec4<int32_t> int4;
-typedef details::TVec4<uint32_t> uint4;
-typedef details::TVec4<int16_t> short4;
-typedef details::TVec4<uint16_t> ushort4;
-typedef details::TVec4<int8_t> byte4;
-typedef details::TVec4<uint8_t> ubyte4;
-typedef details::TVec4<bool> bool4;
+template <typename T, typename = typename std::enable_if<std::is_arithmetic<T>::value >::type>
+using vec4 = details::TVec4<T>;
+
+using double4 = vec4<double>;
+using float4 = vec4<float>;
+using half4 = vec4<half>;
+using int4 = vec4<int32_t>;
+using uint4 = vec4<uint32_t>;
+using short4 = vec4<int16_t>;
+using ushort4 = vec4<uint16_t>;
+using byte4 = vec4<int8_t>;
+using ubyte4 = vec4<uint8_t>;
+using bool4 = vec4<bool>;
 
 
 // ----------------------------------------------------------------------------------------