mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '0.9.2' into gtx_ulp

Browse Source
This commit is contained in:
Christophe Riccio 2011-04-26 12:47:01 +01:00
commit 3910e046b5
10 changed files with 373 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
glm/core/func_common.hpp
View File

@ -27,23 +27,31 @@ namespace glm
///@{ ///@{
//! Returns x if x >= 0; otherwise, it returns -x. //! Returns x if x >= 0; otherwise, it returns -x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/abs.xml">GLSL abs man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genFIType> template <typename genFIType>
genFIType abs(genFIType const & x); genFIType abs(genFIType const & x);
//! Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. //! Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sign.xml">GLSL sign man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genFIType> template <typename genFIType>
genFIType sign(genFIType const & x); genFIType sign(genFIType const & x);
//! Returns a value equal to the nearest integer that is less then or equal to x. //! Returns a value equal to the nearest integer that is less then or equal to x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floor.xml">GLSL floor man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType floor(genType const & x); genType floor(genType const & x);
//! Returns a value equal to the nearest integer to x //! Returns a value equal to the nearest integer to x
//! whose absolute value is not larger than the absolute value of x. //! whose absolute value is not larger than the absolute value of x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/trunc.xml">GLSL trunc man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType trunc(genType const & x); genType trunc(genType const & x);
@ -52,31 +60,41 @@ namespace glm
//! implementation, presumably the direction that is fastest. //! implementation, presumably the direction that is fastest.
//! This includes the possibility that round(x) returns the //! This includes the possibility that round(x) returns the
//! same value as roundEven(x) for all values of x. //! same value as roundEven(x) for all values of x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/round.xml">GLSL round man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType round(genType const & x); genType round(genType const & x);
//! Returns a value equal to the nearest integer to x. //! Returns a value equal to the nearest integer to x.
//! A fractional part of 0.5 will round toward the nearest even //! A fractional part of 0.5 will round toward the nearest even
//! integer. (Both 3.5 and 4.5 for x will return 4.0.) //! integer. (Both 3.5 and 4.5 for x will return 4.0.)
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/roundEven.xml">GLSL roundEven man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType roundEven(genType const & x); genType roundEven(genType const & x);
//! Returns a value equal to the nearest integer //! Returns a value equal to the nearest integer
//! that is greater than or equal to x. //! that is greater than or equal to x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/ceil.xml">GLSL ceil man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType ceil(genType const & x); genType ceil(genType const & x);
//! Return x - floor(x). //! Return x - floor(x).
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fract.xml">GLSL fract man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType fract(genType const & x); genType fract(genType const & x);
//! Modulus. Returns x - y * floor(x / y) //! Modulus. Returns x - y * floor(x / y)
//! for each component in x using the floating point value y. //! for each component in x using the floating point value y.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType mod( genType mod(
genType const & x, genType const & x,
@ -84,7 +102,9 @@ namespace glm
//! Modulus. Returns x - y * floor(x / y) //! Modulus. Returns x - y * floor(x / y)
//! for each component in x using the floating point value y. //! for each component in x using the floating point value y.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType mod( genType mod(
genType const & x, genType const & x,
@ -94,14 +114,18 @@ namespace glm
//! part (as a whole number floating point value). Both the //! part (as a whole number floating point value). Both the
//! return value and the output parameter will have the same //! return value and the output parameter will have the same
//! sign as x. //! sign as x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/modf.xml">GLSL modf man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType modf( genType modf(
genType const & x, genType const & x,
genType & i); genType & i);
//! Returns y if y < x; otherwise, it returns x. //! Returns y if y < x; otherwise, it returns x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/min.xml">GLSL min man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType min( genType min(
genType const & x, genType const & x,
@ -113,7 +137,9 @@ namespace glm
typename genType::value_type const & y); typename genType::value_type const & y);
//! Returns y if x < y; otherwise, it returns x. //! Returns y if x < y; otherwise, it returns x.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/max.xml">GLSL max man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType max( genType max(
genType const & x, genType const & x,
@ -126,7 +152,9 @@ namespace glm
//! Returns min(max(x, minVal), maxVal) for each component in x //! Returns min(max(x, minVal), maxVal) for each component in x
//! using the floating-point values minVal and maxVal. //! using the floating-point values minVal and maxVal.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/clamp.xml">GLSL clamp man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType clamp( genType clamp(
genType const & x, genType const & x,
@ -156,7 +184,8 @@ namespace glm
//! genType mix(genType x, genType y, genType(a)) //! genType mix(genType x, genType y, genType(a))
//! where a is a Boolean vector. //! where a is a Boolean vector.
//! //!
//! From GLSL 1.30.08 specification, section 8.3 //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mix.xml">GLSL mix man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
//! //!
//! \param[in] x Floating point scalar or vector. //! \param[in] x Floating point scalar or vector.
//! \param[in] y Floating point scalar or vector. //! \param[in] y Floating point scalar or vector.
@ -167,7 +196,9 @@ namespace glm
genTypeT mix(genTypeT const & x, genTypeT const & y, genTypeU const & a); genTypeT mix(genTypeT const & x, genTypeT const & y, genTypeU const & a);
//! Returns 0.0 if x < edge, otherwise it returns 1.0. //! Returns 0.0 if x < edge, otherwise it returns 1.0.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/step.xml">GLSL step man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType step( genType step(
genType const & edge, genType const & edge,
@ -187,7 +218,9 @@ namespace glm
//! t = clamp ((x – edge0) / (edge1 – edge0), 0, 1); //! t = clamp ((x – edge0) / (edge1 – edge0), 0, 1);
//! return t * t * (3 – 2 * t); //! return t * t * (3 – 2 * t);
//! Results are undefined if edge0 >= edge1. //! Results are undefined if edge0 >= edge1.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/smoothstep.xml">GLSL smoothstep man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
genType smoothstep( genType smoothstep(
genType const & edge0, genType const & edge0,
@ -205,7 +238,9 @@ namespace glm
//! floating point representations. Returns false otherwise, //! floating point representations. Returns false otherwise,
//! including for implementations with no NaN //! including for implementations with no NaN
//! representations. //! representations.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
typename genType::bool_type isnan(genType const & x); typename genType::bool_type isnan(genType const & x);
@ -214,35 +249,56 @@ namespace glm
//! set of floating point representations. Returns false //! set of floating point representations. Returns false
//! otherwise, including for implementations with no infinity //! otherwise, including for implementations with no infinity
//! representations. //! representations.
//! (From GLSL 1.30.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isinf.xml">GLSL isinf man page</a>
//! \li GLSL 1.30.08 specification, section 8.3
template <typename genType> template <typename genType>
typename genType::bool_type isinf(genType const & x); typename genType::bool_type isinf(genType const & x);
//! Returns a signed or unsigned integer value representing //! Returns a signed integer value representing
//! the encoding of a floating-point value. The floatingpoint //! the encoding of a floating-point value. The floatingpoint
//! value's bit-level representation is preserved. //! value's bit-level representation is preserved.
//! (From GLSL 4.00.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToInt.xml">GLSL floatBitsToInt man page</a>
//! \li GLSL 4.00.08 specification, section 8.3
template <typename genType, typename genIType> template <typename genType, typename genIType>
genIType floatBitsToInt(genType const & value); genIType floatBitsToInt(genType const & value);
//! Returns a signed or unsigned integer value representing //! Returns a unsigned integer value representing
//! the encoding of a floating-point value. The floatingpoint //! the encoding of a floating-point value. The floatingpoint
//! value's bit-level representation is preserved. //! value's bit-level representation is preserved.
//! (From GLSL 4.00.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/floatBitsToUint.xml">GLSL floatBitsToUint man page</a>
//! \li GLSL 4.00.08 specification, section 8.3
template <typename genType, typename genUType> template <typename genType, typename genUType>
genUType floatBitsToInt(genType const & value); genUType floatBitsToUint(genType const & value);
//! Returns a floating-point value corresponding to a signed //! Returns a floating-point value corresponding to a signed
//! or unsigned integer encoding of a floating-point value. //! integer encoding of a floating-point value.
//! If an inf or NaN is passed in, it will not signal, and the //! If an inf or NaN is passed in, it will not signal, and the
//! resulting floating point value is unspecified. Otherwise, //! resulting floating point value is unspecified. Otherwise,
//! the bit-level representation is preserved. //! the bit-level representation is preserved.
//! (From GLSL 4.00.08 specification, section 8.3) //!
template <typename genType, typename genIUType> //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/intBitsToFloat.xml">GLSL intBitsToFloat man page</a>
genType intBitsToFloat(genIUType const & value); //! \li GLSL 4.00.08 specification, section 8.3
template <typename genType, typename genIType>
genType intBitsToFloat(genIType const & value);
//! Returns a floating-point value corresponding to a
//! unsigned integer encoding of a floating-point value.
//! If an inf or NaN is passed in, it will not signal, and the
//! resulting floating point value is unspecified. Otherwise,
//! the bit-level representation is preserved.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uintBitsToFloat.xml">GLSL uintBitsToFloat man page</a>
//! \li GLSL 4.00.08 specification, section 8.3
template <typename genType, typename genUType>
genType uintBitsToFloat(genUType const & value);
//! Computes and returns a * b + c. //! Computes and returns a * b + c.
//! (From GLSL 4.00.08 specification, section 8.3) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/fma.xml">GLSL fma man page</a>
//! \li GLSL 4.00.08 specification, section 8.3
template <typename genType> template <typename genType>
genType fma(genType const & a, genType const & b, genType const & c); genType fma(genType const & a, genType const & b, genType const & c);

28
glm/core/func_exponential.hpp
View File

@ -25,40 +25,54 @@ namespace glm
///@{ ///@{
//! Returns x raised to the y power. //! Returns x raised to the y power.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/pow.xml">GLSL pow man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType pow(genType const & x, genType const & y); genType pow(genType const & x, genType const & y);
//! Returns the natural exponentiation of x, i.e., e^x. //! Returns the natural exponentiation of x, i.e., e^x.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp.xml">GLSL exp man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType exp(genType const & x); genType exp(genType const & x);
//! Returns the natural logarithm of x, i.e., //! Returns the natural logarithm of x, i.e.,
//! returns the value y which satisfies the equation x = e^y. //! returns the value y which satisfies the equation x = e^y.
//! Results are undefined if x <= 0. //! Results are undefined if x <= 0.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log.xml">GLSL log man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType log(genType const & x); genType log(genType const & x);
//! Returns 2 raised to the x power. //! Returns 2 raised to the x power.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/exp2.xml">GLSL exp2 man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType exp2(genType const & x); genType exp2(genType const & x);
//! Returns the base 2 log of x, i.e., returns the value y, //! Returns the base 2 log of x, i.e., returns the value y,
//! which satisfies the equation x = 2 ^ y. //! which satisfies the equation x = 2 ^ y.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/log2.xml">GLSL log2 man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType log2(genType const & x); genType log2(genType const & x);
//! Returns the positive square root of x. //! Returns the positive square root of x.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sqrt.xml">GLSL sqrt man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType sqrt(genType const & x); genType sqrt(genType const & x);
//! Returns the reciprocal of the positive square root of x. //! Returns the reciprocal of the positive square root of x.
//! (From GLSL 1.30.08 specification, section 8.2) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inversesqrt.xml">GLSL inversesqrt man page</a>
//! \li GLSL 1.30.08 specification, section 8.2
template <typename genType> template <typename genType>
genType inversesqrt(genType const & x); genType inversesqrt(genType const & x);

32
glm/core/func_geometric.hpp
View File

@ -25,40 +25,52 @@ namespace glm
///@{ ///@{
//! Returns the length of x, i.e., sqrt(x * x). //! Returns the length of x, i.e., sqrt(x * x).
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/length.xml">GLSL length man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
typename genType::value_type length( typename genType::value_type length(
genType const & x); genType const & x);
//! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1). //! Returns the distance betwwen p0 and p1, i.e., length(p0 - p1).
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/distance.xml">GLSL distance man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
typename genType::value_type distance( typename genType::value_type distance(
genType const & p0, genType const & p0,
genType const & p1); genType const & p1);
//! Returns the dot product of x and y, i.e., result = x * y. //! Returns the dot product of x and y, i.e., result = x * y.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/dot.xml">GLSL dot man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
typename genType::value_type dot( typename genType::value_type dot(
genType const & x, genType const & x,
genType const & y); genType const & y);
//! Returns the cross product of x and y. //! Returns the cross product of x and y.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cross.xml">GLSL cross man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename T> template <typename T>
detail::tvec3<T> cross( detail::tvec3<T> cross(
detail::tvec3<T> const & x, detail::tvec3<T> const & x,
detail::tvec3<T> const & y); detail::tvec3<T> const & y);
//! Returns a vector in the same direction as x but with length of 1. //! Returns a vector in the same direction as x but with length of 1.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/normalize.xml">GLSL normalize man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
genType normalize( genType normalize(
genType const & x); genType const & x);
//! If dot(Nref, I) < 0.0, return N, otherwise, return -N. //! If dot(Nref, I) < 0.0, return N, otherwise, return -N.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/faceforward.xml">GLSL faceforward man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
genType faceforward( genType faceforward(
genType const & N, genType const & N,
@ -67,7 +79,9 @@ namespace glm
//! For the incident vector I and surface orientation N, //! For the incident vector I and surface orientation N,
//! returns the reflection direction : result = I - 2.0 * dot(N, I) * N. //! returns the reflection direction : result = I - 2.0 * dot(N, I) * N.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/reflect.xml">GLSL reflect man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
genType reflect( genType reflect(
genType const & I, genType const & I,
@ -76,7 +90,9 @@ namespace glm
//! For the incident vector I and surface normal N, //! For the incident vector I and surface normal N,
//! and the ratio of indices of refraction eta, //! and the ratio of indices of refraction eta,
//! return the refraction vector. //! return the refraction vector.
//! (From GLSL 1.30.08 specification, section 8.4) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/refract.xml">GLSL refract man page</a>
//! \li GLSL 1.30.08 specification, section 8.4
template <typename genType> template <typename genType>
genType refract( genType refract(
genType const & I, genType const & I,

36
glm/core/func_integer.hpp
View File

@ -28,7 +28,8 @@ namespace glm
//! modulo pow(2, 32). The value carry is set to 0 if the sum was //! modulo pow(2, 32). The value carry is set to 0 if the sum was
//! less than pow(2, 32), or to 1 otherwise. //! less than pow(2, 32), or to 1 otherwise.
//! //!
//! (From GLSL 4.00.08 specification, section 8.8) //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/uaddCarry.xml">GLSL uaddCarry man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genUType> template <typename genUType>
genUType uaddCarry( genUType uaddCarry(
genUType const & x, genUType const & x,
@ -39,7 +40,8 @@ namespace glm
//! the difference if non-negative, or pow(2, 32) plus the difference //! the difference if non-negative, or pow(2, 32) plus the difference
//! otherwise. The value borrow is set to 0 if x >= y, or to 1 otherwise. //! otherwise. The value borrow is set to 0 if x >= y, or to 1 otherwise.
//! //!
//! (From GLSL 4.00.08 specification, section 8.8) //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/usubBorrow.xml">GLSL usubBorrow man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genUType> template <typename genUType>
genUType usubBorrow( genUType usubBorrow(
genUType const & x, genUType const & x,
@ -49,7 +51,9 @@ namespace glm
//! Multiplies 32-bit integers x and y, producing a 64-bit //! Multiplies 32-bit integers x and y, producing a 64-bit
//! result. The 32 least-significant bits are returned in lsb. //! result. The 32 least-significant bits are returned in lsb.
//! The 32 most-significant bits are returned in msb. //! The 32 most-significant bits are returned in msb.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/umulExtended.xml">GLSL umulExtended man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genUType> template <typename genUType>
void umulExtended( void umulExtended(
genUType const & x, genUType const & x,
@ -60,7 +64,9 @@ namespace glm
//! Multiplies 32-bit integers x and y, producing a 64-bit //! Multiplies 32-bit integers x and y, producing a 64-bit
//! result. The 32 least-significant bits are returned in lsb. //! result. The 32 least-significant bits are returned in lsb.
//! The 32 most-significant bits are returned in msb. //! The 32 most-significant bits are returned in msb.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/imulExtended.xml">GLSL imulExtended man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genIType> template <typename genIType>
void imulExtended( void imulExtended(
genIType const & x, genIType const & x,
@ -79,7 +85,8 @@ namespace glm
//! offset and bits is greater than the number of bits used //! offset and bits is greater than the number of bits used
//! to store the operand. //! to store the operand.
//! //!
//! (From GLSL 4.00.08 specification, section 8.8) //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldExtract.xml">GLSL bitfieldExtract man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genIUType> template <typename genIUType>
genIUType bitfieldExtract( genIUType bitfieldExtract(
genIUType const & Value, genIUType const & Value,
@ -96,7 +103,8 @@ namespace glm
//! offset and bits is greater than the number of bits used to //! offset and bits is greater than the number of bits used to
//! store the operand. //! store the operand.
//! //!
//! (From GLSL 4.00.08 specification, section 8.8) //! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldInsert.xml">GLSL bitfieldInsert man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genIUType> template <typename genIUType>
genIUType bitfieldInsert( genIUType bitfieldInsert(
genIUType const & Base, genIUType const & Base,
@ -107,19 +115,25 @@ namespace glm
//! Returns the reversal of the bits of value. //! Returns the reversal of the bits of value.
//! The bit numbered n of the result will be taken from bit (bits - 1) - n of value, //! The bit numbered n of the result will be taken from bit (bits - 1) - n of value,
//! where bits is the total number of bits used to represent value. //! where bits is the total number of bits used to represent value.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitfieldReverse.xml">GLSL bitfieldReverse man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename genIUType> template <typename genIUType>
genIUType bitfieldReverse(genIUType const & value); genIUType bitfieldReverse(genIUType const & value);
//! Returns the number of bits set to 1 in the binary representation of value. //! Returns the number of bits set to 1 in the binary representation of value.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/bitCount.xml">GLSL bitCount man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
typename C<T>::signed_type bitCount(C<T> const & Value); typename C<T>::signed_type bitCount(C<T> const & Value);
//! Returns the bit number of the least significant bit set to //! Returns the bit number of the least significant bit set to
//! 1 in the binary representation of value. //! 1 in the binary representation of value.
//! If value is zero, -1 will be returned. //! If value is zero, -1 will be returned.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findLSB.xml">GLSL findLSB man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
typename C<T>::signed_type findLSB(C<T> const & Value); typename C<T>::signed_type findLSB(C<T> const & Value);
@ -127,7 +141,9 @@ namespace glm
//! For positive integers, the result will be the bit number of the most significant bit set to 1. //! For positive integers, the result will be the bit number of the most significant bit set to 1.
//! For negative integers, the result will be the bit number of the most significant //! For negative integers, the result will be the bit number of the most significant
//! bit set to 0. For a value of zero or negative one, -1 will be returned. //! bit set to 0. For a value of zero or negative one, -1 will be returned.
//! (From GLSL 4.00.08 specification, section 8.8) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/findMSB.xml">GLSL findMSB man page</a>
//! \li GLSL 4.00.08 specification, section 8.8
template <typename T, template <typename> class C> template <typename T, template <typename> class C>
typename C<T>::signed_type findMSB(C<T> const & Value); typename C<T>::signed_type findMSB(C<T> const & Value);

36
glm/core/func_matrix.hpp
View File

@ -26,7 +26,9 @@ namespace glm
//! Multiply matrix x by matrix y component-wise, i.e., //! Multiply matrix x by matrix y component-wise, i.e.,
//! result[i][j] is the scalar product of x[i][j] and y[i][j]. //! result[i][j] is the scalar product of x[i][j] and y[i][j].
//! (From GLSL 1.30.08 specification, section 8.5) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/matrixCompMult.xml">GLSL matrixCompMult man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename matType> template <typename matType>
matType matrixCompMult( matType matrixCompMult(
matType const & x, matType const & x,
@ -35,50 +37,66 @@ namespace glm
//! Treats the first parameter c as a column vector //! Treats the first parameter c as a column vector
//! and the second parameter r as a row vector //! and the second parameter r as a row vector
//! and does a linear algebraic matrix multiply c * r. //! and does a linear algebraic matrix multiply c * r.
//! (From GLSL 1.30.08 specification, section 8.5) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/outerProduct.xml">GLSL outerProduct man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename vecType, typename matType> template <typename vecType, typename matType>
matType outerProduct( matType outerProduct(
vecType const & c, vecType const & c,
vecType const & r); vecType const & r);
//! Returns the transposed matrix of x //! Returns the transposed matrix of x
//! (From GLSL 1.30.08 specification, section 8.5) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/transpose.xml">GLSL transpose man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename matType> template <typename matType>
typename matType::transpose_type transpose( typename matType::transpose_type transpose(
matType const & x); matType const & x);
//! Return the determinant of a mat2 matrix. //! Return the determinant of a mat2 matrix.
//! (From GLSL 1.50.09 specification, section 8.5).. //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename T> template <typename T>
typename detail::tmat2x2<T>::value_type determinant( typename detail::tmat2x2<T>::value_type determinant(
detail::tmat2x2<T> const & m); detail::tmat2x2<T> const & m);
//! Return the determinant of a mat3 matrix. //! Return the determinant of a mat3 matrix.
//! (From GLSL 1.50.09 specification, section 8.5). //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename T> template <typename T>
typename detail::tmat3x3<T>::value_type determinant( typename detail::tmat3x3<T>::value_type determinant(
detail::tmat3x3<T> const & m); detail::tmat3x3<T> const & m);
//! Return the determinant of a mat4 matrix. //! Return the determinant of a mat4 matrix.
//! (From GLSL 1.50.09 specification, section 8.5). //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/determinant.xml">GLSL determinant man page</a>
//! \li GLSL 1.30.08 specification, section 8.5
template <typename T> template <typename T>
typename detail::tmat4x4<T>::value_type determinant( typename detail::tmat4x4<T>::value_type determinant(
detail::tmat4x4<T> const & m); detail::tmat4x4<T> const & m);
//! Return the inverse of a mat2 matrix. //! Return the inverse of a mat2 matrix.
//! (From GLSL 1.40.07 specification, section 8.5). //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
//! \li GLSL 1.40.07 specification, section 8.5
template <typename T> template <typename T>
detail::tmat2x2<T> inverse( detail::tmat2x2<T> inverse(
detail::tmat2x2<T> const & m); detail::tmat2x2<T> const & m);
//! Return the inverse of a mat3 matrix. //! Return the inverse of a mat3 matrix.
//! (From GLSL 1.40.07 specification, section 8.5). //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
//! \li GLSL 1.40.07 specification, section 8.5
template <typename T> template <typename T>
detail::tmat3x3<T> inverse( detail::tmat3x3<T> inverse(
detail::tmat3x3<T> const & m); detail::tmat3x3<T> const & m);
//! Return the inverse of a mat4 matrix. //! Return the inverse of a mat4 matrix.
//! (From GLSL 1.40.07 specification, section 8.5). //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/inverse.xml">GLSL inverse man page</a>
//! \li GLSL 1.40.07 specification, section 8.5
template <typename T> template <typename T>
detail::tmat4x4<T> inverse( detail::tmat4x4<T> inverse(
detail::tmat4x4<T> const & m); detail::tmat4x4<T> const & m);

24
glm/core/func_noise.hpp
View File

@ -24,23 +24,31 @@ namespace glm
/// \addtogroup core_funcs /// \addtogroup core_funcs
///@{ ///@{
// Returns a 1D noise value based on the input value x. //! Returns a 1D noise value based on the input value x.
// From GLSL 1.30.08 specification, section 8.9. //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise1.xml">GLSL noise1 man page</a>
//! \li GLSL 1.30.08 specification, section 8.9
template <typename genType> template <typename genType>
typename genType::value_type noise1(genType const & x); typename genType::value_type noise1(genType const & x);
// Returns a 2D noise value based on the input value x. //! Returns a 2D noise value based on the input value x.
// From GLSL 1.30.08 specification, section 8.9. //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise2.xml">GLSL noise2 man page</a>
//! \li GLSL 1.30.08 specification, section 8.9
template <typename genType> template <typename genType>
detail::tvec2<typename genType::value_type> noise2(genType const & x); detail::tvec2<typename genType::value_type> noise2(genType const & x);
// Returns a 3D noise value based on the input value x. //! Returns a 3D noise value based on the input value x.
// From GLSL 1.30.08 specification, section 8.9. //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise3.xml">GLSL noise3 man page</a>
//! \li GLSL 1.30.08 specification, section 8.9
template <typename genType> template <typename genType>
detail::tvec3<typename genType::value_type> noise3(genType const & x); detail::tvec3<typename genType::value_type> noise3(genType const & x);
// Returns a 4D noise value based on the input value x. //! Returns a 4D noise value based on the input value x.
// From GLSL 1.30.08 specification, section 8.9. //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/noise4.xml">GLSL noise4 man page</a>
//! \li GLSL 1.30.08 specification, section 8.9
template <typename genType> template <typename genType>
detail::tvec4<typename genType::value_type> noise4(genType const & x); detail::tvec4<typename genType::value_type> noise4(genType const & x);

86
glm/core/func_packing.hpp
View File

@ -24,15 +24,101 @@ namespace glm
/// \addtogroup core_funcs /// \addtogroup core_funcs
///@{ ///@{
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
//!
//! The conversion for component c of v to fixed point is done as follows:
//! packUnorm2x16: round(clamp(c, 0, +1) * 65535.0)
//!
//! The first component of the vector will be written to the least significant bits of the output;
//! the last component will be written to the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm2x16.xml">GLSL packUnorm2x16 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::uint32 packUnorm2x16(detail::tvec2<detail::float32> const & v); detail::uint32 packUnorm2x16(detail::tvec2<detail::float32> const & v);
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
//!
//! The conversion for component c of v to fixed point is done as follows:
//! packUnorm4x8: round(clamp(c, 0, +1) * 255.0)
//!
//! The first component of the vector will be written to the least significant bits of the output;
//! the last component will be written to the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packUnorm4x8.xml">GLSL packUnorm4x8 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::uint32 packUnorm4x8(detail::tvec4<detail::float32> const & v); detail::uint32 packUnorm4x8(detail::tvec4<detail::float32> const & v);
//! First, converts each component of the normalized floating-point value v into 8- or 16-bit integer values.
//! Then, the results are packed into the returned 32-bit unsigned integer.
//!
//! The conversion for component c of v to fixed point is done as follows:
//! packSnorm4x8: round(clamp(c, -1, +1) * 127.0)
//!
//! The first component of the vector will be written to the least significant bits of the output;
//! the last component will be written to the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packSnorm4x8.xml">GLSL packSnorm4x8 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::uint32 packSnorm4x8(detail::tvec4<detail::float32> const & v); detail::uint32 packSnorm4x8(detail::tvec4<detail::float32> const & v);
//! First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
//! Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
//!
//! The conversion for unpacked fixed-point value f to floating point is done as follows:
//! unpackUnorm2x16: f / 65535.0
//!
//! The first component of the returned vector will be extracted from the least significant bits of the input;
//! the last component will be extracted from the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm2x16.xml">GLSL unpackUnorm2x16 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::tvec2<detail::float32> unpackUnorm2x16(detail::uint32 const & p); detail::tvec2<detail::float32> unpackUnorm2x16(detail::uint32 const & p);
//! First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
//! Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
//!
//! The conversion for unpacked fixed-point value f to floating point is done as follows:
//! unpackUnorm4x8: f / 255.0
//!
//! The first component of the returned vector will be extracted from the least significant bits of the input;
//! the last component will be extracted from the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackUnorm4x8.xml">GLSL unpackUnorm4x8 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p); detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p);
//! First, unpacks a single 32-bit unsigned integer p into a pair of 16-bit unsigned integers, four 8-bit unsigned integers, or four 8-bit signed integers.
//! Then, each component is converted to a normalized floating-point value to generate the returned two- or four-component vector.
//!
//! The conversion for unpacked fixed-point value f to floating point is done as follows:
//! unpackSnorm4x8: clamp(f / 127.0, -1, +1)
//!
//! The first component of the returned vector will be extracted from the least significant bits of the input;
//! the last component will be extracted from the most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackSnorm4x8.xml">GLSL unpackSnorm4x8 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p); detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p);
//! Returns a double-precision value obtained by packing the components of v into a 64-bit value.
//! If an IEEE 754 Inf or NaN is created, it will not signal, and the resulting floating point value is unspecified.
//! Otherwise, the bit- level representation of v is preserved.
//! The first vector component specifies the 32 least significant bits;
//! the second component specifies the 32 most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/packDouble2x32.xml">GLSL packDouble2x32 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
double packDouble2x32(detail::tvec2<detail::uint32> const & v); double packDouble2x32(detail::tvec2<detail::uint32> const & v);
//! Returns a two-component unsigned integer vector representation of v.
//! The bit-level representation of v is preserved.
//! The first component of the vector contains the 32 least significant bits of the double;
//! the second component consists the 32 most significant bits.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/unpackDouble2x32.xml">GLSL unpackDouble2x32 man page</a>
//! \li GLSL 4.00.08 specification, section 8.4
detail::tvec2<detail::uint32> unpackDouble2x32(double const & v); detail::tvec2<detail::uint32> unpackDouble2x32(double const & v);
///@} ///@}

60
glm/core/func_trigonometric.hpp
View File

@ -27,43 +27,57 @@ namespace glm
///@{ ///@{
//! Converts degrees to radians and returns the result. //! Converts degrees to radians and returns the result.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/radians.xml">GLSL radians man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType radians(genType const & degrees); genType radians(genType const & degrees);
//! Converts radians to degrees and returns the result. //! Converts radians to degrees and returns the result.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/degrees.xml">GLSL degrees man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType degrees(genType const & radians); genType degrees(genType const & radians);
//! The standard trigonometric sine function. //! The standard trigonometric sine function.
//! The values returned by this function will range from [-1, 1]. //! The values returned by this function will range from [-1, 1].
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sin.xml">GLSL sin man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType sin(genType const & angle); genType sin(genType const & angle);
//! The standard trigonometric cosine function. //! The standard trigonometric cosine function.
//! The values returned by this function will range from [-1, 1]. //! The values returned by this function will range from [-1, 1].
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cos.xml">GLSL cos man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType cos(genType const & angle); genType cos(genType const & angle);
//! The standard trigonometric tangent function. //! The standard trigonometric tangent function.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tan.xml">GLSL tan man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType tan(genType const & angle); genType tan(genType const & angle);
//! Arc sine. Returns an angle whose sine is x. //! Arc sine. Returns an angle whose sine is x.
//! The range of values returned by this function is [-PI/2, PI/2]. //! The range of values returned by this function is [-PI/2, PI/2].
//! Results are undefined if |x| > 1. //! Results are undefined if |x| > 1.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asin.xml">GLSL asin man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType asin(genType const & x); genType asin(genType const & x);
//! Arc cosine. Returns an angle whose sine is x. //! Arc cosine. Returns an angle whose sine is x.
//! The range of values returned by this function is [0, PI]. //! The range of values returned by this function is [0, PI].
//! Results are undefined if |x| > 1. //! Results are undefined if |x| > 1.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acos.xml">GLSL acos man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType acos(genType const & x); genType acos(genType const & x);
@ -72,45 +86,61 @@ namespace glm
//! quadrant the angle is in. The range of values returned //! quadrant the angle is in. The range of values returned
//! by this function is [-PI, PI]. Results are undefined //! by this function is [-PI, PI]. Results are undefined
//! if x and y are both 0. //! if x and y are both 0.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType atan(genType const & y, genType const & x); genType atan(genType const & y, genType const & x);
//! Arc tangent. Returns an angle whose tangent is y_over_x. //! Arc tangent. Returns an angle whose tangent is y_over_x.
//! The range of values returned by this function is [-PI/2, PI/2]. //! The range of values returned by this function is [-PI/2, PI/2].
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atan.xml">GLSL atan man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType atan(genType const & y_over_x); genType atan(genType const & y_over_x);
//! Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2 //! Returns the hyperbolic sine function, (exp(x) - exp(-x)) / 2
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/sinh.xml">GLSL sinh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType sinh(genType const & angle); genType sinh(genType const & angle);
//! Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2 //! Returns the hyperbolic cosine function, (exp(x) + exp(-x)) / 2
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/cosh.xml">GLSL cosh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType cosh(genType const & angle); genType cosh(genType const & angle);
//! Returns the hyperbolic tangent function, sinh(angle) / cosh(angle) //! Returns the hyperbolic tangent function, sinh(angle) / cosh(angle)
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/tanh.xml">GLSL tanh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType tanh(genType const & angle); genType tanh(genType const & angle);
//! Arc hyperbolic sine; returns the inverse of sinh. //! Arc hyperbolic sine; returns the inverse of sinh.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/asinh.xml">GLSL asinh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType asinh(genType const & x); genType asinh(genType const & x);
//! Arc hyperbolic cosine; returns the non-negative inverse //! Arc hyperbolic cosine; returns the non-negative inverse
//! of cosh. Results are undefined if x < 1. //! of cosh. Results are undefined if x < 1.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/acosh.xml">GLSL acosh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType acosh(genType const & x); genType acosh(genType const & x);
//! Arc hyperbolic tangent; returns the inverse of tanh. //! Arc hyperbolic tangent; returns the inverse of tanh.
//! Results are undefined if abs(x) >= 1. //! Results are undefined if abs(x) >= 1.
//! (From GLSL 1.30.08 specification, section 8.1) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/atanh.xml">GLSL atanh man page</a>
//! \li GLSL 1.30.08 specification, section 8.1
template <typename genType> template <typename genType>
genType atanh(genType const & x); genType atanh(genType const & x);

39
glm/core/func_vector_relational.hpp
View File

@ -20,7 +20,7 @@ namespace glm
namespace core{ namespace core{
namespace function{ namespace function{
//! Define vector relational functions from Section 8.3 of GLSL 1.30.8 specification. //! Define vector relational functions from Section 8.6 of GLSL 1.30.8 specification.
//! Included in glm namespace. //! Included in glm namespace.
namespace vector_relational namespace vector_relational
{ {
@ -28,7 +28,9 @@ namespace glm
///@{ ///@{
//! Returns the component-wise comparison result of x < y. //! Returns the component-wise comparison result of x < y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThan.xml">GLSL lessThan man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type lessThan inline typename vecType<T>::bool_type lessThan
( (
@ -49,7 +51,9 @@ namespace glm
} }
//! Returns the component-wise comparison of result x <= y. //! Returns the component-wise comparison of result x <= y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/lessThanEqual.xml">GLSL lessThanEqual man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type lessThanEqual inline typename vecType<T>::bool_type lessThanEqual
( (
@ -69,7 +73,9 @@ namespace glm
} }
//! Returns the component-wise comparison of result x > y. //! Returns the component-wise comparison of result x > y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThan.xml">GLSL greaterThan man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type greaterThan inline typename vecType<T>::bool_type greaterThan
( (
@ -89,7 +95,9 @@ namespace glm
} }
//! Returns the component-wise comparison of result x >= y. //! Returns the component-wise comparison of result x >= y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/greaterThanEqual.xml">GLSL greaterThanEqual man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type greaterThanEqual inline typename vecType<T>::bool_type greaterThanEqual
( (
@ -109,7 +117,9 @@ namespace glm
} }
//! Returns the component-wise comparison of result x == y. //! Returns the component-wise comparison of result x == y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/equal.xml">GLSL equal man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type equal inline typename vecType<T>::bool_type equal
( (
@ -127,7 +137,9 @@ namespace glm
} }
//! Returns the component-wise comparison of result x != y. //! Returns the component-wise comparison of result x != y.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/notEqual.xml">GLSL notEqual man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <typename T, template <typename> class vecType> template <typename T, template <typename> class vecType>
inline typename vecType<T>::bool_type notEqual inline typename vecType<T>::bool_type notEqual
( (
@ -145,7 +157,9 @@ namespace glm
} }
//! Returns true if any component of x is true. //! Returns true if any component of x is true.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/any.xml">GLSL any man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <template <typename> class vecType> template <template <typename> class vecType>
inline bool any(vecType<bool> const & v) inline bool any(vecType<bool> const & v)
{ {
@ -159,7 +173,9 @@ namespace glm
} }
//! Returns true if all components of x are true. //! Returns true if all components of x are true.
//! (From GLSL 1.30.08 specification, section 8.6) //!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/all.xml">GLSL all man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <template <typename> class vecType> template <template <typename> class vecType>
inline bool all(vecType<bool> const & v) inline bool all(vecType<bool> const & v)
{ {
@ -173,7 +189,10 @@ namespace glm
} }
//! Returns the component-wise logical complement of x. //! Returns the component-wise logical complement of x.
//! (From GLSL 1.30.08 specification, section 8.6) //! /!\ Because of language incompatibilities between C++ and GLSL, GLM defines the function not but not_ instead.
//!
//! \li <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/not.xml">GLSL not man page</a>
//! \li GLSL 1.30.08 specification, section 8.6
template <template <typename> class vecType> template <template <typename> class vecType>
inline vecType<bool> not_(vecType<bool> const & v) inline vecType<bool> not_(vecType<bool> const & v)
{ {

11
glm/gtc/type_ptr.hpp
View File

@ -15,6 +15,7 @@
// Dependency: // Dependency:
#include "../glm.hpp" #include "../glm.hpp"
#include <cstring>
#if(defined(GLM_MESSAGES) && !defined(glm_ext)) #if(defined(GLM_MESSAGES) && !defined(glm_ext))
# pragma message("GLM: GLM_GTC_type_ptr extension included") # pragma message("GLM: GLM_GTC_type_ptr extension included")
@ -420,23 +421,23 @@ namespace glm
template<typename T> template<typename T>
inline detail::tmat2x2<T> make_mat2(T const * const ptr) inline detail::tmat2x2<T> make_mat2(T const * const ptr)
{ {
return make_mat2x2(Result); return make_mat2x2(ptr);
} }
//! Build a matrix from a pointer. //! Build a matrix from a pointer.
//! From GLM_GTC_type_ptr extension. //! From GLM_GTC_type_ptr extension.
template<typename T> template<typename T>
inline detail::tmat3<T> make_mat3(T const * const ptr) inline detail::tmat3x3<T> make_mat3(T const * const ptr)
{ {
return make_mat3x3(Result); return make_mat3x3(ptr);
} }
//! Build a matrix from a pointer. //! Build a matrix from a pointer.
//! From GLM_GTC_type_ptr extension. //! From GLM_GTC_type_ptr extension.
template<typename T> template<typename T>
inline detail::tmat4<T> make_mat4(T const * const ptr) inline detail::tmat4x4<T> make_mat4(T const * const ptr)
{ {
return make_mat4x4(Result); return make_mat4x4(ptr);
} }
///@} ///@}