diff --git a/glm/core/type_mat2x4.inl b/glm/core/type_mat2x4.inl index a06d95d2..d201abcd 100644 --- a/glm/core/type_mat2x4.inl +++ b/glm/core/type_mat2x4.inl @@ -109,7 +109,7 @@ namespace detail { value_type const Zero(0); this->value[0] = col_type(s, Zero, Zero, Zero); - this->value[1] = col_type(Zero, Zero, Zero, Zero); + this->value[1] = col_type(Zero, s, Zero, Zero); } template diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp index 50dc5af1..7e8af095 100644 --- a/glm/gtx/ocl_type.hpp +++ b/glm/gtx/ocl_type.hpp @@ -79,7 +79,7 @@ namespace gtx typedef detail::uint32 cl_uint1; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) typedef detail::uint64 cl_ulong1; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - //typedef detail::float16 cl_half1; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) + //typedef detail::float16 cl_half1; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) typedef detail::float32 cl_float1; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) @@ -93,7 +93,7 @@ namespace gtx typedef detail::tvec2 cl_uint2; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) typedef detail::tvec2 cl_ulong2; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - //typedef detail::tvec2 cl_half2; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) + //typedef detail::tvec2 cl_half2; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) typedef detail::tvec2 cl_float2; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) @@ -107,7 +107,7 @@ namespace gtx typedef detail::tvec3 cl_uint3; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) typedef detail::tvec3 cl_ulong3; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - //typedef detail::tvec3 cl_half3; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) + //typedef detail::tvec3 cl_half3; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) typedef detail::tvec3 cl_float3; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) @@ -120,7 +120,7 @@ namespace gtx typedef detail::tvec4 cl_uint4; //!< \brief 32bit signed integer. (from GLM_GTX_ocl_type extension) typedef detail::tvec4 cl_ulong4; //!< \brief 64bit signed integer. (from GLM_GTX_ocl_type extension) - //typedef detail::tvec4 cl_half4; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) + //typedef detail::tvec4 cl_half4; //!< \brief Half-precision floating-point scalar. (from GLM_GTX_ocl_type extension) typedef detail::tvec4 cl_float4; //!< \brief Single-precision floating-point scalar. (from GLM_GTX_ocl_type extension) /// @} diff --git a/readme.txt b/readme.txt index 82c0f12c..99a87fca 100644 --- a/readme.txt +++ b/readme.txt @@ -49,6 +49,12 @@ GLM 0.9.5.0: 2013-XX-XX - Added quaternion comparison functions - Fixed GTX_multiple for negative value +================================================================================ +GLM 0.9.4.4: 2013-0X-XX +-------------------------------------------------------------------------------- +- Fixed slerp when costheta is close to 1 +- Fixed mat4x2 value_type constructor + ================================================================================ GLM 0.9.4.3: 2013-03-20 --------------------------------------------------------------------------------