coffee/glm
1
0
Fork 0
mirror of https://github.com/icaven/glm.git synced 2025-12-07 01:06:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed the assert to a define so that it removed for CUDA debug compiles

Browse Source
This commit is contained in:
Ian Caven 2012-03-20 11:59:26 -07:00
parent f6ae02c608
commit a1af57aaac
5 changed files with 1949 additions and 1956 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
glm/core/type_half.hpp
View File

@ -1,119 +1,119 @@
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE.
///
/// @ref core
/// @file glm/core/type_half.hpp
/// @date 2008-08-17 / 2011-09-20
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#ifndef glm_core_type_half
#define glm_core_type_half
#include <cstdlib>
namespace glm{
namespace detail
{
typedef short hdata;
GLM_FUNC_DECL float toFloat32(hdata value);
hdata toFloat16(float const & value);
/// 16-bit floating point type.
/// @ingroup gtc_half_float
class half
{
public:
// Constructors
GLM_FUNC_DECL half();
GLM_FUNC_DECL half(half const & s);
template <typename U>
GLM_FUNC_DECL explicit half(U const & s);
// Cast
template <typename U>
GLM_FUNC_DECL operator U() const;
// Unary updatable operators
GLM_FUNC_DECL half& operator= (half const & s);
GLM_FUNC_DECL half& operator+=(half const & s);
GLM_FUNC_DECL half& operator-=(half const & s);
GLM_FUNC_DECL half& operator*=(half const & s);
GLM_FUNC_DECL half& operator/=(half const & s);
GLM_FUNC_DECL half& operator++();
GLM_FUNC_DECL half& operator--();
GLM_FUNC_DECL float toFloat() const{return toFloat32(data);}
GLM_FUNC_DECL hdata _data() const{return data;}
private:
hdata data;
};
half operator+ (half const & s1, half const & s2);
half operator- (half const & s1, half const & s2);
half operator* (half const & s1, half const & s2);
half operator/ (half const & s1, half const & s2);
// Unary constant operators
half operator- (half const & s);
half operator-- (half const & s, int);
half operator++ (half const & s, int);
bool operator==(
detail::half const & x,
detail::half const & y);
bool operator!=(
detail::half const & x,
detail::half const & y);
bool operator<(
detail::half const & x,
detail::half const & y);
bool operator<=(
detail::half const & x,
detail::half const & y);
bool operator>(
detail::half const & x,
detail::half const & y);
bool operator>=(
detail::half const & x,
detail::half const & y);
}//namespace detail
}//namespace glm
#include "type_half.inl"
#endif//glm_core_type_half
///////////////////////////////////////////////////////////////////////////////////
/// OpenGL Mathematics (glm.g-truc.net)
///
/// Copyright (c) 2005 - 2012 G-Truc Creation (www.g-truc.net)
/// Permission is hereby granted, free of charge, to any person obtaining a copy
/// of this software and associated documentation files (the "Software"), to deal
/// in the Software without restriction, including without limitation the rights
/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
/// copies of the Software, and to permit persons to whom the Software is
/// furnished to do so, subject to the following conditions:
///
/// The above copyright notice and this permission notice shall be included in
/// all copies or substantial portions of the Software.
///
/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
/// THE SOFTWARE.
///
/// @ref core
/// @file glm/core/type_half.hpp
/// @date 2008-08-17 / 2011-09-20
/// @author Christophe Riccio
///////////////////////////////////////////////////////////////////////////////////
#ifndef glm_core_type_half
#define glm_core_type_half
#include <cstdlib>
namespace glm{
namespace detail
{
typedef short hdata;
GLM_FUNC_DECL float toFloat32(hdata value);
hdata toFloat16(float const & value);
/// 16-bit floating point type.
/// @ingroup gtc_half_float
class half
{
public:
// Constructors
GLM_FUNC_DECL half();
GLM_FUNC_DECL half(half const & s);
template <typename U>
GLM_FUNC_DECL explicit half(U const & s);
// Cast
template <typename U>
GLM_FUNC_DECL operator U() const;
// Unary updatable operators
GLM_FUNC_DECL half& operator= (half const & s);
GLM_FUNC_DECL half& operator+=(half const & s);
GLM_FUNC_DECL half& operator-=(half const & s);
GLM_FUNC_DECL half& operator*=(half const & s);
GLM_FUNC_DECL half& operator/=(half const & s);
GLM_FUNC_DECL half& operator++();
GLM_FUNC_DECL half& operator--();
GLM_FUNC_DECL float toFloat() const{return toFloat32(data);}
GLM_FUNC_DECL hdata _data() const{return data;}
private:
hdata data;
};
half operator+ (half const & s1, half const & s2);
half operator- (half const & s1, half const & s2);
half operator* (half const & s1, half const & s2);
half operator/ (half const & s1, half const & s2);
// Unary constant operators
half operator- (half const & s);
half operator-- (half const & s, int);
half operator++ (half const & s, int);
bool operator==(
detail::half const & x,
detail::half const & y);
bool operator!=(
detail::half const & x,
detail::half const & y);
bool operator<(
detail::half const & x,
detail::half const & y);
bool operator<=(
detail::half const & x,
detail::half const & y);
bool operator>(
detail::half const & x,
detail::half const & y);
bool operator>=(
detail::half const & x,
detail::half const & y);
}//namespace detail
}//namespace glm
#include "type_half.inl"
#endif//glm_core_type_half

1629
glm/core/type_mat3x3.inl
View File

File diff suppressed because it is too large Load Diff

4
glm/core/type_vec3.inl
View File

@ -45,7 +45,7 @@ namespace detail
size_type i
)
{
assert(i < this->length());
ASSERT(i < this->length());
return (&x)[i];
}
@ -56,7 +56,7 @@ namespace detail
size_type i
) const
{
assert(i < this->length());
ASSERT(i < this->length());
return (&x)[i];
}

6
glm/glm.hpp
View File

@ -88,6 +88,12 @@
//#include <type_traits>
#include "core/setup.hpp"
#if (GLM_COMPILER & GLM_COMPILER_CUDA)
#define ASSERT(s)
#else
#define ASSERT(s) assert(s);
#endif
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))
# define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED
# pragma message("GLM: Core library included")

2028
glm/gtc/half_float.inl
View File

File diff suppressed because it is too large Load Diff