|
|
@@ -62,6 +62,7 @@ namespace glm
|
|
|
public:
|
|
|
// Constructors
|
|
|
GLM_FUNC_DECL tmat3x3();
|
|
|
+ GLM_FUNC_DECL tmat3x3(tmat3x3<T, P> const & m);
|
|
|
template <precision Q>
|
|
|
GLM_FUNC_DECL tmat3x3(tmat3x3<T, Q> const & m);
|
|
|
|
|
|
@@ -134,129 +135,94 @@ namespace glm
|
|
|
//////////////////////////////////////
|
|
|
// Unary arithmetic operators
|
|
|
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator=(tmat3x3<T, P> const & m);
|
|
|
+
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator= (tmat3x3<U, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator=(tmat3x3<U, P> const & m);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator+= (U s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator+=(U s);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator+= (tmat3x3<U, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator+=(tmat3x3<U, P> const & m);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator-= (U s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator-=(U s);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator-= (tmat3x3<U, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator-=(tmat3x3<U, P> const & m);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator*= (U s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator*=(U s);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator*= (tmat3x3<U, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator*=(tmat3x3<U, P> const & m);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator/= (U s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator/=(U s);
|
|
|
template <typename U>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P>& operator/= (tmat3x3<U, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator/=(tmat3x3<U, P> const & m);
|
|
|
|
|
|
//////////////////////////////////////
|
|
|
// Increment and decrement operators
|
|
|
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> & operator++ ();
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> & operator-- ();
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator++();
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> & operator--();
|
|
|
GLM_FUNC_DECL tmat3x3<T, P> operator++(int);
|
|
|
GLM_FUNC_DECL tmat3x3<T, P> operator--(int);
|
|
|
};
|
|
|
|
|
|
// Binary operators
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator+ (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- T const & s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator+(tmat3x3<T, P> const & m, T const & s);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator+ (
|
|
|
- T const & s,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator+(T const & s, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator+ (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat3x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator+(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator- (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- T const & s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator-(tmat3x3<T, P> const & m, T const & s);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator- (
|
|
|
- T const & s,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator-(T const & s, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator- (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat3x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator-(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator* (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- T const & s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat3x3<T, P> const & m, T const & s);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator* (
|
|
|
- T const & s,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator*(T const & s, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator* (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- typename tmat3x3<T, P>::row_type const & v);
|
|
|
+ GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator*(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator* (
|
|
|
- typename tmat3x3<T, P>::col_type const & v,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator*(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator* (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat3x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat2x3<T, P> operator* (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat2x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat2x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat2x3<T, P> const & m2);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat4x3<T, P> operator* (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat4x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat4x3<T, P> operator*(tmat3x3<T, P> const & m1, tmat4x3<T, P> const & m2);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator/ (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- T const & s);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator/(tmat3x3<T, P> const & m, T const & s);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator/ (
|
|
|
- T const & s,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator/(T const & s, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator/ (
|
|
|
- tmat3x3<T, P> const & m,
|
|
|
- typename tmat3x3<T, P>::row_type const & v);
|
|
|
+ GLM_FUNC_DECL typename tmat3x3<T, P>::col_type operator/(tmat3x3<T, P> const & m, typename tmat3x3<T, P>::row_type const & v);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator/ (
|
|
|
- typename tmat3x3<T, P>::col_type const & v,
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL typename tmat3x3<T, P>::row_type operator/(typename tmat3x3<T, P>::col_type const & v, tmat3x3<T, P> const & m);
|
|
|
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> operator/ (
|
|
|
- tmat3x3<T, P> const & m1,
|
|
|
- tmat3x3<T, P> const & m2);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> operator/(tmat3x3<T, P> const & m1, tmat3x3<T, P> const & m2);
|
|
|
|
|
|
// Unary constant operators
|
|
|
template <typename T, precision P>
|
|
|
- GLM_FUNC_DECL tmat3x3<T, P> const operator-(
|
|
|
- tmat3x3<T, P> const & m);
|
|
|
+ GLM_FUNC_DECL tmat3x3<T, P> const operator-(tmat3x3<T, P> const & m);
|
|
|
}//namespace glm
|
|
|
|
|
|
#ifndef GLM_EXTERNAL_TEMPLATE
|