Browse Source

Doxygen: ignore specific namespaces instead of whole directories.

Less maintenance burden with `#ifndef DOXYGEN_GENERATING_OUTPUT`,
removed the ones which are not needed anymore.
pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
7ef8432fbe
  1. 7
      Doxyfile
  2. 8
      src/AbstractFramebuffer.cpp
  3. 6
      src/AbstractFramebuffer.h
  4. 6
      src/AbstractImage.h
  5. 2
      src/AbstractShaderProgram.cpp
  6. 4
      src/AbstractShaderProgram.h
  7. 5
      src/AbstractTexture.cpp
  8. 6
      src/AbstractTexture.h
  9. 2
      src/Color.h
  10. 2
      src/Context.h
  11. 2
      src/DebugTools/Profiler.h
  12. 2
      src/DebugTools/ShapeRenderer.cpp
  13. 4
      src/DebugTools/ShapeRenderer.h
  14. 2
      src/Math/Algorithms/Svd.h
  15. 4
      src/Math/BoolVector.h
  16. 2
      src/Math/Complex.h
  17. 2
      src/Math/Functions.h
  18. 2
      src/Math/Matrix.h
  19. 2
      src/Math/Quaternion.h
  20. 2
      src/Math/Swizzle.h
  21. 4
      src/Math/TypeTraits.h
  22. 2
      src/Math/Vector.h
  23. 2
      src/MeshTools/Clean.h
  24. 2
      src/MeshTools/CombineIndexedArrays.h
  25. 2
      src/MeshTools/CompressIndices.cpp
  26. 2
      src/MeshTools/Interleave.h
  27. 2
      src/MeshTools/Subdivide.h
  28. 2
      src/MeshTools/Tipsify.cpp
  29. 2
      src/MeshTools/Tipsify.h
  30. 2
      src/Platform/NaClApplication.h
  31. 2
      src/Resource.h
  32. 2
      src/ResourceManager.h
  33. 2
      src/SceneGraph/AbstractCamera.h
  34. 2
      src/SceneGraph/AbstractCamera.hpp
  35. 2
      src/SceneGraph/AbstractFeature.h
  36. 2
      src/SceneGraph/Camera.cpp
  37. 2
      src/SceneGraph/Object.h
  38. 2
      src/Swizzle.h

7
Doxyfile

