anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Compilation fixes due to missing P template parameters.

Browse Source
master
Dave Reid ago%!(EXTRA string=12 years)
parent 5519b86003
commit b6d994f638
7 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      glm/gtc/matrix_transform.inl
  2. 12
      glm/gtx/fast_exponential.inl
  3. 30
      glm/gtx/fast_square_root.inl
  4. 2
      glm/gtx/normal.hpp
  5. 2
      glm/gtx/normal.inl
  6. 4
      glm/gtx/orthonormalize.hpp
  7. 4
      glm/gtx/orthonormalize.inl

4
glm/gtc/matrix_transform.inl
Unescape View File

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

12
glm/gtx/fast_exponential.inl
Unescape View File

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

30
glm/gtx/fast_square_root.inl
Unescape View File

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

2
glm/gtx/normal.hpp
Unescape View File

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

2
glm/gtx/normal.inl
Unescape View File

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

4
glm/gtx/orthonormalize.hpp
Unescape View File

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

4
glm/gtx/orthonormalize.inl
Unescape View File

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

Write Preview
Loading…
Cancel
Save