Browse Source

Doc++

pull/415/head
Vladimír Vondruš 6 years ago
parent
commit
bec180fcf0
  1. 2
      doc/changelog.dox
  2. 2
      doc/namespaces.dox
  3. 2
      src/Magnum/Math/Intersection.h
  4. 2
      src/Magnum/MeshTools/GenerateNormals.h

2
doc/changelog.dox

@ -106,7 +106,7 @@ See also:
and retrieved from @ref Corrade::Utility::Configuration / and retrieved from @ref Corrade::Utility::Configuration /
@ref Corrade::Utility::Arguments @ref Corrade::Utility::Arguments
- @ref Resource is now nothrow-movable and thus can be used with growable - @ref Resource is now nothrow-movable and thus can be used with growable
@ref Containers::Array instances @ref Corrade::Containers::Array instances
@subsubsection changelog-latest-changes-gl GL library @subsubsection changelog-latest-changes-gl GL library

2
doc/namespaces.dox

@ -29,7 +29,7 @@
/** @namespace Magnum /** @namespace Magnum
@brief Root namespace @brief Root namespace
Contains classes for interacting with OpenGL. Base classes and typedefs.
This library is built as part of Magnum by default. To use this library with This library is built as part of Magnum by default. To use this library with
CMake, find the `Magnum` package and link to the `Magnum::Magnum` target: CMake, find the `Magnum` package and link to the `Magnum::Magnum` target:

2
src/Magnum/Math/Intersection.h

@ -143,7 +143,7 @@ template<class T> inline T planeLine(const Vector4<T>& plane, const Vector3<T>&
@param p Starting point of the line @param p Starting point of the line
@param r Direction of the line @param r Direction of the line
@m_deprecated_since{201,10} Use @ref planeLine(const Vector4<T>&, const Vector3<T>&, const Vector3<T>&) @m_deprecated_since{2018,10} Use @ref planeLine(const Vector4<T>&, const Vector3<T>&, const Vector3<T>&)
together with @ref planeEquation(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&) together with @ref planeEquation(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&)
instead. instead.
*/ */

2
src/Magnum/MeshTools/GenerateNormals.h

@ -91,7 +91,7 @@ duplicates before returning. Expects that the position count is divisible by 3.
from the input @p indices array, so you'll need to recombine them using from the input @p indices array, so you'll need to recombine them using
@ref combineIndexedArrays() in order to have a single index array for both @ref combineIndexedArrays() in order to have a single index array for both
vertices and normals. Because this makes the usage more complex than vertices and normals. Because this makes the usage more complex than
strictly neccessary, this function is deprecated in favor of strictly necessary, this function is deprecated in favor of
@ref generateFlatNormals(const Containers::StridedArrayView1D<const Vector3>&). @ref generateFlatNormals(const Containers::StridedArrayView1D<const Vector3>&).
*/ */
CORRADE_DEPRECATED("use generateFlatNormals(const Containers::StridedArrayView1D<const Vector3>&) instead") std::pair<std::vector<UnsignedInt>, std::vector<Vector3>> MAGNUM_MESHTOOLS_EXPORT generateFlatNormals(const std::vector<UnsignedInt>& indices, const std::vector<Vector3>& positions); CORRADE_DEPRECATED("use generateFlatNormals(const Containers::StridedArrayView1D<const Vector3>&) instead") std::pair<std::vector<UnsignedInt>, std::vector<Vector3>> MAGNUM_MESHTOOLS_EXPORT generateFlatNormals(const std::vector<UnsignedInt>& indices, const std::vector<Vector3>& positions);

Loading…
Cancel
Save