From 5212c26da216d10cf9354bd8540ea4f70d6c354b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 10 Aug 2017 03:28:29 +0200 Subject: [PATCH] Clean up vecType --- glm/detail/_noise.hpp | 24 ++---------------------- glm/detail/_swizzle.hpp | 7 +++---- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/glm/detail/_noise.hpp b/glm/detail/_noise.hpp index 9b36db69..cdee4547 100644 --- a/glm/detail/_noise.hpp +++ b/glm/detail/_noise.hpp @@ -40,13 +40,7 @@ namespace detail { return mod289(((x * static_cast(34)) + static_cast(1)) * x); } -/* - template class vecType> - GLM_FUNC_QUALIFIER vecType permute(vecType const & x) - { - return mod289(((x * T(34)) + T(1)) * x); - } -*/ + template GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r) { @@ -70,14 +64,7 @@ namespace detail { return T(1.79284291400159) - T(0.85373472095314) * r; } -/* - template class vecType> - GLM_FUNC_QUALIFIER vecType taylorInvSqrt(vecType const & r) - { - return T(1.79284291400159) - T(0.85373472095314) * r; - } -*/ - + template GLM_FUNC_QUALIFIER vec<2, T, P> fade(vec<2, T, P> const & t) { @@ -95,13 +82,6 @@ namespace detail { return (t * t * t) * (t * (t * T(6) - T(15)) + T(10)); } -/* - template class vecType> - GLM_FUNC_QUALIFIER vecType fade(vecType const & t) - { - return (t * t * t) * (t * (t * T(6) - T(15)) + T(10)); - } -*/ }//namespace detail }//namespace glm diff --git a/glm/detail/_swizzle.hpp b/glm/detail/_swizzle.hpp index a2f290fa..8ebea190 100644 --- a/glm/detail/_swizzle.hpp +++ b/glm/detail/_swizzle.hpp @@ -47,10 +47,9 @@ namespace detail /* Template parameters: - ValueType = type of scalar values (e.g. float, double) - VecType = class the swizzle is applies to (e.g. vec<3, float>) - N = number of components in the vector (e.g. 3) - E0...3 = what index the n-th element of this swizzle refers to in the unswizzled vec + T = type of scalar values (e.g. float, double) + N = number of components in the vector (e.g. 3) + E0...3 = what index the n-th element of this swizzle refers to in the unswizzled vec DUPLICATE_ELEMENTS = 1 if there is a repeated element, 0 otherwise (used to specialize swizzles containing duplicate elements so that they cannot be used as r-values).