summaryrefslogtreecommitdiffstats
path: root/external/include/glm/gtx/common.hpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--external/include/glm/gtx/common.hpp41
1 files changed, 32 insertions, 9 deletions
diff --git a/external/include/glm/gtx/common.hpp b/external/include/glm/gtx/common.hpp
index 6533a54..6eadf48 100644
--- a/external/include/glm/gtx/common.hpp
+++ b/external/include/glm/gtx/common.hpp
@@ -2,14 +2,13 @@
/// @file glm/gtx/common.hpp
///
/// @see core (dependence)
-/// @see gtc_half_float (dependence)
///
/// @defgroup gtx_common GLM_GTX_common
/// @ingroup gtx
///
-/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
+/// Include <glm/gtx/common.hpp> to use the features of this extension.
///
-/// <glm/gtx/common.hpp> need to be included to use these functionalities.
+/// @brief Provide functions to increase the compatibility with Cg and HLSL languages
#pragma once
@@ -19,6 +18,10 @@
#include "../vec4.hpp"
#include "../gtc/vec1.hpp"
+#ifndef GLM_ENABLE_EXPERIMENTAL
+# error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+#endif
+
#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED)
# pragma message("GLM: GLM_GTX_common extension included")
#endif
@@ -31,21 +34,41 @@ namespace glm
/// Returns true if x is a denormalized number
/// Numbers whose absolute value is too small to be represented in the normal format are represented in an alternate, denormalized format.
/// This format is less precise but can represent values closer to zero.
- ///
+ ///
/// @tparam genType Floating-point scalar or vector types.
///
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/isnan.xml">GLSL isnan man page</a>
/// @see <a href="http://www.opengl.org/registry/doc/GLSLangSpec.4.20.8.pdf">GLSL 4.20.8 specification, section 8.3 Common Functions</a>
- template <typename genType>
- GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const & x);
+ template<typename genType>
+ GLM_FUNC_DECL typename genType::bool_type isdenormal(genType const& x);
/// Similar to 'mod' but with a different rounding and integer support.
/// Returns 'x - y * trunc(x/y)' instead of 'x - y * floor(x/y)'
- ///
+ ///
/// @see <a href="http://stackoverflow.com/questions/7610631/glsl-mod-vs-hlsl-fmod">GLSL mod vs HLSL fmod</a>
/// @see <a href="http://www.opengl.org/sdk/docs/manglsl/xhtml/mod.xml">GLSL mod man page</a>
- template <typename T, precision P, template <typename, precision> class vecType>
- GLM_FUNC_DECL vecType<T, P> fmod(vecType<T, P> const & v);
+ template<length_t L, typename T, qualifier Q>
+ GLM_FUNC_DECL vec<L, T, Q> fmod(vec<L, T, Q> const& v);
+
+ /// Returns whether vector components values are within an interval. A open interval excludes its endpoints, and is denoted with square brackets.
+ ///
+ /// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+ /// @tparam T Floating-point or integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see ext_vector_relational
+ template <length_t L, typename T, qualifier Q>
+ GLM_FUNC_DECL vec<L, bool, Q> openBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max);
+
+ /// Returns whether vector components values are within an interval. A closed interval includes its endpoints, and is denoted with square brackets.
+ ///
+ /// @tparam L Integer between 1 and 4 included that qualify the dimension of the vector
+ /// @tparam T Floating-point or integer scalar types
+ /// @tparam Q Value from qualifier enum
+ ///
+ /// @see ext_vector_relational
+ template <length_t L, typename T, qualifier Q>
+ GLM_FUNC_DECL vec<L, bool, Q> closeBounded(vec<L, T, Q> const& Value, vec<L, T, Q> const& Min, vec<L, T, Q> const& Max);
/// @}
}//namespace glm