mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio 2011-09-30 15:05:43 +01:00
commit 264054d59d
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/core/intrinsic_common.inl
View File

@ -29,6 +29,9 @@
namespace glm{ namespace glm{
namespace detail{ namespace detail{
#pragma warning(push)
#pragma warning(disable : 4510 4512 4610)
union ieee754_QNAN union ieee754_QNAN
{ {
const float f; const float f;
@ -40,6 +43,8 @@ namespace detail{
ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {} ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {}
}; };
#pragma warning(pop)
static const __m128 GLM_VAR_USED zero = _mm_setzero_ps(); static const __m128 GLM_VAR_USED zero = _mm_setzero_ps();
static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f); static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f);
static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f); static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f);

10
glm/core/type_half.inl
View File

@ -60,7 +60,7 @@ namespace detail
// //
detail::uif result; detail::uif result;
result.i = s << 31; result.i = (unsigned int)(s << 31);
return result.f; return result.f;
} }
else else
@ -88,7 +88,7 @@ namespace detail
// //
uif result; uif result;
result.i = (s << 31) | 0x7f800000; result.i = (unsigned int)((s << 31) | 0x7f800000);
return result.f; return result.f;
} }
else else
@ -98,7 +98,7 @@ namespace detail
// //
uif result; uif result;
result.i = (s << 31) | 0x7f800000 | (m << 13); result.i = (unsigned int)((s << 31) | 0x7f800000 | (m << 13));
return result.f; return result.f;
} }
} }
@ -115,7 +115,7 @@ namespace detail
// //
uif Result; uif Result;
Result.i = (s << 31) | (e << 23) | m; Result.i = (unsigned int)((s << 31) | (e << 23) | m);
return Result.f; return Result.f;
} }
@ -123,7 +123,7 @@ namespace detail
{ {
uif Entry; uif Entry;
Entry.f = f; Entry.f = f;
int i = Entry.i; int i = (int)Entry.i;
// //
// Our floating point number, f, is represented by the bit // Our floating point number, f, is represented by the bit

5
glm/gtx/ulp.inl
View File

@ -21,6 +21,9 @@
* ==================================================== * ====================================================
*/ */
#pragma warning(push)
#pragma warning(disable : 4127)
typedef union typedef union
{ {
float value; float value;
@ -168,6 +171,8 @@ namespace detail
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
#pragma warning(pop)
#if(GLM_COMPILER & GLM_COMPILER_VC) #if(GLM_COMPILER & GLM_COMPILER_VC)
# define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward))
# define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward)) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward))

6
readme.txt
View File

@ -44,6 +44,12 @@ GLM 0.9.3.0: 2011-XX-XX
- Removed many unused namespaces - Removed many unused namespaces
- Fixed half based type contructors - Fixed half based type contructors
================================================================================
GLM 0.9.2.6: 2011-10-01
--------------------------------------------------------------------------------
- Fixed half based type build on old GCC
- Fixed /W4 warnings on Visual C++
================================================================================ ================================================================================
GLM 0.9.2.5: 2011-09-20 GLM 0.9.2.5: 2011-09-20
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------