@ -734,9 +734,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories # against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/* # for example use the pattern */test/*
EXCLUDE_PATTERNS = */Test/* \ EXCLUDE_PATTERNS =
*/Implementation/* \
*Visibility.h
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the # (namespaces, classes, functions, etc.) that should be excluded from the
@ -744,7 +742,8 @@ EXCLUDE_PATTERNS = */Test/* \
# wildcard * is used, a substring. Examples: ANamespace, AClass, # wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test # AClass::ANamespace, ANamespace::*Test
EXCLUDE_SYMBOLS = EXCLUDE_SYMBOLS = Magnum::*Implementation \
Magnum::*Test
# The EXAMPLE_PATH tag can be used to specify one or more files or # The EXAMPLE_PATH tag can be used to specify one or more files or
# directories that contain example code fragments that are included (see # directories that contain example code fragments that are included (see

8
src/AbstractFramebuffer.cpp

@ -34,21 +34,18 @@
namespace Magnum { namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
AbstractFramebuffer::DrawBuffersImplementation AbstractFramebuffer::drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDefault; AbstractFramebuffer::DrawBuffersImplementation AbstractFramebuffer::drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDefault;
AbstractFramebuffer::DrawBufferImplementation AbstractFramebuffer::drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDefault; AbstractFramebuffer::DrawBufferImplementation AbstractFramebuffer::drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDefault;
AbstractFramebuffer::ReadBufferImplementation AbstractFramebuffer::readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDefault; AbstractFramebuffer::ReadBufferImplementation AbstractFramebuffer::readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDefault;
AbstractFramebuffer::Target AbstractFramebuffer::readTarget = AbstractFramebuffer::Target::ReadDraw; AbstractFramebuffer::Target AbstractFramebuffer::readTarget = AbstractFramebuffer::Target::ReadDraw;
AbstractFramebuffer::Target AbstractFramebuffer::drawTarget = AbstractFramebuffer::Target::ReadDraw; AbstractFramebuffer::Target AbstractFramebuffer::drawTarget = AbstractFramebuffer::Target::ReadDraw;
#endif
void AbstractFramebuffer::bind(Target target) { void AbstractFramebuffer::bind(Target target) {
bindInternal(target); bindInternal(target);
setViewportInternal(); setViewportInternal();
} }
#ifndef DOXYGEN_GENERATING_OUTPUT
void AbstractFramebuffer::bindInternal(Target target) { void AbstractFramebuffer::bindInternal(Target target) {
Implementation::FramebufferState* state = Context::current()->state()->framebuffer; Implementation::FramebufferState* state = Context::current()->state()->framebuffer;
@ -85,7 +82,6 @@ AbstractFramebuffer::Target AbstractFramebuffer::bindInternal() {
glBindFramebuffer(GLenum(readTarget), _id); glBindFramebuffer(GLenum(readTarget), _id);
return readTarget; return readTarget;
} }
#endif
void AbstractFramebuffer::blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& sourceRectangle, const Rectanglei& destinationRectangle, AbstractFramebuffer::BlitMask mask, AbstractFramebuffer::BlitFilter filter) { void AbstractFramebuffer::blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& sourceRectangle, const Rectanglei& destinationRectangle, AbstractFramebuffer::BlitMask mask, AbstractFramebuffer::BlitFilter filter) {
source.bindInternal(AbstractFramebuffer::Target::Read); source.bindInternal(AbstractFramebuffer::Target::Read);
@ -111,7 +107,6 @@ AbstractFramebuffer* AbstractFramebuffer::setViewport(const Rectanglei& rectangl
return this; return this;
} }
#ifndef DOXYGEN_GENERATING_OUTPUT
void AbstractFramebuffer::setViewportInternal() { void AbstractFramebuffer::setViewportInternal() {
Implementation::FramebufferState* state = Context::current()->state()->framebuffer; Implementation::FramebufferState* state = Context::current()->state()->framebuffer;
@ -125,7 +120,6 @@ void AbstractFramebuffer::setViewportInternal() {
state->viewport = _viewport; state->viewport = _viewport;
glViewport(_viewport.left(), _viewport.bottom(), _viewport.width(), _viewport.height()); glViewport(_viewport.left(), _viewport.bottom(), _viewport.width(), _viewport.height());
} }
#endif
void AbstractFramebuffer::clear(ClearMask mask) { void AbstractFramebuffer::clear(ClearMask mask) {
bindInternal(drawTarget); bindInternal(drawTarget);
@ -152,7 +146,6 @@ void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Abs
} }
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT
void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attachments) { void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attachments) {
/** @todo Re-enable when extension wrangler is available for ES2 */ /** @todo Re-enable when extension wrangler is available for ES2 */
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
@ -175,7 +168,6 @@ void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attach
static_cast<void>(rectangle); static_cast<void>(rectangle);
#endif #endif
} }
#endif
void AbstractFramebuffer::initializeContextBasedFunctionality(Context* context) { void AbstractFramebuffer::initializeContextBasedFunctionality(Context* context) {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES

6
src/AbstractFramebuffer.h

@ -260,8 +260,11 @@ class MAGNUM_EXPORT AbstractFramebuffer {
void read(const Vector2i& offset, const Vector2i& size, AbstractImage::Format format, AbstractImage::Type type, BufferImage2D* image, Buffer::Usage usage); void read(const Vector2i& offset, const Vector2i& size, AbstractImage::Format format, AbstractImage::Type type, BufferImage2D* image, Buffer::Usage usage);
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT #ifdef DOXYGEN_GENERATING_OUTPUT
private:
#else
protected: protected:
#endif
void MAGNUM_LOCAL bindInternal(Target target); void MAGNUM_LOCAL bindInternal(Target target);
Target MAGNUM_LOCAL bindInternal(); Target MAGNUM_LOCAL bindInternal();
void MAGNUM_LOCAL setViewportInternal(); void MAGNUM_LOCAL setViewportInternal();
@ -283,7 +286,6 @@ class MAGNUM_EXPORT AbstractFramebuffer {
GLuint _id; GLuint _id;
Rectanglei _viewport; Rectanglei _viewport;
#endif
private: private:
static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context); static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context);

6
src/AbstractImage.h

@ -512,11 +512,13 @@ class MAGNUM_EXPORT AbstractImage {
/** @brief Data type of pixel data */ /** @brief Data type of pixel data */
inline Type type() const { return _type; } inline Type type() const { return _type; }
#ifndef DOXYGEN_GENERATING_OUTPUT #ifdef DOXYGEN_GENERATING_OUTPUT
private:
#else
protected: protected:
#endif
Format _format; Format _format;
Type _type; Type _type;
#endif
}; };
inline AbstractImage::~AbstractImage() {} inline AbstractImage::~AbstractImage() {}

2
src/AbstractShaderProgram.cpp

@ -578,7 +578,6 @@ void AbstractShaderProgram::uniformImplementationDSA(const GLint location, const
} }
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
std::size_t FloatAttribute::size(GLint components, DataType dataType) { std::size_t FloatAttribute::size(GLint components, DataType dataType) {
@ -837,6 +836,5 @@ Debug operator<<(Debug debug, Attribute<Math::Vector<4, Float>>::DataType value)
} }
} }
#endif
} }

