mewin/glm
1
0
Fork 0
Code Releases Activity

packing function clean up #292

Browse Source
This commit is contained in:
Christophe Riccio
2015-01-09 23:57:22 +01:00
parent d9290d7887
commit 0ceb9e9394
3 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
glm/gtc/packing.inl
View File

@@ -263,7 +263,7 @@ namespace detail
GLM_FUNC_QUALIFIER uint16 packUnorm2x8(vec2 const & v)
{
u8vec2 Topack(round(clamp(v, 0.0f, 1.0f) * 255.0f));
u8vec2 const Topack(round(clamp(v, 0.0f, 1.0f) * 255.0f));
return reinterpret_cast<uint16 const &>(Topack);
}
@@ -354,15 +354,13 @@ namespace detail
GLM_FUNC_QUALIFIER uint16 packHalf1x16(float v)
{
int16 Topack = detail::toFloat16(v);
uint16* Packed = reinterpret_cast<uint16*>(&Topack);
return *Packed;
int16 const Topack(detail::toFloat16(v));
return reinterpret_cast<uint16 const &>(Topack);
}
GLM_FUNC_QUALIFIER float unpackHalf1x16(uint16 v)
{
int16* Unpack = reinterpret_cast<int16*>(const_cast<uint16*>(&v));
return detail::toFloat32(*Unpack);
return detail::toFloat32(reinterpret_cast<int16 const &>(v));
}
GLM_FUNC_QUALIFIER uint64 packHalf4x16(glm::vec4 const & v)