diff --git a/doc/man.doxy b/doc/man.doxy index da1f1c8a..8eab2f64 100644 --- a/doc/man.doxy +++ b/doc/man.doxy @@ -51,7 +51,7 @@ PROJECT_BRIEF = # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = G:/Source/G-Truc/glm/doc/manual/logo-mini.png +PROJECT_LOGO = theme/logo-mini.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is diff --git a/glm/ext/scalar_integer.hpp b/glm/ext/scalar_integer.hpp index 431602d1..a2ca8a2a 100644 --- a/glm/ext/scalar_integer.hpp +++ b/glm/ext/scalar_integer.hpp @@ -2,9 +2,8 @@ /// @file glm/ext/scalar_integer.hpp /// /// @see core (dependence) -/// @see ext_vector_integer (dependence) /// -/// @defgroup gtc_round GLM_EXT_scalar_integer +/// @defgroup ext_scalar_integer GLM_EXT_scalar_integer /// @ingroup ext /// /// Include to use the features of this extension. diff --git a/glm/ext/vector_integer.hpp b/glm/ext/vector_integer.hpp index d54409da..1304dd8d 100644 --- a/glm/ext/vector_integer.hpp +++ b/glm/ext/vector_integer.hpp @@ -4,7 +4,7 @@ /// @see core (dependence) /// @see ext_vector_integer (dependence) /// -/// @defgroup gtc_round GLM_EXT_vector_integer +/// @defgroup ext_vector_integer GLM_EXT_vector_integer /// @ingroup ext /// /// Include to use the features of this extension. diff --git a/glm/ext/vector_relational.hpp b/glm/ext/vector_relational.hpp index a556bdfa..1c2367dc 100644 --- a/glm/ext/vector_relational.hpp +++ b/glm/ext/vector_relational.hpp @@ -1,6 +1,9 @@ /// @ref ext_vector_relational /// @file glm/ext/vector_relational.hpp /// +/// @see core (dependence) +/// @see ext_scalar_integer (dependence) +/// /// @defgroup ext_vector_relational GLM_EXT_vector_relational /// @ingroup ext /// diff --git a/glm/gtc/round.hpp b/glm/gtc/round.hpp index f1424c30..56edbbca 100644 --- a/glm/gtc/round.hpp +++ b/glm/gtc/round.hpp @@ -30,22 +30,6 @@ namespace glm /// @addtogroup gtc_round /// @{ - /// Return true if the value is a power of two number. - /// - /// @see gtc_round - template - GLM_FUNC_DECL bool isPowerOfTwo(genIUType v); - - /// Return true if the value is a power of two number. - /// - /// @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 gtc_round - template - GLM_FUNC_DECL vec isPowerOfTwo(vec const& v); - /// Return the power of two number which value is just higher the input value, /// round up to a power of two. /// @@ -98,32 +82,6 @@ namespace glm template GLM_FUNC_DECL vec roundPowerOfTwo(vec const& v); - /// Return true if the 'Value' is a multiple of 'Multiple'. - /// - /// @see gtc_round - template - GLM_FUNC_DECL bool isMultiple(genIUType v, genIUType Multiple); - - /// Return true if the 'Value' is a multiple of 'Multiple'. - /// - /// @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 gtc_round - template - GLM_FUNC_DECL vec isMultiple(vec const& v, T Multiple); - - /// Return true if the 'Value' is a multiple of 'Multiple'. - /// - /// @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 gtc_round - template - GLM_FUNC_DECL vec isMultiple(vec const& v, vec const& Multiple); - /// Higher multiple number of Source. /// /// @tparam genType Floating-point or integer scalar or vector types.