diff --git a/src/Math/Constants.h b/src/Math/Constants.h index 5e8e70e9b..d3c2a88cc 100644 --- a/src/Math/Constants.h +++ b/src/Math/Constants.h @@ -71,16 +71,16 @@ Usable for entering e.g. rotation: Matrix4::rotation(deg(30.0f), Vector3::yAxis()); @endcode -This function (and also rad()) is available also in Magnum namespace itself. -@see Constants, rad() - */ +@see Magnum::deg(), Constants, rad() +*/ template inline constexpr T deg(T value) { return value*Constants::pi()/180; } /** - * @brief Angle in radians - * - * See deg() for more information. - */ +@brief Angle in radians + +See deg() for more information. +@see Magnum::rad() +*/ template inline constexpr T rad(T value) { return value; } }} diff --git a/src/Math/Functions.h b/src/Math/Functions.h index ad9066195..3f26865e3 100644 --- a/src/Math/Functions.h +++ b/src/Math/Functions.h @@ -30,14 +30,6 @@ namespace Magnum { namespace Math { -/** -@todo Vector/scalar overloaded functions (...SIMD): - - min(), max() (component-wise) - - abs() - - sin(), cos()... - - clamp(), lerp() -*/ - #ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct Pow { @@ -186,7 +178,7 @@ template inline constexpr typename std::ena @brief Denormalize floating-point value Converts floating-point value in range @f$ [0, 1] @f$ to full range of given -unsigned integral type or range @f$ [-1, 1] @f$ to full range of given signed +*unsigned* integral type or range @f$ [-1, 1] @f$ to full range of given *signed* integral type. @note For best precision, `FloatingPoint` type should be always larger that diff --git a/src/MeshTools/CombineIndexedArrays.h b/src/MeshTools/CombineIndexedArrays.h index 7e4299e60..cb8d0bbd4 100644 --- a/src/MeshTools/CombineIndexedArrays.h +++ b/src/MeshTools/CombineIndexedArrays.h @@ -120,7 +120,7 @@ std::vector indices = MeshTools::combineIndexedArrays( `positions`, `normals` and `textureCoordinates` will then contain combined attributes indexed with `indices`. -The function expects that all arrays have the same size. +@attention The function expects that all arrays have the same size. */ /* Implementation note: It's done using tuples because it is more clear which parameter is index array and which is attribute array, mainly when both are