mirror of
https://github.com/g-truc/glm.git
synced 2024-11-30 03:44:38 +00:00
Merge branch '0.9.1' of ssh://ogl-math.git.sourceforge.net/gitroot/ogl-math/ogl-math into 0.9.1
This commit is contained in:
commit
0fe8a365ba
@ -3,6 +3,7 @@
|
||||
<glm copyright="Copyright © 2005 - 2011">
|
||||
<downloads>
|
||||
<section name="GLM - zip files">
|
||||
<download name="GLM 0.9.1.2" date="12/04/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.zip/download"/>
|
||||
<download name="GLM 0.9.1.1" date="17/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.zip/download"/>
|
||||
<download name="GLM 0.9.1.0" date="03/03/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.zip/download"/>
|
||||
<download name="GLM 0.9.1.B" date="13/02/2010" size="3.4 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.zip/download"/>
|
||||
@ -60,6 +61,7 @@
|
||||
<download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
|
||||
</section>
|
||||
<section name="GLM - 7z files">
|
||||
<download name="GLM 0.9.1.2" date="12/04/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.7z/download"/>
|
||||
<download name="GLM 0.9.1.1" date="17/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.1/glm-0.9.1.1.7z/download"/>
|
||||
<download name="GLM 0.9.1.0" date="03/03/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.0/glm-0.9.1.0.7z/download"/>
|
||||
<download name="GLM 0.9.1.B" date="13/02/2011" size="2.1 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.B/glm-0.9.1.B.7z/download"/>
|
||||
@ -150,6 +152,16 @@
|
||||
</todo>
|
||||
|
||||
<page_news>
|
||||
<news index="0063" date="12/04/2011" title="GLM 0.9.1.2 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
|
||||
<paragraph>
|
||||
Only bug fixes for GLM 0.9.1.2.
|
||||
</paragraph>
|
||||
|
||||
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.zip/download">GLM 0.9.1.2 (zip)</source>
|
||||
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.1.2/glm-0.9.1.2.7z/download">GLM 0.9.1.2 (7z)</source>
|
||||
<source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
|
||||
</news>
|
||||
|
||||
<news index="0062" date="17/03/2011" title="GLM 0.9.1.1 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
|
||||
<paragraph>
|
||||
GLM 0.9.1.1 fixes some bugs, warnings on Clang C++ and clean up a bit the code.
|
||||
|
@ -1402,18 +1402,6 @@ namespace glm
|
||||
return fi.f;
|
||||
}
|
||||
|
||||
inline float intBitsToFloat(uint const & value)
|
||||
{
|
||||
union
|
||||
{
|
||||
float f;
|
||||
uint u;
|
||||
} fu;
|
||||
|
||||
fu.u = value;
|
||||
return fu.f;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
inline detail::tvec2<float> intBitsToFloat
|
||||
(
|
||||
@ -1447,6 +1435,51 @@ namespace glm
|
||||
intBitsToFloat(value.y));
|
||||
}
|
||||
|
||||
inline float uintBitsToFloat(uint const & value)
|
||||
{
|
||||
union
|
||||
{
|
||||
float f;
|
||||
uint u;
|
||||
} fu;
|
||||
|
||||
fu.u = value;
|
||||
return fu.f;
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
inline detail::tvec2<float> uintBitsToFloat
|
||||
(
|
||||
detail::tvec2<T> const & value
|
||||
)
|
||||
{
|
||||
return detail::tvec2<T>(
|
||||
uintBitsToFloat(value.x),
|
||||
uintBitsToFloat(value.y));
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
inline detail::tvec3<float> uintBitsToFloat
|
||||
(
|
||||
detail::tvec3<T> const & value
|
||||
)
|
||||
{
|
||||
return detail::tvec3<T>(
|
||||
uintBitsToFloat(value.x),
|
||||
uintBitsToFloat(value.y));
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
inline detail::tvec4<float> uintBitsToFloat
|
||||
(
|
||||
detail::tvec4<T> const & value
|
||||
)
|
||||
{
|
||||
return detail::tvec4<T>(
|
||||
uintBitsToFloat(value.x),
|
||||
uintBitsToFloat(value.y));
|
||||
}
|
||||
|
||||
template <typename genType>
|
||||
inline genType fma
|
||||
(
|
||||
|
@ -17,7 +17,7 @@
|
||||
#define GLM_VERSION_MAJOR 0
|
||||
#define GLM_VERSION_MINOR 9
|
||||
#define GLM_VERSION_PATCH 1
|
||||
#define GLM_VERSION_REVISION 0
|
||||
#define GLM_VERSION_REVISION 2
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// Compiler
|
||||
@ -37,6 +37,7 @@
|
||||
#define GLM_COMPILER_VC2005 0x01000070
|
||||
#define GLM_COMPILER_VC2008 0x01000080
|
||||
#define GLM_COMPILER_VC2010 0x01000090
|
||||
#define GLM_COMPILER_VC2011 0x010000A0
|
||||
|
||||
// GCC defines
|
||||
#define GLM_COMPILER_GCC 0x02000000
|
||||
@ -98,6 +99,8 @@
|
||||
# define GLM_COMPILER GLM_COMPILER_VC2008
|
||||
# elif _MSC_VER == 1600
|
||||
# define GLM_COMPILER GLM_COMPILER_VC2010
|
||||
# elif _MSC_VER == 1700
|
||||
# define GLM_COMPILER GLM_COMPILER_VC2011
|
||||
# else//_MSC_VER
|
||||
# define GLM_COMPILER GLM_COMPILER_VC
|
||||
# endif//_MSC_VER
|
||||
|
@ -19,7 +19,7 @@ inline bool isfinite(
|
||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||
return _finite(x);
|
||||
#else//(GLM_COMPILER & GLM_COMPILER_GCC)
|
||||
return std::isfinite(x);
|
||||
return std::isfinite(x) != 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -61,7 +61,7 @@ inline bool isinf(
|
||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
|
||||
#else
|
||||
return std::isinf(x);
|
||||
return std::isinf(x) != 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -102,7 +102,7 @@ inline bool isnan(genType const & x)
|
||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||
return _isnan(x);
|
||||
#else
|
||||
return std::isnan(x);
|
||||
return std::isnan(x) != 0;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -13,6 +13,11 @@ GLM is a header only library, there is nothing to build, just include it.
|
||||
More informations in GLM manual:
|
||||
http://glm.g-truc.net/glm-0.9.1.pdf
|
||||
|
||||
================================================================================
|
||||
GLM 0.9.1.2: 2010-04-12
|
||||
--------------------------------------------------------------------------------
|
||||
- Fixed bugs
|
||||
|
||||
================================================================================
|
||||
GLM 0.9.1.1: 2010-03-17
|
||||
--------------------------------------------------------------------------------
|
||||
|
@ -4,12 +4,12 @@
|
||||
// Created : 2010-09-16
|
||||
// Updated : 2010-09-16
|
||||
// Licence : This source is under MIT licence
|
||||
// File : test/gtc/matrix_transform.cpp
|
||||
// File : test/gtc/type_ptr.cpp
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define GLM_MESSAGES
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtc/matrix_transform.hpp>
|
||||
#include <glm/gtc/type_ptr.hpp>
|
||||
|
||||
int main()
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user