4
src/AbstractShaderProgram.h

@ -39,11 +39,9 @@
namespace Magnum { namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class> struct Attribute; template<class> struct Attribute;
} }
#endif
/** /**
@brief Base for shader program implementations @brief Base for shader program implementations
@ -1168,7 +1166,6 @@ template<class T> Debug operator<<(Debug debug, AbstractShaderProgram::Attribute
template<class T> Debug operator<<(Debug debug, AbstractShaderProgram::Attribute<T>::DataType); template<class T> Debug operator<<(Debug debug, AbstractShaderProgram::Attribute<T>::DataType);
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
/* Base for sized attributes */ /* Base for sized attributes */
@ -1423,7 +1420,6 @@ template<class T> struct Attribute<Math::Matrix3<T>>: Attribute<Math::Matrix<3,
template<class T> struct Attribute<Math::Matrix4<T>>: Attribute<Math::Matrix<4, T>> {}; template<class T> struct Attribute<Math::Matrix4<T>>: Attribute<Math::Matrix<4, T>> {};
} }
#endif
} }

5
src/AbstractTexture.cpp

@ -75,8 +75,6 @@ AbstractTexture::SubImage3DImplementation AbstractTexture::subImage3DImplementat
AbstractTexture::InvalidateImplementation AbstractTexture::invalidateImplementation = &AbstractTexture::invalidateImplementationNoOp; AbstractTexture::InvalidateImplementation AbstractTexture::invalidateImplementation = &AbstractTexture::invalidateImplementationNoOp;
AbstractTexture::InvalidateSubImplementation AbstractTexture::invalidateSubImplementation = &AbstractTexture::invalidateSubImplementationNoOp; AbstractTexture::InvalidateSubImplementation AbstractTexture::invalidateSubImplementation = &AbstractTexture::invalidateSubImplementationNoOp;
#ifndef DOXYGEN_GENERATING_OUTPUT
/* Check correctness of binary OR in setMinificationFilter(). If nobody fucks /* Check correctness of binary OR in setMinificationFilter(). If nobody fucks
anything up, this assert should produce the same results on all dimensions, anything up, this assert should produce the same results on all dimensions,
thus testing only on AbstractTexture. */ thus testing only on AbstractTexture. */
@ -90,7 +88,6 @@ static_assert((filter_or(Nearest, Base) == GL_NEAREST) &&
(filter_or(Linear, Linear) == GL_LINEAR_MIPMAP_LINEAR), (filter_or(Linear, Linear) == GL_LINEAR_MIPMAP_LINEAR),
"Unsupported constants for GL texture filtering"); "Unsupported constants for GL texture filtering");
#undef filter_or #undef filter_or
#endif
Int AbstractTexture::maxSupportedLayerCount() { Int AbstractTexture::maxSupportedLayerCount() {
return Context::current()->state()->texture->maxSupportedLayerCount; return Context::current()->state()->texture->maxSupportedLayerCount;
@ -198,7 +195,6 @@ void AbstractTexture::mipmapImplementationDSA() {
} }
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT
void AbstractTexture::bindInternal() { void AbstractTexture::bindInternal() {
Implementation::TextureState* const textureState = Context::current()->state()->texture; Implementation::TextureState* const textureState = Context::current()->state()->texture;
@ -215,7 +211,6 @@ void AbstractTexture::bindInternal() {
if(textureState->bindings[internalLayer] != _id) if(textureState->bindings[internalLayer] != _id)
glBindTexture(_target, (textureState->bindings[internalLayer] = _id)); glBindTexture(_target, (textureState->bindings[internalLayer] = _id));
} }
#endif
void AbstractTexture::initializeContextBasedFunctionality(Context* context) { void AbstractTexture::initializeContextBasedFunctionality(Context* context) {
Implementation::TextureState* const textureState = context->state()->texture; Implementation::TextureState* const textureState = context->state()->texture;

6
src/AbstractTexture.h

@ -1158,15 +1158,17 @@ class MAGNUM_EXPORT AbstractTexture {
*/ */
AbstractTexture* generateMipmap(); AbstractTexture* generateMipmap();
#ifdef DOXYGEN_GENERATING_OUTPUT
private:
#else
protected: protected:
#ifndef DOXYGEN_GENERATING_OUTPUT #endif
template<UnsignedInt textureDimensions> struct DataHelper {}; template<UnsignedInt textureDimensions> struct DataHelper {};
/* Unlike bind() this also sets the binding layer as active */ /* Unlike bind() this also sets the binding layer as active */
void MAGNUM_LOCAL bindInternal(); void MAGNUM_LOCAL bindInternal();
GLenum _target; GLenum _target;
#endif
private: private:
static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context); static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context);

2
src/Color.h

@ -36,7 +36,6 @@
namespace Magnum { namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
/* Convert color from HSV */ /* Convert color from HSV */
@ -133,7 +132,6 @@ template<class T> inline constexpr typename std::enable_if<std::is_integral<T>::
} }
} }
#endif
/** /**
@brief Three-component (RGB) color @brief Three-component (RGB) color

2
src/Context.h

@ -37,11 +37,9 @@
namespace Magnum { namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
struct State; struct State;
} }
#endif
/** /**
@brief OpenGL version @brief OpenGL version

2
src/DebugTools/Profiler.h

@ -114,9 +114,7 @@ class MAGNUM_DEBUGTOOLS_EXPORT Profiler {
*/ */
static const Section otherSection = 0; static const Section otherSection = 0;
#ifndef DOXYGEN_GENERATING_OUTPUT
explicit Profiler(): enabled(false), measureDuration(60), currentFrame(0), frameCount(0), sections{"Other"}, currentSection(otherSection) {} explicit Profiler(): enabled(false), measureDuration(60), currentFrame(0), frameCount(0), sections{"Other"}, currentSection(otherSection) {}
#endif
/** /**
* @brief Set measure duration * @brief Set measure duration

2
src/DebugTools/ShapeRenderer.cpp

@ -43,7 +43,6 @@
namespace Magnum { namespace DebugTools { namespace Magnum { namespace DebugTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<> void createDebugMesh(ShapeRenderer<2>* renderer, Physics::AbstractShape<2>* shape) { template<> void createDebugMesh(ShapeRenderer<2>* renderer, Physics::AbstractShape<2>* shape) {
@ -98,7 +97,6 @@ template<> void createDebugMesh(ShapeRenderer<3>* renderer, Physics::AbstractSha
} }
} }
#endif
template<UnsignedInt dimensions> ShapeRenderer<dimensions>::ShapeRenderer(Physics::ObjectShape<dimensions>* shape, ResourceKey options, SceneGraph::DrawableGroup<dimensions>* drawables): SceneGraph::Drawable<dimensions>(shape->object(), drawables), options(ResourceManager::instance()->get<ShapeRendererOptions>(options)) { template<UnsignedInt dimensions> ShapeRenderer<dimensions>::ShapeRenderer(Physics::ObjectShape<dimensions>* shape, ResourceKey options, SceneGraph::DrawableGroup<dimensions>* drawables): SceneGraph::Drawable<dimensions>(shape->object(), drawables), options(ResourceManager::instance()->get<ShapeRendererOptions>(options)) {
CORRADE_ASSERT(shape->shape() != nullptr, "DebugTools::ShapeRenderer: cannot create renderer for empty shape", ); CORRADE_ASSERT(shape->shape() != nullptr, "DebugTools::ShapeRenderer: cannot create renderer for empty shape", );

4
src/DebugTools/ShapeRenderer.h

@ -42,13 +42,11 @@ namespace Magnum { namespace DebugTools {
template<UnsignedInt> class ShapeRenderer; template<UnsignedInt> class ShapeRenderer;
#endif #endif
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<UnsignedInt> class AbstractShapeRenderer; template<UnsignedInt> class AbstractShapeRenderer;
template<UnsignedInt dimensions> void createDebugMesh(ShapeRenderer<dimensions>* renderer, Physics::AbstractShape<dimensions>* shape); template<UnsignedInt dimensions> void createDebugMesh(ShapeRenderer<dimensions>* renderer, Physics::AbstractShape<dimensions>* shape);
} }
#endif
/** /**
@brief Shape renderer options @brief Shape renderer options
@ -140,9 +138,7 @@ new DebugTools::ShapeRenderer2D(shape, "red", debugDrawables);
@see ShapeRenderer2D, ShapeRenderer3D @see ShapeRenderer2D, ShapeRenderer3D
*/ */
template<UnsignedInt dimensions> class MAGNUM_DEBUGTOOLS_EXPORT ShapeRenderer: public SceneGraph::Drawable<dimensions> { template<UnsignedInt dimensions> class MAGNUM_DEBUGTOOLS_EXPORT ShapeRenderer: public SceneGraph::Drawable<dimensions> {
#ifndef DOXYGEN_GENERATING_OUTPUT
friend void Implementation::createDebugMesh<>(ShapeRenderer<dimensions>*, Physics::AbstractShape<dimensions>*); friend void Implementation::createDebugMesh<>(ShapeRenderer<dimensions>*, Physics::AbstractShape<dimensions>*);
#endif
public: public:
/** /**

2
src/Math/Algorithms/Svd.h

@ -35,7 +35,6 @@
namespace Magnum { namespace Math { namespace Algorithms { namespace Magnum { namespace Math { namespace Algorithms {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class T> T pythagoras(T a, T b) { template<class T> T pythagoras(T a, T b) {
@ -56,7 +55,6 @@ template<> inline constexpr Double smallestDelta<Double>() { return 1.0e-64; }
#endif #endif
} }
#endif
/** /**
@brief Singular Value Decomposition @brief Singular Value Decomposition

4
src/Math/BoolVector.h

@ -35,10 +35,10 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<std::size_t ...> struct Sequence {}; template<std::size_t ...> struct Sequence {};
#ifndef DOXYGEN_GENERATING_OUTPUT
/* E.g. GenerateSequence<3>::Type is Sequence<0, 1, 2> */ /* E.g. GenerateSequence<3>::Type is Sequence<0, 1, 2> */
template<std::size_t N, std::size_t ...sequence> struct GenerateSequence: template<std::size_t N, std::size_t ...sequence> struct GenerateSequence:
GenerateSequence<N-1, N-1, sequence...> {}; GenerateSequence<N-1, N-1, sequence...> {};
@ -46,10 +46,10 @@ namespace Implementation {
template<std::size_t ...sequence> struct GenerateSequence<0, sequence...> { template<std::size_t ...sequence> struct GenerateSequence<0, sequence...> {
typedef Sequence<sequence...> Type; typedef Sequence<sequence...> Type;
}; };
#endif
template<class T> inline constexpr T repeat(T value, std::size_t) { return value; } template<class T> inline constexpr T repeat(T value, std::size_t) { return value; }
} }
#endif
/** /**
@brief %Vector storing boolean values @brief %Vector storing boolean values

2
src/Math/Complex.h

@ -37,14 +37,12 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
/* No assertions fired, for internal use */ /* No assertions fired, for internal use */
template<class T> inline static Complex<T> complexFromMatrix(const Matrix<2, T>& matrix) { template<class T> inline static Complex<T> complexFromMatrix(const Matrix<2, T>& matrix) {
return {matrix[0][0], matrix[0][1]}; return {matrix[0][0], matrix[0][1]};
} }
} }
#endif
/** /**
@brief %Complex number @brief %Complex number

2
src/Math/Functions.h

@ -38,7 +38,6 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<UnsignedInt exponent> struct Pow { template<UnsignedInt exponent> struct Pow {
Pow() = delete; Pow() = delete;
@ -53,7 +52,6 @@ namespace Implementation {
template<class T> inline constexpr static T pow(T) { return 1; } template<class T> inline constexpr static T pow(T) { return 1; }
}; };
} }
#endif
/** /**
* @brief Integral power * @brief Integral power

2
src/Math/Matrix.h

@ -32,11 +32,9 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<std::size_t size, class T> class MatrixDeterminant; template<std::size_t size, class T> class MatrixDeterminant;
} }
#endif
/** /**
@brief Square matrix @brief Square matrix

2
src/Math/Quaternion.h

@ -38,7 +38,6 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
/* No assertions fired, for internal use */ /* No assertions fired, for internal use */
@ -75,7 +74,6 @@ template<class T> inline Quaternion<T> quaternionFromMatrix(const Matrix<3, T>&
} }
} }
#endif
/** /**
@brief %Quaternion @brief %Quaternion

2
src/Math/Swizzle.h

@ -32,7 +32,6 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<std::size_t size, std::size_t position> struct ComponentAtPosition { template<std::size_t size, std::size_t position> struct ComponentAtPosition {
static_assert(size > position, "Swizzle parameter out of range of base vector"); static_assert(size > position, "Swizzle parameter out of range of base vector");
@ -52,7 +51,6 @@ namespace Implementation {
template<class T> inline constexpr static T value(const Math::Vector<size, T>&) { return T(1); } template<class T> inline constexpr static T value(const Math::Vector<size, T>&) { return T(1); }
}; };
} }
#endif
/** /**
@brief Swizzle Vector components @brief Swizzle Vector components

4
src/Math/TypeTraits.h

@ -52,7 +52,6 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class T> struct TypeTraitsDefault { template<class T> struct TypeTraitsDefault {
TypeTraitsDefault() = delete; TypeTraitsDefault() = delete;
@ -62,7 +61,6 @@ namespace Implementation {
} }
}; };
} }
#endif
/** /**
@brief Traits class for numeric types @brief Traits class for numeric types
@ -115,7 +113,6 @@ template<class T> struct TypeTraits: Implementation::TypeTraitsDefault<T> {
* http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm * http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm
*/ */
#ifndef DOXYGEN_GENERATING_OUTPUT
/* Integral scalar types */ /* Integral scalar types */
namespace Implementation { namespace Implementation {
template<class T> struct TypeTraitsIntegral: TypeTraitsDefault<T> { template<class T> struct TypeTraitsIntegral: TypeTraitsDefault<T> {
@ -123,6 +120,7 @@ namespace Implementation {
}; };
} }
#ifndef DOXYGEN_GENERATING_OUTPUT
template<> struct TypeTraits<UnsignedByte>: Implementation::TypeTraitsIntegral<UnsignedByte> { template<> struct TypeTraits<UnsignedByte>: Implementation::TypeTraitsIntegral<UnsignedByte> {
typedef Float FloatingPointType; typedef Float FloatingPointType;
}; };

2
src/Math/Vector.h

@ -42,11 +42,9 @@
namespace Magnum { namespace Math { namespace Magnum { namespace Math {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<std::size_t, class, class> struct VectorConverter; template<std::size_t, class, class> struct VectorConverter;
} }
#endif
/** /**
@brief %Vector @brief %Vector

2
src/MeshTools/Clean.h

@ -36,7 +36,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class Vertex, std::size_t vertexSize = Vertex::Size> class Clean { template<class Vertex, std::size_t vertexSize = Vertex::Size> class Clean {
@ -126,7 +125,6 @@ template<class Vertex, std::size_t vertexSize = Vertex::Size> class Clean {
}; };
} }
#endif
/** /**
@brief %Clean the mesh @brief %Clean the mesh

2
src/MeshTools/CombineIndexedArrays.h

@ -37,7 +37,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
class CombineIndexedArrays { class CombineIndexedArrays {
@ -96,7 +95,6 @@ class CombineIndexedArrays {
}; };
} }
#endif
/** /**
@brief Combine indexed arrays @brief Combine indexed arrays

2
src/MeshTools/CompressIndices.cpp

@ -31,7 +31,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace { namespace {
template<class> constexpr Mesh::IndexType indexType(); template<class> constexpr Mesh::IndexType indexType();
@ -65,7 +64,6 @@ std::tuple<std::size_t, Mesh::IndexType, char*> compressIndicesInternal(const st
} }
} }
#endif
std::tuple<std::size_t, Mesh::IndexType, char*> compressIndices(const std::vector<UnsignedInt>& indices) { std::tuple<std::size_t, Mesh::IndexType, char*> compressIndices(const std::vector<UnsignedInt>& indices) {
return compressIndicesInternal(indices, *std::max_element(indices.begin(), indices.end())); return compressIndicesInternal(indices, *std::max_element(indices.begin(), indices.end()));

2
src/MeshTools/Interleave.h

@ -38,7 +38,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
class Interleave { class Interleave {
@ -133,7 +132,6 @@ class Interleave {
}; };
} }
#endif
/** /**
@brief %Interleave vertex attributes @brief %Interleave vertex attributes

2
src/MeshTools/Subdivide.h

@ -33,7 +33,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class Vertex, class Interpolator> class Subdivide { template<class Vertex, class Interpolator> class Subdivide {
@ -91,7 +90,6 @@ template<class Vertex, class Interpolator> class Subdivide {
}; };
} }
#endif
/** /**
@brief %Subdivide the mesh @brief %Subdivide the mesh

2
src/MeshTools/Tipsify.cpp

@ -26,7 +26,6 @@
#include <stack> #include <stack>
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Magnum { namespace MeshTools { namespace Implementation { namespace Magnum { namespace MeshTools { namespace Implementation {
void Tipsify::operator()(std::size_t cacheSize) { void Tipsify::operator()(std::size_t cacheSize) {
@ -156,4 +155,3 @@ void Tipsify::buildAdjacency(std::vector<UnsignedInt>& liveTriangleCount, std::v
} }
}}} }}}
#endif

2
src/MeshTools/Tipsify.h

@ -35,7 +35,6 @@
namespace Magnum { namespace MeshTools { namespace Magnum { namespace MeshTools {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
class MAGNUM_MESHTOOLS_EXPORT Tipsify { class MAGNUM_MESHTOOLS_EXPORT Tipsify {
@ -59,7 +58,6 @@ class MAGNUM_MESHTOOLS_EXPORT Tipsify {
}; };
} }
#endif
/** /**
@brief %Tipsify the mesh @brief %Tipsify the mesh

2
src/Platform/NaClApplication.h

@ -520,7 +520,6 @@ class NaClApplication::MouseMoveEvent: public NaClApplication::InputEvent {
CORRADE_ENUMSET_OPERATORS(NaClApplication::Flags) CORRADE_ENUMSET_OPERATORS(NaClApplication::Flags)
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class Application> class NaClModule: public pp::Module { template<class Application> class NaClModule: public pp::Module {
public: public:
@ -537,7 +536,6 @@ namespace Implementation {
} }
}; };
} }
#endif
/** @hideinitializer /** @hideinitializer
@brief Entry point for NaCl application @brief Entry point for NaCl application

2
src/Resource.h

@ -103,11 +103,9 @@ inline Debug operator<<(Debug debug, const ResourceKey& value) {
return debug << static_cast<const Corrade::Utility::HashDigest<sizeof(std::size_t)>&>(value); return debug << static_cast<const Corrade::Utility::HashDigest<sizeof(std::size_t)>&>(value);
} }
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<class> class ResourceManagerData; template<class> class ResourceManagerData;
} }
#endif
/** /**
@brief %Resource reference @brief %Resource reference

2
src/ResourceManager.h

@ -89,7 +89,6 @@ enum class ResourcePolicy: UnsignedByte {
template<class> class AbstractResourceLoader; template<class> class AbstractResourceLoader;
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
struct ResourceKeyHash { struct ResourceKeyHash {
inline std::size_t operator()(ResourceKey key) const { inline std::size_t operator()(ResourceKey key) const {
@ -271,7 +270,6 @@ namespace Implementation {
std::size_t _lastChange; std::size_t _lastChange;
}; };
} }
#endif
/** /**
@brief %Resource manager @brief %Resource manager

2
src/SceneGraph/AbstractCamera.h

@ -47,11 +47,9 @@ enum class AspectRatioPolicy: UnsignedByte {
Clip /**< Clip on smaller side of view */ Clip /**< Clip on smaller side of view */
}; };
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<UnsignedInt dimensions, class T> typename DimensionTraits<dimensions, T>::MatrixType aspectRatioFix(AspectRatioPolicy aspectRatioPolicy, const Math::Vector2<T>& projectionScale, const Vector2i& viewport); template<UnsignedInt dimensions, class T> typename DimensionTraits<dimensions, T>::MatrixType aspectRatioFix(AspectRatioPolicy aspectRatioPolicy, const Math::Vector2<T>& projectionScale, const Vector2i& viewport);
} }
#endif
/** /**
@brief Base for cameras @brief Base for cameras

2
src/SceneGraph/AbstractCamera.hpp

@ -36,7 +36,6 @@ using namespace std;
namespace Magnum { namespace SceneGraph { namespace Magnum { namespace SceneGraph {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
template<UnsignedInt dimensions, class T> class Camera {}; template<UnsignedInt dimensions, class T> class Camera {};
@ -70,7 +69,6 @@ template<UnsignedInt dimensions, class T> typename DimensionTraits<dimensions, T
} }
} }
#endif
template<UnsignedInt dimensions, class T> AbstractCamera<dimensions, T>::AbstractCamera(AbstractObject<dimensions, T>* object): AbstractFeature<dimensions, T>(object), _aspectRatioPolicy(AspectRatioPolicy::NotPreserved) { template<UnsignedInt dimensions, class T> AbstractCamera<dimensions, T>::AbstractCamera(AbstractObject<dimensions, T>* object): AbstractFeature<dimensions, T>(object), _aspectRatioPolicy(AspectRatioPolicy::NotPreserved) {
AbstractFeature<dimensions, T>::setCachedTransformations(AbstractFeature<dimensions, T>::CachedTransformation::InvertedAbsolute); AbstractFeature<dimensions, T>::setCachedTransformations(AbstractFeature<dimensions, T>::CachedTransformation::InvertedAbsolute);

2
src/SceneGraph/AbstractFeature.h

@ -36,7 +36,6 @@
namespace Magnum { namespace SceneGraph { namespace Magnum { namespace SceneGraph {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
enum class FeatureCachedTransformation: UnsignedByte { enum class FeatureCachedTransformation: UnsignedByte {
Absolute = 1 << 0, Absolute = 1 << 0,
@ -47,7 +46,6 @@ namespace Implementation {
CORRADE_ENUMSET_OPERATORS(FeatureCachedTransformations) CORRADE_ENUMSET_OPERATORS(FeatureCachedTransformations)
} }
#endif
/** /**
@brief Base for object features @brief Base for object features

2
src/SceneGraph/Camera.cpp

@ -27,11 +27,9 @@
namespace Magnum { namespace SceneGraph { namespace Magnum { namespace SceneGraph {
#ifndef DOXYGEN_GENERATING_OUTPUT
template class AbstractCamera<2, Float>; template class AbstractCamera<2, Float>;
template class AbstractCamera<3, Float>; template class AbstractCamera<3, Float>;
template class Camera2D<Float>; template class Camera2D<Float>;
template class Camera3D<Float>; template class Camera3D<Float>;
#endif
}} }}

2
src/SceneGraph/Object.h

@ -37,7 +37,6 @@
namespace Magnum { namespace SceneGraph { namespace Magnum { namespace SceneGraph {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Implementation { namespace Implementation {
enum class ObjectFlag: UnsignedByte { enum class ObjectFlag: UnsignedByte {
Dirty = 1 << 0, Dirty = 1 << 0,
@ -49,7 +48,6 @@ namespace Implementation {
CORRADE_ENUMSET_OPERATORS(ObjectFlags) CORRADE_ENUMSET_OPERATORS(ObjectFlags)
} }
#endif
/** /**
@brief %Object @brief %Object

2
src/Swizzle.h

@ -33,7 +33,6 @@
namespace Magnum { namespace Magnum {
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Math { namespace Implementation { namespace Math { namespace Implementation {
template<std::size_t size> struct Component<size, 'r'>: public ComponentAtPosition<size, 0> {}; template<std::size_t size> struct Component<size, 'r'>: public ComponentAtPosition<size, 0> {};
template<std::size_t size> struct Component<size, 'g'>: public ComponentAtPosition<size, 1> {}; template<std::size_t size> struct Component<size, 'g'>: public ComponentAtPosition<size, 1> {};
@ -53,7 +52,6 @@ namespace Implementation {
template<class T> struct TypeForSize<4, Color3<T>> { typedef Color4<T> Type; }; template<class T> struct TypeForSize<4, Color3<T>> { typedef Color4<T> Type; };
template<class T> struct TypeForSize<4, Color4<T>> { typedef Color4<T> Type; }; template<class T> struct TypeForSize<4, Color4<T>> { typedef Color4<T> Type; };
} }
#endif
/** /**
@brief Swizzle Vector components @brief Swizzle Vector components

Loading…
Cancel
Save