mewin/glm
1
0
Fork 0
Code Releases Activity

Clean up vecType

Browse Source
This commit is contained in:
Christophe Riccio
2017-08-10 03:28:29 +02:00
parent 78e06f815b
commit 5212c26da2
2 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
glm/detail/_noise.hpp
View File

@@ -40,13 +40,7 @@ namespace detail
{ {
return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x); return mod289(((x * static_cast<T>(34)) + static_cast<T>(1)) * x);
} }
/*
template<typename T, precision P, template<typename> class vecType>
GLM_FUNC_QUALIFIER vecType<L, T, P> permute(vecType<L, T, P> const & x)
{
return mod289(((x * T(34)) + T(1)) * x);
}
*/
template<typename T> template<typename T>
GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r) GLM_FUNC_QUALIFIER T taylorInvSqrt(T const & r)
{ {
@@ -70,14 +64,7 @@ namespace detail
{ {
return T(1.79284291400159) - T(0.85373472095314) * r; return T(1.79284291400159) - T(0.85373472095314) * r;
} }
/*
template<typename T, precision P, template<typename> class vecType>
GLM_FUNC_QUALIFIER vecType<L, T, P> taylorInvSqrt(vecType<L, T, P> const & r)
{
return T(1.79284291400159) - T(0.85373472095314) * r;
}
*/
template<typename T, precision P> template<typename T, precision P>
GLM_FUNC_QUALIFIER vec<2, T, P> fade(vec<2, T, P> const & t) 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)); return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
} }
/*
template<typename T, precision P, template<typename> class vecType>
GLM_FUNC_QUALIFIER vecType<L, T, P> fade(vecType<L, T, P> const & t)
{
return (t * t * t) * (t * (t * T(6) - T(15)) + T(10));
}
*/
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm

7
glm/detail/_swizzle.hpp
View File

@@ -47,10 +47,9 @@ namespace detail
/* /*
Template parameters: Template parameters:
ValueType = type of scalar values (e.g. float, double) T = 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)
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
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 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). containing duplicate elements so that they cannot be used as r-values).