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

Merge branch '0.9.2' into 0.9.3

Browse Source
This commit is contained in:
Christophe Riccio 2011-10-03 12:40:19 +01:00
commit e3da53946e
6 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/type_vec2.hpp
View File

@ -204,8 +204,10 @@ namespace detail
GLM_FUNC_DECL tref2<T> & operator= (tref2<T> const & r); GLM_FUNC_DECL tref2<T> & operator= (tref2<T> const & r);
GLM_FUNC_DECL tref2<T> & operator= (tvec2<T> const & v); GLM_FUNC_DECL tref2<T> & operator= (tvec2<T> const & v);
T& x; GLM_FUNC_DECL tvec2<T> operator() ();
T& y;
T & x;
T & y;
}; };
GLM_DETAIL_IS_VECTOR(tvec2); GLM_DETAIL_IS_VECTOR(tvec2);

6
glm/core/type_vec2.inl
View File

@ -1025,5 +1025,11 @@ namespace detail
return *this; return *this;
} }
template <typename T>
GLM_FUNC_QUALIFIER tvec2<T> tref2<T>::operator() ()
{
return tvec2<T>(this->x, this->y);
}
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm

2
glm/core/type_vec3.hpp
View File

@ -217,6 +217,8 @@ namespace detail
GLM_FUNC_DECL tref3<T> & operator= (tref3<T> const & r); GLM_FUNC_DECL tref3<T> & operator= (tref3<T> const & r);
GLM_FUNC_DECL tref3<T> & operator= (tvec3<T> const & v); GLM_FUNC_DECL tref3<T> & operator= (tvec3<T> const & v);
GLM_FUNC_DECL tvec3<T> operator() ();
T & x; T & x;
T & y; T & y;
T & z; T & z;

6
glm/core/type_vec3.inl
View File

@ -1148,5 +1148,11 @@ namespace detail
return *this; return *this;
} }
template <typename T>
GLM_FUNC_QUALIFIER tvec3<T> tref3<T>::operator() ()
{
return tvec3<T>(this->x, this->y, this->z);
}
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm

2
glm/core/type_vec4.hpp
View File

@ -249,6 +249,8 @@ namespace detail
GLM_FUNC_DECL tref4<T> & operator= (tref4<T> const & r); GLM_FUNC_DECL tref4<T> & operator= (tref4<T> const & r);
GLM_FUNC_DECL tref4<T> & operator= (tvec4<T> const & v); GLM_FUNC_DECL tref4<T> & operator= (tvec4<T> const & v);
GLM_FUNC_DECL tvec4<T> operator() ();
T & x; T & x;
T & y; T & y;
T & z; T & z;

6
glm/core/type_vec4.inl
View File

@ -1374,5 +1374,11 @@ namespace detail
return *this; return *this;
} }
template <typename T>
GLM_FUNC_QUALIFIER tvec4<T> tref4<T>::operator() ()
{
return tvec4<T>(this->x, this->y, this->z, this->w);
}
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm