mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed and tested all packing functions

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-14 10:21:04 +01:00
parent 321f89ff7a
commit 406bb666ea
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glm/core/func_packing.inl
View File

@ -87,14 +87,15 @@ GLM_FUNC_QUALIFIER detail::uint32 packUnorm4x8(detail::tvec4<detail::float32> co
GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p) GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackUnorm4x8(detail::uint32 const & p)
{ {
detail::uint8 A(detail::uint8(p >> 0)); detail::uint32 Mask8((1 << 8) - 1);
detail::uint8 B(detail::uint8(p >> 8)); detail::uint32 A((p >> 0) & Mask8);
detail::uint8 C(detail::uint8(p >> 16)); detail::uint32 B((p >> 8) & Mask8);
detail::uint8 D(detail::uint8(p >> 24)); detail::uint32 C((p >> 16) & Mask8);
detail::uint32 D((p >> 24) & Mask8);
return detail::tvec4<detail::float32>( return detail::tvec4<detail::float32>(
A * 1.0f / 255.0f, A * 1.0f / 255.0f,
B * 1.0f / 255.0f, B * 1.0f / 255.0f,
C * 1.0f / 255.0f, C * 1.0f / 255.0f,
D * 1.0f / 255.0f); D * 1.0f / 255.0f);
} }
@ -114,9 +115,9 @@ GLM_FUNC_QUALIFIER detail::uint32 packSnorm4x8(detail::tvec4<detail::float32> co
detail::uint32 Pack = (detail::uint32(D.u) << 24) | (detail::uint32(C.u) << 16) | (detail::uint32(B.u) << 8) | (detail::uint32(A.u) << 0); detail::uint32 Pack = (detail::uint32(D.u) << 24) | (detail::uint32(C.u) << 16) | (detail::uint32(B.u) << 8) | (detail::uint32(A.u) << 0);
return Pack; return Pack;
} }
GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p) GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32 const & p)
{ {
union iu union iu
{ {
detail::int8 i; detail::int8 i;
@ -130,7 +131,7 @@ GLM_FUNC_QUALIFIER detail::tvec4<detail::float32> unpackSnorm4x8(detail::uint32
D.u = detail::uint8((p >> 24) & Mask8); D.u = detail::uint8((p >> 24) & Mask8);
vec4 Pack(A.i, B.i, C.i, D.i); vec4 Pack(A.i, B.i, C.i, D.i);
return clamp(Pack, -1.0f, 1.0f); return clamp(Pack * 1.0f / 127.0f, -1.0f, 1.0f);
} }
GLM_FUNC_QUALIFIER double packDouble2x32(detail::tvec2<detail::uint32> const & v) GLM_FUNC_QUALIFIER double packDouble2x32(detail::tvec2<detail::uint32> const & v)

12
test/core/core_func_packing.cpp
View File

@ -27,7 +27,7 @@ int test_packUnorm2x16()
glm::vec2 B(A[i]); glm::vec2 B(A[i]);
glm::uint32 C = glm::packUnorm2x16(B); glm::uint32 C = glm::packUnorm2x16(B);
glm::vec2 D = glm::unpackUnorm2x16(C); glm::vec2 D = glm::unpackUnorm2x16(C);
Error += glm::all(glm::equalEpsilon(B, D, 0.0001f)) ? 0 : 1; Error += glm::all(glm::equalEpsilon(B, D, 1.0f / 65535.f)) ? 0 : 1;
assert(!Error); assert(!Error);
} }
@ -48,8 +48,8 @@ int test_packSnorm2x16()
glm::vec2 B(A[i]); glm::vec2 B(A[i]);
glm::uint32 C = glm::packSnorm2x16(B); glm::uint32 C = glm::packSnorm2x16(B);
glm::vec2 D = glm::unpackSnorm2x16(C); glm::vec2 D = glm::unpackSnorm2x16(C);
Error += glm::all(glm::equalEpsilon(B, D, 0.0001f)) ? 0 : 1; Error += glm::all(glm::equalEpsilon(B, D, 1.0f / 32767.0f * 2.0f)) ? 0 : 1;
//assert(!Error); assert(!Error);
} }
return Error; return Error;
@ -68,7 +68,7 @@ int test_packUnorm4x8()
glm::vec4 B(A[i]); glm::vec4 B(A[i]);
glm::uint32 C = glm::packUnorm4x8(B); glm::uint32 C = glm::packUnorm4x8(B);
glm::vec4 D = glm::unpackUnorm4x8(C); glm::vec4 D = glm::unpackUnorm4x8(C);
Error += glm::all(glm::equalEpsilon(B, D, 0.0001f)) ? 0 : 1; Error += glm::all(glm::equalEpsilon(B, D, 1.0f / 255.f)) ? 0 : 1;
assert(!Error); assert(!Error);
} }
@ -88,8 +88,8 @@ int test_packSnorm4x8()
glm::vec4 B(A[i]); glm::vec4 B(A[i]);
glm::uint32 C = glm::packSnorm4x8(B); glm::uint32 C = glm::packSnorm4x8(B);
glm::vec4 D = glm::unpackSnorm4x8(C); glm::vec4 D = glm::unpackSnorm4x8(C);
Error += glm::all(glm::equalEpsilon(B, D, 0.0001f)) ? 0 : 1; Error += glm::all(glm::equalEpsilon(B, D, 1.0f / 127.f)) ? 0 : 1;
//assert(!Error); assert(!Error);
} }
return Error; return Error;