diff --git a/src/Magnum/Shapes/AbstractShape.h b/src/Magnum/Shapes/AbstractShape.h index e8cb510ef..50c1c5303 100644 --- a/src/Magnum/Shapes/AbstractShape.h +++ b/src/Magnum/Shapes/AbstractShape.h @@ -58,7 +58,7 @@ template class MAGNUM_SHAPES_EXPORT AbstractShape: publi Dimensions = dimensions /**< Dimension count */ }; - /** @brief %Shape type */ + /** @brief Shape type */ #ifdef DOXYGEN_GENERATING_OUTPUT enum class Type { Point, /**< Point */ @@ -83,14 +83,14 @@ template class MAGNUM_SHAPES_EXPORT AbstractShape: publi explicit AbstractShape(SceneGraph::AbstractObject& object, ShapeGroup* group = nullptr); /** - * @brief %Shape group containing this shape + * @brief Shape group containing this shape * * If the shape doesn't belong to any group, returns `nullptr`. */ ShapeGroup* group(); const ShapeGroup* group() const; /**< @overload */ - /** @brief %Shape type */ + /** @brief Shape type */ Type type() const; /** @@ -101,7 +101,7 @@ template class MAGNUM_SHAPES_EXPORT AbstractShape: publi bool collides(const AbstractShape& other) const; /** - * @brief %Collision with other shape + * @brief Collision with other shape * * Default implementation returns empty collision. */ diff --git a/src/Magnum/Shapes/AxisAlignedBox.h b/src/Magnum/Shapes/AxisAlignedBox.h index d92fb9275..b72b27ff5 100644 --- a/src/Magnum/Shapes/AxisAlignedBox.h +++ b/src/Magnum/Shapes/AxisAlignedBox.h @@ -82,7 +82,7 @@ template class MAGNUM_SHAPES_EXPORT AxisAlignedBox { _max = max; } - /** @brief %Collision occurence with point */ + /** @brief Collision occurence with point */ bool operator%(const Point& other) const; private: diff --git a/src/Magnum/Shapes/Capsule.h b/src/Magnum/Shapes/Capsule.h index bdc622dcd..dc7a439a9 100644 --- a/src/Magnum/Shapes/Capsule.h +++ b/src/Magnum/Shapes/Capsule.h @@ -37,7 +37,7 @@ namespace Magnum { namespace Shapes { /** -@brief %Capsule defined by cylinder start and end point and radius +@brief Capsule defined by cylinder start and end point and radius Unlike other elements the capsule expects uniform scaling. See @ref shapes for brief introduction. @@ -90,10 +90,10 @@ template class MAGNUM_SHAPES_EXPORT Capsule { /** @brief Set radius */ void setRadius(Float radius) { _radius = radius; } - /** @brief %Collision occurence with point */ + /** @brief Collision occurence with point */ bool operator%(const Point& other) const; - /** @brief %Collision occurence with sphere */ + /** @brief Collision occurence with sphere */ bool operator%(const Sphere& other) const; private: diff --git a/src/Magnum/Shapes/Collision.h b/src/Magnum/Shapes/Collision.h index 74e945e43..d387dcd33 100644 --- a/src/Magnum/Shapes/Collision.h +++ b/src/Magnum/Shapes/Collision.h @@ -36,7 +36,7 @@ namespace Magnum { namespace Shapes { /** -@brief %Collision data +@brief Collision data Contains information about collision between objects A and B, described by contact position, separation normal and separation distance. @@ -80,7 +80,7 @@ template class Collision { */ operator bool() const { return _separationDistance > 0.0f; } - /** @brief %Collision position */ + /** @brief Collision position */ VectorTypeFor position() const { return _position; } diff --git a/src/Magnum/Shapes/Composition.h b/src/Magnum/Shapes/Composition.h index 90b6dc8cd..185ad3cec 100644 --- a/src/Magnum/Shapes/Composition.h +++ b/src/Magnum/Shapes/Composition.h @@ -52,7 +52,7 @@ namespace Implementation { } } -/** @brief %Shape operation */ +/** @brief Shape operation */ enum class CompositionOperation: UnsignedByte { Not, /**< Boolean NOT */ And, /**< Boolean AND */ @@ -60,7 +60,7 @@ enum class CompositionOperation: UnsignedByte { }; /** -@brief %Composition of shapes +@brief Composition of shapes Result of logical operations on shapes. See @ref shapes for brief introduction. */ @@ -74,7 +74,7 @@ template class MAGNUM_SHAPES_EXPORT Composition { Dimensions = dimensions /**< Dimension count */ }; - /** @brief %Shape type */ + /** @brief Shape type */ #ifdef DOXYGEN_GENERATING_OUTPUT enum class Type { Point, /**< Point */ @@ -137,10 +137,10 @@ template class MAGNUM_SHAPES_EXPORT Composition { /** @brief Type of shape at given position */ Type type(std::size_t i) const { return _shapes[i]->type(); } - /** @brief %Shape at given position */ + /** @brief Shape at given position */ template const T& get(std::size_t i) const; - /** @brief %Collision with another shape */ + /** @brief Collision with another shape */ #ifdef DOXYGEN_GENERATING_OUTPUT template bool operator%(const T& other) const { #else @@ -199,7 +199,7 @@ template Debug operator<<(Debug debug, typename Composit #endif /** @relates Composition -@brief %Collision occurence of shape with %Composition +@brief Collision occurence of shape with Composition */ #ifdef DOXYGEN_GENERATING_OUTPUT template inline bool operator%(const T& a, const Composition& b) { diff --git a/src/Magnum/Shapes/Cylinder.h b/src/Magnum/Shapes/Cylinder.h index 12de64612..0186e9104 100644 --- a/src/Magnum/Shapes/Cylinder.h +++ b/src/Magnum/Shapes/Cylinder.h @@ -90,10 +90,10 @@ template class MAGNUM_SHAPES_EXPORT Cylinder { /** @brief Set radius */ void setRadius(Float radius) { _radius = radius; } - /** @brief %Collision occurence with point */ + /** @brief Collision occurence with point */ bool operator%(const Point& other) const; - /** @brief %Collision occurence with sphere */ + /** @brief Collision occurence with sphere */ bool operator%(const Sphere& other) const; private: diff --git a/src/Magnum/Shapes/LineSegment.h b/src/Magnum/Shapes/LineSegment.h index 6c5f7c99a..e9a2c2f3d 100644 --- a/src/Magnum/Shapes/LineSegment.h +++ b/src/Magnum/Shapes/LineSegment.h @@ -34,7 +34,7 @@ namespace Magnum { namespace Shapes { /** -@brief %Line segment, defined by starting and ending point +@brief Line segment, defined by starting and ending point See @ref shapes for brief introduction. @see @ref LineSegment2D, @ref LineSegment3D diff --git a/src/Magnum/Shapes/Plane.h b/src/Magnum/Shapes/Plane.h index 70d6ec18c..08afcc6af 100644 --- a/src/Magnum/Shapes/Plane.h +++ b/src/Magnum/Shapes/Plane.h @@ -77,10 +77,10 @@ class MAGNUM_SHAPES_EXPORT Plane { _normal = normal; } - /** @brief %Collision occurence with line */ + /** @brief Collision occurence with line */ bool operator%(const Line3D& other) const; - /** @brief %Collision occurence with line segment */ + /** @brief Collision occurence with line segment */ bool operator%(const LineSegment3D& other) const; private: diff --git a/src/Magnum/Shapes/Point.h b/src/Magnum/Shapes/Point.h index d63eadd45..f812d4c99 100644 --- a/src/Magnum/Shapes/Point.h +++ b/src/Magnum/Shapes/Point.h @@ -36,7 +36,7 @@ namespace Magnum { namespace Shapes { /** -@brief %Point +@brief Point See @ref shapes for brief introduction. @see @ref Point2D, @ref Point3D diff --git a/src/Magnum/Shapes/Shape.h b/src/Magnum/Shapes/Shape.h index b501ee1db..531157f3f 100644 --- a/src/Magnum/Shapes/Shape.h +++ b/src/Magnum/Shapes/Shape.h @@ -42,7 +42,7 @@ namespace Implementation { /** @brief Object shape -Adds shape for collision detection to object. Each %Shape is part of +Adds shape for collision detection to object. Each Shape is part of some @ref ShapeGroup, which essentially maintains a set of objects which can collide with each other. See @ref shapes for brief introduction. @@ -73,7 +73,7 @@ template class Shape: public AbstractShape { /** * @brief Constructor * @param object Object holding this feature - * @param shape %Shape + * @param shape Shape * @param group Group this shape belongs to */ explicit Shape(SceneGraph::AbstractObject& object, const T& shape, ShapeGroup* group = nullptr): AbstractShape(object, group) { diff --git a/src/Magnum/Shapes/Sphere.h b/src/Magnum/Shapes/Sphere.h index 9eed8685e..978403a48 100644 --- a/src/Magnum/Shapes/Sphere.h +++ b/src/Magnum/Shapes/Sphere.h @@ -38,7 +38,7 @@ namespace Magnum { namespace Shapes { /** -@brief %Sphere defined by position and radius +@brief Sphere defined by position and radius Unlike other elements the sphere expects uniform scaling. See @ref shapes for brief introduction. @@ -81,22 +81,22 @@ template class MAGNUM_SHAPES_EXPORT Sphere { /** @brief Set radius */ void setRadius(Float radius) { _radius = radius; } - /** @brief %Collision occurence with point */ + /** @brief Collision occurence with point */ bool operator%(const Point& other) const; - /** @brief %Collision with point */ + /** @brief Collision with point */ Collision operator/(const Point& other) const; - /** @brief %Collision occurence with line */ + /** @brief Collision occurence with line */ bool operator%(const Line& other) const; - /** @brief %Collision occurence with line segment */ + /** @brief Collision occurence with line segment */ bool operator%(const LineSegment& other) const; - /** @brief %Collision occurence with sphere */ + /** @brief Collision occurence with sphere */ bool operator%(const Sphere& other) const; - /** @brief %Collision with sphere */ + /** @brief Collision with sphere */ Collision operator/(const Sphere& other) const; private: @@ -147,16 +147,16 @@ template class MAGNUM_SHAPES_EXPORT InvertedSphere: using Sphere::radius; using Sphere::setRadius; - /** @brief %Collision occurence with point */ + /** @brief Collision occurence with point */ bool operator%(const Point& other) const; - /** @brief %Collision with point */ + /** @brief Collision with point */ Collision operator/(const Point& other) const; - /** @brief %Collision occurence with sphere */ + /** @brief Collision occurence with sphere */ bool operator%(const Sphere& other) const; - /** @brief %Collision with sphere */ + /** @brief Collision with sphere */ Collision operator/(const Sphere& other) const; private: