mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed implicit conversion from another tvec2 type to another tvec2 #241

Browse Source
This commit is contained in:
Christophe Riccio 2014-10-05 10:34:19 +02:00
parent a08aca94f3
commit 1e389f8efa
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/type_vec2.hpp
View File

@ -135,7 +135,7 @@ namespace detail
//! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
template <typename U, precision Q> template <typename U, precision Q>
GLM_FUNC_DECL tvec2(tvec2<U, Q> const & v); GLM_FUNC_DECL explicit tvec2(tvec2<U, Q> const & v);
//! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) //! Explicit conversions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification)
template <typename U, precision Q> template <typename U, precision Q>
GLM_FUNC_DECL explicit tvec2(tvec3<U, Q> const & v); GLM_FUNC_DECL explicit tvec2(tvec3<U, Q> const & v);

15
readme.txt
View File

@ -39,6 +39,11 @@ http://glm.g-truc.net/glm.pdf
================================================================================ ================================================================================
GLM 0.9.6.0: 2014-XX-XX GLM 0.9.6.0: 2014-XX-XX
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- Fixed std::nextafter not supported with C++11 on Android #217
- Fixed missing value_type for dual quaternion
- Fixed return type of dual quaternion length
- Fixed infinite loop in isfinite function with GCC #221
- Rely on C++11 to implement isinf and isnan
- Added transparent use of SIMD instructions for vec4 and mat4 types - Added transparent use of SIMD instructions for vec4 and mat4 types
- Removed degrees for function parameters - Removed degrees for function parameters
- Removed GLM_FORCE_RADIANS, active by default - Removed GLM_FORCE_RADIANS, active by default
@ -50,15 +55,7 @@ GLM 0.9.6.0: 2014-XX-XX
- Improved linearRand: support precision and integers #230 - Improved linearRand: support precision and integers #230
- Added vec3 slerp #237 - Added vec3 slerp #237
- Added GTX_common with isdenomal #223 - Added GTX_common with isdenomal #223
- Fixed implicit conversion from another tvec2 type to another tvec2 #241
================================================================================
GLM 0.9.5.5: 2014-XX-XX
--------------------------------------------------------------------------------
- Fixed std::nextafter not supported with C++11 on Android #217
- Fixed missing value_type for dual quaternion
- Fixed return type of dual quaternion length
- Fixed infinite loop in isfinite function with GCC #221
- Rely on C++11 to implement isinf and isnan
================================================================================ ================================================================================
GLM 0.9.5.4: 2014-06-21 GLM 0.9.5.4: 2014-06-21