mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-22 17:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed operators declarations

Browse Source
This commit is contained in:
Christophe Riccio 2010-10-05 23:32:02 +01:00
parent 1e8cec2eb6
commit 64677b50a0
10 changed files with 65 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glm/core/type_mat2x2.hpp
View File

@ -160,13 +160,13 @@ namespace glm
tmat2x2<T> const & m); tmat2x2<T> const & m);
template <typename T> template <typename T>
typename tmat2x2<T>::row_type operator* ( typename tmat2x2<T>::col_type operator* (
tmat2x2<T> const & m, tmat2x2<T> const & m,
typename tmat2x2<T>::col_type const & s); typename tmat2x2<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat2x2<T>::col_type operator* ( typename tmat2x2<T>::row_type operator* (
typename tmat2x2<T>::row_type, typename tmat2x2<T>::col_type const & v,
tmat2x2<T> const & m); tmat2x2<T> const & m);
template <typename T> template <typename T>
@ -185,13 +185,13 @@ namespace glm
tmat2x2<T> const & m); tmat2x2<T> const & m);
template <typename T> template <typename T>
typename tmat2x2<T>::row_type operator/ ( typename tmat2x2<T>::col_type operator/ (
tmat2x2<T> const & m, tmat2x2<T> const & m,
typename tmat2x2<T>::col_type const & v); typename tmat2x2<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat2x2<T>::col_type operator/ ( typename tmat2x2<T>::row_type operator/ (
typename tmat2x2<T>::row_type & v, typename tmat2x2<T>::col_type const & v,
tmat2x2<T> const & m); tmat2x2<T> const & m);
template <typename T> template <typename T>

10
glm/core/type_mat2x3.hpp
View File

@ -35,7 +35,7 @@ namespace glm
template <typename T> struct tmat4x3; template <typename T> struct tmat4x3;
template <typename T> struct tmat4x4; template <typename T> struct tmat4x4;
//!< \brief Template for 2 * 3 matrix of floating-point numbers. //!< \brief Template for 2 columns and 3 rows matrix of floating-point numbers.
template <typename T> template <typename T>
struct tmat2x3 struct tmat2x3
{ {
@ -142,13 +142,13 @@ namespace glm
tmat2x3<T> const & m); tmat2x3<T> const & m);
template <typename T> template <typename T>
typename tmat2x3<T>::row_type operator* ( typename tmat2x3<T>::col_type operator* (
tmat2x3<T> const & m, tmat2x3<T> const & m,
typename tmat2x3<T>::col_type const & v); typename tmat2x3<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat2x3<T>::col_type operator* ( typename tmat2x3<T>::row_type operator* (
typename tmat2x3<T>::row_type const & v, typename tmat2x3<T>::col_type const & v,
tmat2x3<T> const & m); tmat2x3<T> const & m);
template <typename T> template <typename T>

10
glm/core/type_mat2x4.hpp
View File

@ -35,7 +35,7 @@ namespace glm
template <typename T> struct tmat4x3; template <typename T> struct tmat4x3;
template <typename T> struct tmat4x4; template <typename T> struct tmat4x4;
//!< \brief Template for 2 * 4 matrix of floating-point numbers. //!< \brief Template for 2 columns and 4 rows matrix of floating-point numbers.
template <typename T> template <typename T>
struct tmat2x4 struct tmat2x4
{ {
@ -142,13 +142,13 @@ namespace glm
tmat2x4<T> const & m); tmat2x4<T> const & m);
template <typename T> template <typename T>
typename tmat2x4<T>::row_type operator* ( typename tmat2x4<T>::col_type operator* (
tmat2x4<T> const & m, tmat2x4<T> const & m,
typename tmat2x4<T>::col_type const & v); typename tmat2x4<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat2x4<T>::col_type operator* ( typename tmat2x4<T>::row_type operator* (
typename tmat2x4<T>::row_type const & v, typename tmat2x4<T>::col_type const & v,
tmat2x4<T> const & m); tmat2x4<T> const & m);
template <typename T> template <typename T>

11
glm/core/type_mat2x4.inl
View File

@ -400,6 +400,12 @@ namespace detail
m[1] * s); m[1] * s);
} }
// X
// X
// X X
// X X
// X X
// X X
template <typename T> template <typename T>
inline typename tmat2x4<T>::col_type operator* inline typename tmat2x4<T>::col_type operator*
( (
@ -414,6 +420,11 @@ namespace detail
m[0][3] * v.x + m[1][3] * v.y); m[0][3] * v.x + m[1][3] * v.y);
} }
// X X
// X X
// X X
// X X
// X X X X
template <typename T> template <typename T>
inline typename tmat2x4<T>::row_type operator* inline typename tmat2x4<T>::row_type operator*
( (

10
glm/core/type_mat3x2.hpp
View File

@ -35,7 +35,7 @@ namespace glm
template <typename T> struct tmat4x3; template <typename T> struct tmat4x3;
template <typename T> struct tmat4x4; template <typename T> struct tmat4x4;
//!< \brief Template for 3 * 2 matrix of floating-point numbers. //!< \brief Template for 3 columns and 2 rows matrix of floating-point numbers.
template <typename T> template <typename T>
struct tmat3x2 struct tmat3x2
{ {
@ -144,13 +144,13 @@ namespace glm
tmat3x2<T> const & m); tmat3x2<T> const & m);
template <typename T> template <typename T>
typename tmat3x2<T>::row_type operator* ( typename tmat3x2<T>::col_type operator* (
tmat3x2<T> const & m, tmat3x2<T> const & m,
typename tmat3x2<T>::col_type const & v); typename tmat3x2<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat3x2<T>::col_type operator* ( typename tmat3x2<T>::row_type operator* (
typename tmat3x2<T>::row_type const & v, typename tmat3x2<T>::col_type const & v,
tmat3x2<T> const & m); tmat3x2<T> const & m);
template <typename T> template <typename T>

16
glm/core/type_mat3x3.hpp
View File

@ -159,13 +159,13 @@ namespace glm
tmat3x3<T> const & m); tmat3x3<T> const & m);
template <typename T> template <typename T>
typename tmat3x3<T>::row_type operator* ( typename tmat3x3<T>::col_type operator* (
tmat3x3<T> const & m, tmat3x3<T> const & m,
typename tmat3x3<T>::col_type const & v); typename tmat3x3<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat3x3<T>::col_type operator* ( typename tmat3x3<T>::row_type operator* (
typename tmat3x3<T>::row_type const & v, typename tmat3x3<T>::col_type const & v,
tmat3x3<T> const & m); tmat3x3<T> const & m);
template <typename T> template <typename T>
@ -184,13 +184,13 @@ namespace glm
tmat3x3<T> const & m); tmat3x3<T> const & m);
template <typename T> template <typename T>
typename tmat3x3<T>::row_type operator/ ( typename tmat3x3<T>::col_type operator/ (
tmat3x3<T> const & m, tmat3x3<T> const & m,
typename tmat3x3<T>::col_type const & v); typename tmat3x3<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat3x3<T>::col_type operator/ ( typename tmat3x3<T>::row_type operator/ (
typename tmat3x3<T>::row_type const & v, typename tmat3x3<T>::col_type const & v,
tmat3x3<T> const & m); tmat3x3<T> const & m);
template <typename T> template <typename T>

10
glm/core/type_mat3x4.hpp
View File

@ -35,7 +35,7 @@ namespace glm
template <typename T> struct tmat4x3; template <typename T> struct tmat4x3;
template <typename T> struct tmat4x4; template <typename T> struct tmat4x4;
//!< \brief Template for 3 * 4 matrix of floating-point numbers. //!< \brief Template for 3 columns and 4 rows matrix of floating-point numbers.
template <typename T> template <typename T>
struct tmat3x4 struct tmat3x4
{ {
@ -144,13 +144,13 @@ namespace glm
tmat3x4<T> const & m); tmat3x4<T> const & m);
template <typename T> template <typename T>
typename tmat3x4<T>::row_type operator* ( typename tmat3x4<T>::col_type operator* (
tmat3x4<T> const & m, tmat3x4<T> const & m,
typename tmat3x4<T>::col_type const & v); typename tmat3x4<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat3x4<T>::col_type operator* ( typename tmat3x4<T>::row_type operator* (
typename tmat3x4<T>::row_type const & v, typename tmat3x4<T>::col_type const & v,
tmat3x4<T> const & m); tmat3x4<T> const & m);
template <typename T> template <typename T>

8
glm/core/type_mat4x2.hpp
View File

@ -146,13 +146,13 @@ namespace glm
tmat4x2<T> const & m); tmat4x2<T> const & m);
template <typename T> template <typename T>
typename tmat4x2<T>::row_type operator* ( typename tmat4x2<T>::col_type operator* (
tmat4x2<T> const & m, tmat4x2<T> const & m,
typename tmat4x2<T>::col_type const & v); typename tmat4x2<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat4x2<T>::col_type operator* ( typename tmat4x2<T>::row_type operator* (
typename tmat4x2<T>::row_type const & v, typename tmat4x2<T>::col_type const & v,
tmat4x2<T> const & m); tmat4x2<T> const & m);
template <typename T> template <typename T>

10
glm/core/type_mat4x3.hpp
View File

@ -35,7 +35,7 @@ namespace glm
template <typename T> struct tmat4x3; template <typename T> struct tmat4x3;
template <typename T> struct tmat4x4; template <typename T> struct tmat4x4;
//!< \brief Template for 4 * 3 matrix of floating-point numbers. //!< \brief Template for 4 columns and 3 rows matrix of floating-point numbers.
template <typename T> template <typename T>
struct tmat4x3 struct tmat4x3
{ {
@ -146,13 +146,13 @@ namespace glm
tmat4x3<T> const & m); tmat4x3<T> const & m);
template <typename T> template <typename T>
typename tmat4x3<T>::row_type operator* ( typename tmat4x3<T>::col_type operator* (
tmat4x3<T> const & m, tmat4x3<T> const & m,
typename tmat4x3<T>::col_type const & v); typename tmat4x3<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat4x3<T>::col_type operator* ( typename tmat4x3<T>::row_type operator* (
typename tmat4x3<T>::row_type const & v, typename tmat4x3<T>::col_type const & v,
tmat4x3<T> const & m); tmat4x3<T> const & m);
template <typename T> template <typename T>

16
glm/core/type_mat4x4.hpp
View File

@ -161,13 +161,13 @@ namespace glm
tmat4x4<T> const & m); tmat4x4<T> const & m);
template <typename T> template <typename T>
typename tmat4x4<T>::row_type operator* ( typename tmat4x4<T>::col_type operator* (
tmat4x4<T> const & m, tmat4x4<T> const & m,
typename tmat4x4<T>::col_type const & v); typename tmat4x4<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat4x4<T>::col_type operator* ( typename tmat4x4<T>::row_type operator* (
typename tmat4x4<T>::row_type const & v, typename tmat4x4<T>::col_type const & v,
tmat4x4<T> const & m); tmat4x4<T> const & m);
template <typename T> template <typename T>
@ -186,13 +186,13 @@ namespace glm
tmat4x4<T> const & m); tmat4x4<T> const & m);
template <typename T> template <typename T>
typename tmat4x4<T>::row_type operator/ ( typename tmat4x4<T>::col_type operator/ (
tmat4x4<T> const & m, tmat4x4<T> const & m,
typename tmat4x4<T>::col_type const & v); typename tmat4x4<T>::row_type const & v);
template <typename T> template <typename T>
typename tmat4x4<T>::col_type operator/ ( typename tmat4x4<T>::row_type operator/ (
typename tmat4x4<T>::row_type & v, typename tmat4x4<T>::col_type & v,
tmat4x4<T> const & m); tmat4x4<T> const & m);
template <typename T> template <typename T>