From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/detail/func_packing.inl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'external/include/glm/detail/func_packing.inl') diff --git a/external/include/glm/detail/func_packing.inl b/external/include/glm/detail/func_packing.inl index 505c80a..7c22eb9 100644 --- a/external/include/glm/detail/func_packing.inl +++ b/external/include/glm/detail/func_packing.inl @@ -1,13 +1,13 @@ /// @ref core /// @file glm/detail/func_packing.inl -#include "func_common.hpp" +#include "../common.hpp" #include "type_half.hpp" #include "../fwd.hpp" namespace glm { - GLM_FUNC_QUALIFIER uint packUnorm2x16(vec2 const & v) + GLM_FUNC_QUALIFIER uint packUnorm2x16(vec2 const& v) { union { @@ -36,7 +36,7 @@ namespace glm return vec2(u.out[0], u.out[1]) * 1.5259021896696421759365224689097e-5f; } - GLM_FUNC_QUALIFIER uint packSnorm2x16(vec2 const & v) + GLM_FUNC_QUALIFIER uint packSnorm2x16(vec2 const& v) { union { @@ -65,7 +65,7 @@ namespace glm return clamp(vec2(u.out[0], u.out[1]) * 3.0518509475997192297128208258309e-5f, -1.0f, 1.0f); } - GLM_FUNC_QUALIFIER uint packUnorm4x8(vec4 const & v) + GLM_FUNC_QUALIFIER uint packUnorm4x8(vec4 const& v) { union { @@ -95,8 +95,8 @@ namespace glm return vec4(u.out[0], u.out[1], u.out[2], u.out[3]) * 0.0039215686274509803921568627451f; } - - GLM_FUNC_QUALIFIER uint packSnorm4x8(vec4 const & v) + + GLM_FUNC_QUALIFIER uint packSnorm4x8(vec4 const& v) { union { @@ -113,7 +113,7 @@ namespace glm return u.out; } - + GLM_FUNC_QUALIFIER glm::vec4 unpackSnorm4x8(uint p) { union @@ -127,7 +127,7 @@ namespace glm return clamp(vec4(u.out[0], u.out[1], u.out[2], u.out[3]) * 0.0078740157480315f, -1.0f, 1.0f); } - GLM_FUNC_QUALIFIER double packDouble2x32(uvec2 const & v) + GLM_FUNC_QUALIFIER double packDouble2x32(uvec2 const& v) { union { @@ -154,7 +154,7 @@ namespace glm return uvec2(u.out[0], u.out[1]); } - GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v) + GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const& v) { union { -- cgit v1.2.3