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

Merge branch '0.9.7'

Browse Source
This commit is contained in:
Christophe Riccio 2016-05-18 22:53:00 +02:00
commit 93a2f03649
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/type_vec4.inl
View File

@ -722,7 +722,7 @@ namespace glm
} }
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_DECL tvec4<T, P> operator-(tvec1<T, P> const & v1, tvec4<T, P> const & v2) GLM_FUNC_QUALIFIER tvec4<T, P> operator-(tvec1<T, P> const & v1, tvec4<T, P> const & v2)
{ {
return tvec4<T, P>( return tvec4<T, P>(
v1.x - v2.x, v1.x - v2.x,
@ -772,7 +772,7 @@ namespace glm
} }
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_DECL tvec4<T, P> operator*(tvec1<T, P> const & v1, tvec4<T, P> const & v2) GLM_FUNC_QUALIFIER tvec4<T, P> operator*(tvec1<T, P> const & v1, tvec4<T, P> const & v2)
{ {
return tvec4<T, P>( return tvec4<T, P>(
v1.x * v2.x, v1.x * v2.x,
@ -822,7 +822,7 @@ namespace glm
} }
template <typename T, precision P> template <typename T, precision P>
GLM_FUNC_DECL tvec4<T, P> operator/(tvec1<T, P> const & v1, tvec4<T, P> const & v2) GLM_FUNC_QUALIFIER tvec4<T, P> operator/(tvec1<T, P> const & v1, tvec4<T, P> const & v2)
{ {
return tvec4<T, P>( return tvec4<T, P>(
v1.x / v2.x, v1.x / v2.x,

2
glm/gtx/string_cast.inl
View File

@ -479,7 +479,7 @@ namespace detail
}//namespace detail }//namespace detail
template <template <typename, precision> class matType, typename T, precision P> template <template <typename, precision> class matType, typename T, precision P>
GLM_FUNC_DECL std::string to_string(matType<T, P> const & x) GLM_FUNC_QUALIFIER std::string to_string(matType<T, P> const & x)
{ {
return detail::compute_to_string<matType, T, P>::call(x); return detail::compute_to_string<matType, T, P>::call(x);
} }

2
readme.md
View File

@ -85,6 +85,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Fixed uaddCarry warning #497 - Fixed uaddCarry warning #497
- Fixed roundPowerOfTwo and floorPowerOfTwo #503 - Fixed roundPowerOfTwo and floorPowerOfTwo #503
- Fixed Visual C++ SIMD instruction set automatic detection in 64 bits - Fixed Visual C++ SIMD instruction set automatic detection in 64 bits
- Fixed to_string when used with GLM_FORCE_INLINE #506
- Fixed GLM_FORCE_INLINE with binary vec4 operators
#### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/releases/tag/0.9.7.4) - 2016-03-19
##### Fixes: ##### Fixes: