diff --git a/glm/core/func_common.hpp b/glm/core/func_common.hpp index ce246010..bcc589f3 100644 --- a/glm/core/func_common.hpp +++ b/glm/core/func_common.hpp @@ -50,7 +50,7 @@ namespace glm /// /// @see GLSL abs man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType abs(genType const & x); /// Returns 1.0 if x > 0, 0.0 if x == 0, or -1.0 if x < 0. @@ -59,7 +59,7 @@ namespace glm /// /// @see GLSL sign man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType sign(genType const & x); /// Returns a value equal to the nearest integer that is less then or equal to x. @@ -68,52 +68,52 @@ namespace glm /// /// @see GLSL floor man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType floor(genType const & x); - /// Returns a value equal to the nearest integer to x - /// whose absolute value is not larger than the absolute value of x. + /// Returns a value equal to the nearest integer to x + /// whose absolute value is not larger than the absolute value of x. /// /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL trunc man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType trunc(genType const & x); - /// Returns a value equal to the nearest integer to x. - /// The fraction 0.5 will round in a direction chosen by the - /// implementation, presumably the direction that is fastest. - /// This includes the possibility that round(x) returns the - /// same value as roundEven(x) for all values of x. + /// Returns a value equal to the nearest integer to x. + /// The fraction 0.5 will round in a direction chosen by the + /// implementation, presumably the direction that is fastest. + /// This includes the possibility that round(x) returns the + /// same value as roundEven(x) for all values of x. /// /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL round man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType round(genType const & x); /// Returns a value equal to the nearest integer to x. /// A fractional part of 0.5 will round toward the nearest even - /// integer. (Both 3.5 and 4.5 for x will return 4.0.) + /// integer. (Both 3.5 and 4.5 for x will return 4.0.) /// /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL roundEven man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions /// @see New round to even technique - template + template genType roundEven(genType const & x); - /// Returns a value equal to the nearest integer - /// that is greater than or equal to x. + /// Returns a value equal to the nearest integer + /// that is greater than or equal to x. /// /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL ceil man page /// @see GLSL 4.20.8 specification, section 8.3 Common Functions - template + template genType ceil(genType const & x); /// Return x - floor(x). diff --git a/glm/core/func_matrix.inl b/glm/core/func_matrix.inl index 35cd1e74..bcbcecc8 100644 --- a/glm/core/func_matrix.inl +++ b/glm/core/func_matrix.inl @@ -38,7 +38,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'matrixCompMult' only accept floating-point inputs"); - matType result(matType::null); + matType result(matType::_null); for(typename matType::size_type i = 0; i < matType::row_size(); ++i) result[i] = x[i] * y[i]; return result; @@ -230,7 +230,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat2x2 result(detail::tmat2x2::null); + detail::tmat2x2 result(detail::tmat2x2::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[1][0] = m[0][1]; @@ -246,7 +246,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat3x3 result(detail::tmat3x3::null); + detail::tmat3x3 result(detail::tmat3x3::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -269,7 +269,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat4x4 result(detail::tmat4x4::null); + detail::tmat4x4 result(detail::tmat4x4::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -300,7 +300,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat2x3 result(detail::tmat2x3::null); + detail::tmat2x3 result(detail::tmat2x3::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -318,7 +318,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat3x2 result(detail::tmat3x2::null); + detail::tmat3x2 result(detail::tmat3x2::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[1][0] = m[0][1]; @@ -336,7 +336,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat2x4 result(detail::tmat2x4::null); + detail::tmat2x4 result(detail::tmat2x4::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -356,7 +356,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat4x2 result(detail::tmat4x2::null); + detail::tmat4x2 result(detail::tmat4x2::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[1][0] = m[0][1]; @@ -376,7 +376,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat3x4 result(detail::tmat3x4::null); + detail::tmat3x4 result(detail::tmat3x4::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -400,7 +400,7 @@ namespace glm { GLM_STATIC_ASSERT(detail::type::is_float, "'transpose' only accept floating-point inputs"); - detail::tmat4x3 result(detail::tmat4x3::null); + detail::tmat4x3 result(detail::tmat4x3::_null); result[0][0] = m[0][0]; result[0][1] = m[1][0]; result[0][2] = m[2][0]; @@ -502,7 +502,7 @@ namespace glm T Determinant = determinant(m); - detail::tmat3x3 Inverse(detail::tmat3x3::null); + detail::tmat3x3 Inverse(detail::tmat3x3::_null); Inverse[0][0] = + (m[1][1] * m[2][2] - m[2][1] * m[1][2]); Inverse[1][0] = - (m[1][0] * m[2][2] - m[2][0] * m[1][2]); Inverse[2][0] = + (m[1][0] * m[2][1] - m[2][0] * m[1][1]); diff --git a/glm/core/func_vector_relational.inl b/glm/core/func_vector_relational.inl index cbb7e240..c11515ab 100644 --- a/glm/core/func_vector_relational.inl +++ b/glm/core/func_vector_relational.inl @@ -41,7 +41,7 @@ namespace glm "Invalid template instantiation of 'lessThan', GLM vector types required floating-point or integer value types vectors"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] < y[i]; @@ -61,7 +61,7 @@ namespace glm "Invalid template instantiation of 'lessThanEqual', GLM vector types required floating-point or integer value types vectors"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] <= y[i]; return Result; @@ -80,7 +80,7 @@ namespace glm "Invalid template instantiation of 'greaterThan', GLM vector types required floating-point or integer value types vectors"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] > y[i]; return Result; @@ -99,7 +99,7 @@ namespace glm "Invalid template instantiation of 'greaterThanEqual', GLM vector types required floating-point or integer value types vectors"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] >= y[i]; return Result; @@ -116,7 +116,7 @@ namespace glm // "Invalid template instantiation of 'equal', GLM vector types required"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] == y[i]; return Result; @@ -133,7 +133,7 @@ namespace glm // "Invalid template instantiation of 'notEqual', GLM vector types required"); assert(x.length() == y.length()); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < x.length(); ++i) Result[i] = x[i] != y[i]; return Result; @@ -169,7 +169,7 @@ namespace glm //GLM_STATIC_ASSERT(detail::is_vector >::_YES, // "Invalid template instantiation of 'not_', GLM vector types required"); - typename vecType::bool_type Result(vecType::null); + typename vecType::bool_type Result(vecType::_null); for(typename vecType::size_type i = 0; i < v.length(); ++i) Result[i] = !v[i]; return Result; diff --git a/glm/core/type_mat2x2.hpp b/glm/core/type_mat2x2.hpp index 69ecb6b1..3d000bc9 100644 --- a/glm/core/type_mat2x2.hpp +++ b/glm/core/type_mat2x2.hpp @@ -39,7 +39,7 @@ namespace detail struct tmat2x2 { // Implementation detail - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec2 col_type; diff --git a/glm/core/type_mat2x3.hpp b/glm/core/type_mat2x3.hpp index 9d95ea5d..59072282 100644 --- a/glm/core/type_mat2x3.hpp +++ b/glm/core/type_mat2x3.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat2x3 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec3 col_type; diff --git a/glm/core/type_mat2x4.hpp b/glm/core/type_mat2x4.hpp index 279300f4..cd3e4924 100644 --- a/glm/core/type_mat2x4.hpp +++ b/glm/core/type_mat2x4.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat2x4 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec4 col_type; diff --git a/glm/core/type_mat3x2.hpp b/glm/core/type_mat3x2.hpp index 5a4ec31a..0f2056cb 100644 --- a/glm/core/type_mat3x2.hpp +++ b/glm/core/type_mat3x2.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat3x2 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec2 col_type; diff --git a/glm/core/type_mat3x3.hpp b/glm/core/type_mat3x3.hpp index fc0d5f5d..47708b67 100644 --- a/glm/core/type_mat3x3.hpp +++ b/glm/core/type_mat3x3.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat3x3 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec3 col_type; diff --git a/glm/core/type_mat3x3.inl b/glm/core/type_mat3x3.inl index 0c6667cc..7e346448 100644 --- a/glm/core/type_mat3x3.inl +++ b/glm/core/type_mat3x3.inl @@ -639,7 +639,7 @@ namespace detail typename tmat3x3::value_type const SrcB21 = m2[2][1]; typename tmat3x3::value_type const SrcB22 = m2[2][2]; - tmat3x3 Result(tmat3x3::null); + tmat3x3 Result(tmat3x3::_null); Result[0][0] = SrcA00 * SrcB00 + SrcA10 * SrcB01 + SrcA20 * SrcB02; Result[0][1] = SrcA01 * SrcB00 + SrcA11 * SrcB01 + SrcA21 * SrcB02; Result[0][2] = SrcA02 * SrcB00 + SrcA12 * SrcB01 + SrcA22 * SrcB02; diff --git a/glm/core/type_mat3x4.hpp b/glm/core/type_mat3x4.hpp index 32ce03be..9ed720fb 100644 --- a/glm/core/type_mat3x4.hpp +++ b/glm/core/type_mat3x4.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat3x4 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec4 col_type; diff --git a/glm/core/type_mat4x2.hpp b/glm/core/type_mat4x2.hpp index 4ff80586..9594d41f 100644 --- a/glm/core/type_mat4x2.hpp +++ b/glm/core/type_mat4x2.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat4x2 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec2 col_type; diff --git a/glm/core/type_mat4x3.hpp b/glm/core/type_mat4x3.hpp index 68cfe8f3..d5106d6f 100644 --- a/glm/core/type_mat4x3.hpp +++ b/glm/core/type_mat4x3.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat4x3 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec3 col_type; diff --git a/glm/core/type_mat4x4.hpp b/glm/core/type_mat4x4.hpp index f7fcce7e..baa3c1a1 100644 --- a/glm/core/type_mat4x4.hpp +++ b/glm/core/type_mat4x4.hpp @@ -38,7 +38,7 @@ namespace detail template struct tmat4x4 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; typedef tvec4 col_type; diff --git a/glm/core/type_mat4x4.inl b/glm/core/type_mat4x4.inl index 0cdd070b..c26f5687 100644 --- a/glm/core/type_mat4x4.inl +++ b/glm/core/type_mat4x4.inl @@ -770,7 +770,7 @@ namespace detail typename tmat4x4::col_type const SrcB2 = m2[2]; typename tmat4x4::col_type const SrcB3 = m2[3]; - tmat4x4 Result(tmat4x4::null); + tmat4x4 Result(tmat4x4::_null); Result[0] = SrcA0 * SrcB0[0] + SrcA1 * SrcB0[1] + SrcA2 * SrcB0[2] + SrcA3 * SrcB0[3]; Result[1] = SrcA0 * SrcB1[0] + SrcA1 * SrcB1[1] + SrcA2 * SrcB1[2] + SrcA3 * SrcB1[3]; Result[2] = SrcA0 * SrcB2[0] + SrcA1 * SrcB2[1] + SrcA2 * SrcB2[2] + SrcA3 * SrcB2[3]; diff --git a/glm/core/type_vec1.hpp b/glm/core/type_vec1.hpp index 60129cfc..28562e49 100644 --- a/glm/core/type_vec1.hpp +++ b/glm/core/type_vec1.hpp @@ -39,7 +39,7 @@ namespace detail template struct tvec1 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; diff --git a/glm/core/type_vec2.hpp b/glm/core/type_vec2.hpp index e8523770..c6b82a0c 100644 --- a/glm/core/type_vec2.hpp +++ b/glm/core/type_vec2.hpp @@ -39,7 +39,7 @@ namespace detail template struct tvec2 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; diff --git a/glm/core/type_vec3.hpp b/glm/core/type_vec3.hpp index 1320c51b..40ea7533 100644 --- a/glm/core/type_vec3.hpp +++ b/glm/core/type_vec3.hpp @@ -39,7 +39,7 @@ namespace detail template struct tvec3 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; diff --git a/glm/core/type_vec4.hpp b/glm/core/type_vec4.hpp index 3a91951a..e17ada57 100644 --- a/glm/core/type_vec4.hpp +++ b/glm/core/type_vec4.hpp @@ -39,7 +39,7 @@ namespace detail template struct tvec4 { - enum ctor{null}; + enum ctor{_null}; typedef T value_type; typedef std::size_t size_type; diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index cb6fdd73..8a2f9c40 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -60,7 +60,7 @@ namespace glm detail::tvec3 temp = (T(1) - c) * axis; - detail::tmat4x4 Rotate(detail::tmat4x4::null); + detail::tmat4x4 Rotate(detail::tmat4x4::_null); Rotate[0][0] = c + temp[0] * axis[0]; Rotate[0][1] = 0 + temp[0] * axis[1] + s * axis[2]; Rotate[0][2] = 0 + temp[0] * axis[2] - s * axis[1]; @@ -73,7 +73,7 @@ namespace glm Rotate[2][1] = 0 + temp[2] * axis[1] - s * axis[0]; Rotate[2][2] = c + temp[2] * axis[2]; - detail::tmat4x4 Result(detail::tmat4x4::null); + detail::tmat4x4 Result(detail::tmat4x4::_null); Result[0] = m[0] * Rotate[0][0] + m[1] * Rotate[0][1] + m[2] * Rotate[0][2]; Result[1] = m[0] * Rotate[1][0] + m[1] * Rotate[1][1] + m[2] * Rotate[1][2]; Result[2] = m[0] * Rotate[2][0] + m[1] * Rotate[2][1] + m[2] * Rotate[2][2]; @@ -88,7 +88,7 @@ namespace glm detail::tvec3 const & v ) { - detail::tmat4x4 Result(detail::tmat4x4::null); + detail::tmat4x4 Result(detail::tmat4x4::_null); Result[0] = m[0] * v[0]; Result[1] = m[1] * v[1]; Result[2] = m[2] * v[2];