parent
381e1627b8
commit
b69356cadb
@ -170,6 +170,7 @@ namespace detail
|
|||||||
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
|
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
|
||||||
float Temp = 0;
|
float Temp = 0;
|
||||||
memcpy(&Temp, &Result, sizeof(Temp));
|
memcpy(&Temp, &Result, sizeof(Temp));
|
||||||
|
return Temp;
|
||||||
# else
|
# else
|
||||||
return reinterpret_cast<float&>(Result);
|
return reinterpret_cast<float&>(Result);
|
||||||
# endif
|
# endif
|
||||||
@ -184,7 +185,13 @@ namespace detail
|
|||||||
else if(glm::isinf(x))
|
else if(glm::isinf(x))
|
||||||
return 0x1f << 5;
|
return 0x1f << 5;
|
||||||
|
|
||||||
uint Pack = reinterpret_cast<uint&>(x);
|
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
|
||||||
|
uint Pack = 0;
|
||||||
|
memcpy(&Pack, &x, sizeof(Pack));
|
||||||
|
# else
|
||||||
|
uint Pack = reinterpret_cast<uint&>(x);
|
||||||
|
# endif
|
||||||
|
|
||||||
return float2packed10(Pack);
|
return float2packed10(Pack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -197,8 +204,15 @@ namespace detail
|
|||||||
else if(x == (0x1f << 5))
|
else if(x == (0x1f << 5))
|
||||||
return ~0;//Inf
|
return ~0;//Inf
|
||||||
|
|
||||||
uint result = packed10ToFloat(x);
|
uint Result = packed10ToFloat(x);
|
||||||
return reinterpret_cast<float&>(result);
|
|
||||||
|
# if(GLM_COMPILER & GLM_COMPILER_GCC || GLM_COMPILER & GLM_COMPILER_CLANG)
|
||||||
|
float Temp = 0;
|
||||||
|
memcpy(&Temp, &Result, sizeof(Temp));
|
||||||
|
return Temp;
|
||||||
|
# else
|
||||||
|
return reinterpret_cast<float&>(Result);
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
|
|
||||||
// GLM_FUNC_QUALIFIER glm::uint f11_f11_f10(float x, float y, float z)
|
// GLM_FUNC_QUALIFIER glm::uint f11_f11_f10(float x, float y, float z)
|
||||||
|
@ -54,6 +54,7 @@ GLM 0.9.5.4: 2014-0X-XX
|
|||||||
- Fixed tweakedInfinitePerspective #208 and added user-defined epsilon to
|
- Fixed tweakedInfinitePerspective #208 and added user-defined epsilon to
|
||||||
tweakedInfinitePerspective
|
tweakedInfinitePerspective
|
||||||
- Fixed std::copy and std::vector with GLM types #214
|
- Fixed std::copy and std::vector with GLM types #214
|
||||||
|
- Fixed aliasing issues #212, #152
|
||||||
|
|
||||||
================================================================================
|
================================================================================
|
||||||
GLM 0.9.5.3: 2014-04-02
|
GLM 0.9.5.3: 2014-04-02
|
||||||
|
Loading…
x
Reference in New Issue
Block a user