mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify implementations

Browse Source
This commit is contained in:
Christophe Riccio 2013-10-05 19:12:03 +02:00
parent e13e147799
commit cc3fcda9f8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glm/core/func_packing.inl
View File

@ -35,24 +35,24 @@ namespace glm
GLM_FUNC_QUALIFIER uint packUnorm2x16(vec2 const & v)
{
u16vec2 Topack(round(clamp(v, 0.0f, 1.0f) * 65535.0f));
return *reinterpret_cast<uint*>(&Topack);
return reinterpret_cast<uint&>(Topack);
}
GLM_FUNC_QUALIFIER vec2 unpackUnorm2x16(uint const & p)
{
vec2 Unpack(*reinterpret_cast<u16vec2*>(const_cast<uint*>(&p)));
vec2 Unpack(reinterpret_cast<u16vec2 const &>(p));
return Unpack * float(1.5259021896696421759365224689097e-5); // 1.0 / 65535.0
}
GLM_FUNC_QUALIFIER uint packSnorm2x16(vec2 const & v)
{
i16vec2 Topack(round(clamp(v ,-1.0f, 1.0f) * 32767.0f));
return *reinterpret_cast<uint32*>(&Topack);
return reinterpret_cast<uint32&>(Topack);
}
GLM_FUNC_QUALIFIER vec2 unpackSnorm2x16(uint const & p)
{
vec2 Unpack(*reinterpret_cast<i16vec2*>(const_cast<uint*>(&p)));
vec2 Unpack(reinterpret_cast<i16vec2 const &>(p));
return clamp(
Unpack * 3.0518509475997192297128208258309e-5f, //1.0f / 32767.0f,
-1.0f, 1.0f);
@ -61,24 +61,24 @@ namespace glm
GLM_FUNC_QUALIFIER uint packUnorm4x8(vec4 const & v)
{
u8vec4 Topack(round(clamp(v, 0.0f, 1.0f) * 255.0f));
return *reinterpret_cast<uint*>(&Topack);
return reinterpret_cast<uint&>(&Topack);
}
GLM_FUNC_QUALIFIER vec4 unpackUnorm4x8(uint const & p)
{
vec4 Unpack(*reinterpret_cast<u8vec4*>(const_cast<uint*>(&p)));
vec4 Unpack(reinterpret_cast<u8vec4 const&>(p));
return Unpack * float(0.0039215686274509803921568627451); // 1 / 255
}
GLM_FUNC_QUALIFIER uint packSnorm4x8(vec4 const & v)
{
i8vec4 Topack(round(clamp(v ,-1.0f, 1.0f) * 127.0f));
return *reinterpret_cast<uint*>(&Topack);
return reinterpret_cast<uint&>(Topack);
}
GLM_FUNC_QUALIFIER glm::vec4 unpackSnorm4x8(uint const & p)
{
vec4 Unpack(*reinterpret_cast<i8vec4*>(const_cast<uint*>(&p)));
vec4 Unpack(reinterpret_cast<i8vec4 const &>(p));
return clamp(
Unpack * 0.0078740157480315f, // 1.0f / 127.0f
-1.0f, 1.0f);
@ -86,12 +86,12 @@ namespace glm
GLM_FUNC_QUALIFIER double packDouble2x32(uvec2 const & v)
{
return *reinterpret_cast<double*>(const_cast<uvec2*>(&v));
return reinterpret_cast<double const &>(v);
}
GLM_FUNC_QUALIFIER uvec2 unpackDouble2x32(double const & v)
{
return *reinterpret_cast<uvec2*>(const_cast<double*>(&v));
return reinterpret_cast<uvec2 const &>(v);
}
GLM_FUNC_QUALIFIER uint packHalf2x16(vec2 const & v)
@ -105,7 +105,7 @@ namespace glm
GLM_FUNC_QUALIFIER vec2 unpackHalf2x16(uint const & v)
{
i16vec2 Unpack = *reinterpret_cast<i16vec2*>(const_cast<uint*>(&v));
i16vec2 Unpack(reinterpret_cast<i16vec2 const &>(v));
return vec2(
detail::toFloat32(Unpack.x),