mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 09:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation fixes due to missing P template parameters.

Browse Source
This commit is contained in:
Dave Reid 2013-04-23 10:01:50 +10:00
parent 5519b86003
commit b6d994f638
7 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/gtc/matrix_transform.inl
View File

@ -339,7 +339,7 @@ namespace glm
return Result;
}
template <typename T, precision P, typename U>
template <typename T, typename U, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> project
(
detail::tvec3<T, P> const & obj,
@ -360,7 +360,7 @@ namespace glm
return detail::tvec3<T, P>(tmp);
}
template <typename T, precision P, typename U>
template <typename T, typename U, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> unProject
(
detail::tvec3<T, P> const & win,

12
glm/gtx/fast_exponential.inl
View File

@ -27,20 +27,20 @@ namespace glm
return f;
}
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec2<T, P> fastPow(
const detail::tvec2<T, P>& x,
const detail::tvec2<int>& y)
const detail::tvec2<int, P>& y)
{
return detail::tvec2<T, P>(
fastPow(x.x, y.x),
fastPow(x.y, y.y));
}
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> fastPow(
const detail::tvec3<T, P>& x,
const detail::tvec3<int>& y)
const detail::tvec3<int, P>& y)
{
return detail::tvec3<T, P>(
fastPow(x.x, y.x),
@ -48,10 +48,10 @@ namespace glm
fastPow(x.z, y.z));
}
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<T, P> fastPow(
const detail::tvec4<T, P>& x,
const detail::tvec4<int>& y)
const detail::tvec4<int, P>& y)
{
return detail::tvec4<T, P>(
fastPow(x.x, y.x),

30
glm/gtx/fast_square_root.inl
View File

@ -53,30 +53,30 @@ namespace glm
return abs(x);
}
template <typename valType>
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastLength
(
detail::tvec2<valType> const & x
detail::tvec2<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y;
return fastSqrt(sqr);
}
template <typename valType>
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastLength
(
detail::tvec3<valType> const & x
detail::tvec3<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
return fastSqrt(sqr);
}
template <typename valType>
template <typename valType, precision P>
GLM_FUNC_QUALIFIER valType fastLength
(
detail::tvec4<valType> const & x
detail::tvec4<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;
@ -104,30 +104,30 @@ namespace glm
return x > genType(0) ? genType(1) : -genType(1);
}
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec2<valType> fastNormalize
template <typename valType, precision P>
GLM_FUNC_QUALIFIER detail::tvec2<valType, P> fastNormalize
(
detail::tvec2<valType> const & x
detail::tvec2<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y;
return x * fastInverseSqrt(sqr);
}
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec3<valType> fastNormalize
template <typename valType, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<valType, P> fastNormalize
(
detail::tvec3<valType> const & x
detail::tvec3<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y + x.z * x.z;
return x * fastInverseSqrt(sqr);
}
template <typename valType>
GLM_FUNC_QUALIFIER detail::tvec4<valType> fastNormalize
template <typename valType, precision P>
GLM_FUNC_QUALIFIER detail::tvec4<valType, P> fastNormalize
(
detail::tvec4<valType> const & x
detail::tvec4<valType, P> const & x
)
{
valType sqr = x.x * x.x + x.y * x.y + x.z * x.z + x.w * x.w;

2
glm/gtx/normal.hpp
View File

@ -53,7 +53,7 @@ namespace glm
//! Computes triangle normal from triangle points.
//! From GLM_GTX_normal extension.
template <typename T>
template <typename T, precision P>
detail::tvec3<T, P> triangleNormal(
detail::tvec3<T, P> const & p1,
detail::tvec3<T, P> const & p2,

2
glm/gtx/normal.inl
View File

@ -9,7 +9,7 @@
namespace glm
{
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> triangleNormal
(
detail::tvec3<T, P> const & p1,

4
glm/gtx/orthonormalize.hpp
View File

@ -53,13 +53,13 @@ namespace glm
//! Returns the orthonormalized matrix of m.
//! From GLM_GTX_orthonormalize extension.
template <typename T>
template <typename T, precision P>
detail::tmat3x3<T, P> orthonormalize(
const detail::tmat3x3<T, P>& m);
//! Orthonormalizes x according y.
//! From GLM_GTX_orthonormalize extension.
template <typename T>
template <typename T, precision P>
detail::tvec3<T, P> orthonormalize(
const detail::tvec3<T, P>& x,
const detail::tvec3<T, P>& y);

4
glm/gtx/orthonormalize.inl
View File

@ -9,7 +9,7 @@
namespace glm
{
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tmat3x3<T, P> orthonormalize
(
const detail::tmat3x3<T, P>& m
@ -31,7 +31,7 @@ namespace glm
return r;
}
template <typename T>
template <typename T, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> orthonormalize
(
const detail::tvec3<T, P>& x,