mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed GLM_FORCE_INLINE with binary vec4 operators

Browse Source
This commit is contained in:
Christophe Riccio
2016-05-18 22:52:47 +02:00
parent 792151573c
commit dcffcbdc97
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/type_vec4.inl
View File

@@ -744,7 +744,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,
@@ -794,7 +794,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,
@@ -844,7 +844,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,

1
readme.md
View File

@@ -57,6 +57,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- 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 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: