diff --git a/Doxyfile b/Doxyfile index 54e5ba71f..00044b78c 100644 --- a/Doxyfile +++ b/Doxyfile @@ -734,9 +734,7 @@ EXCLUDE_SYMLINKS = NO # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = */Test/* \ - */Implementation/* \ - *Visibility.h +EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (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, # 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 # directories that contain example code fragments that are included (see diff --git a/src/AbstractFramebuffer.cpp b/src/AbstractFramebuffer.cpp index 7c353bcbd..b82ba3fb3 100644 --- a/src/AbstractFramebuffer.cpp +++ b/src/AbstractFramebuffer.cpp @@ -34,21 +34,18 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT AbstractFramebuffer::DrawBuffersImplementation AbstractFramebuffer::drawBuffersImplementation = &AbstractFramebuffer::drawBuffersImplementationDefault; AbstractFramebuffer::DrawBufferImplementation AbstractFramebuffer::drawBufferImplementation = &AbstractFramebuffer::drawBufferImplementationDefault; AbstractFramebuffer::ReadBufferImplementation AbstractFramebuffer::readBufferImplementation = &AbstractFramebuffer::readBufferImplementationDefault; AbstractFramebuffer::Target AbstractFramebuffer::readTarget = AbstractFramebuffer::Target::ReadDraw; AbstractFramebuffer::Target AbstractFramebuffer::drawTarget = AbstractFramebuffer::Target::ReadDraw; -#endif void AbstractFramebuffer::bind(Target target) { bindInternal(target); setViewportInternal(); } -#ifndef DOXYGEN_GENERATING_OUTPUT void AbstractFramebuffer::bindInternal(Target target) { Implementation::FramebufferState* state = Context::current()->state()->framebuffer; @@ -85,7 +82,6 @@ AbstractFramebuffer::Target AbstractFramebuffer::bindInternal() { glBindFramebuffer(GLenum(readTarget), _id); return readTarget; } -#endif void AbstractFramebuffer::blit(AbstractFramebuffer& source, AbstractFramebuffer& destination, const Rectanglei& sourceRectangle, const Rectanglei& destinationRectangle, AbstractFramebuffer::BlitMask mask, AbstractFramebuffer::BlitFilter filter) { source.bindInternal(AbstractFramebuffer::Target::Read); @@ -111,7 +107,6 @@ AbstractFramebuffer* AbstractFramebuffer::setViewport(const Rectanglei& rectangl return this; } -#ifndef DOXYGEN_GENERATING_OUTPUT void AbstractFramebuffer::setViewportInternal() { Implementation::FramebufferState* state = Context::current()->state()->framebuffer; @@ -125,7 +120,6 @@ void AbstractFramebuffer::setViewportInternal() { state->viewport = _viewport; glViewport(_viewport.left(), _viewport.bottom(), _viewport.width(), _viewport.height()); } -#endif void AbstractFramebuffer::clear(ClearMask mask) { bindInternal(drawTarget); @@ -152,7 +146,6 @@ void AbstractFramebuffer::read(const Vector2i& offset, const Vector2i& size, Abs } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attachments) { /** @todo Re-enable when extension wrangler is available for ES2 */ #ifndef MAGNUM_TARGET_GLES2 @@ -175,7 +168,6 @@ void AbstractFramebuffer::invalidateImplementation(GLsizei count, GLenum* attach static_cast(rectangle); #endif } -#endif void AbstractFramebuffer::initializeContextBasedFunctionality(Context* context) { #ifndef MAGNUM_TARGET_GLES diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 5dd8b6d11..db85c3af9 100644 --- a/src/AbstractFramebuffer.h +++ b/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); #endif - #ifndef DOXYGEN_GENERATING_OUTPUT + #ifdef DOXYGEN_GENERATING_OUTPUT + private: + #else protected: + #endif void MAGNUM_LOCAL bindInternal(Target target); Target MAGNUM_LOCAL bindInternal(); void MAGNUM_LOCAL setViewportInternal(); @@ -283,7 +286,6 @@ class MAGNUM_EXPORT AbstractFramebuffer { GLuint _id; Rectanglei _viewport; - #endif private: static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context); diff --git a/src/AbstractImage.h b/src/AbstractImage.h index 5ba4002c6..3f3e1ea1f 100644 --- a/src/AbstractImage.h +++ b/src/AbstractImage.h @@ -512,11 +512,13 @@ class MAGNUM_EXPORT AbstractImage { /** @brief Data type of pixel data */ inline Type type() const { return _type; } - #ifndef DOXYGEN_GENERATING_OUTPUT + #ifdef DOXYGEN_GENERATING_OUTPUT + private: + #else protected: + #endif Format _format; Type _type; - #endif }; inline AbstractImage::~AbstractImage() {} diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp index bd5c52273..309a77686 100644 --- a/src/AbstractShaderProgram.cpp +++ b/src/AbstractShaderProgram.cpp @@ -578,7 +578,6 @@ void AbstractShaderProgram::uniformImplementationDSA(const GLint location, const } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { std::size_t FloatAttribute::size(GLint components, DataType dataType) { @@ -837,6 +836,5 @@ Debug operator<<(Debug debug, Attribute>::DataType value) } } -#endif } diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 1dbf1d640..bae79bb8b 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -39,11 +39,9 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct Attribute; } -#endif /** @brief Base for shader program implementations @@ -1168,7 +1166,6 @@ template Debug operator<<(Debug debug, AbstractShaderProgram::Attribute template Debug operator<<(Debug debug, AbstractShaderProgram::Attribute::DataType); #endif -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { /* Base for sized attributes */ @@ -1423,7 +1420,6 @@ template struct Attribute>: Attribute struct Attribute>: Attribute> {}; } -#endif } diff --git a/src/AbstractTexture.cpp b/src/AbstractTexture.cpp index ab272feaf..319541858 100644 --- a/src/AbstractTexture.cpp +++ b/src/AbstractTexture.cpp @@ -75,8 +75,6 @@ AbstractTexture::SubImage3DImplementation AbstractTexture::subImage3DImplementat AbstractTexture::InvalidateImplementation AbstractTexture::invalidateImplementation = &AbstractTexture::invalidateImplementationNoOp; AbstractTexture::InvalidateSubImplementation AbstractTexture::invalidateSubImplementation = &AbstractTexture::invalidateSubImplementationNoOp; -#ifndef DOXYGEN_GENERATING_OUTPUT - /* Check correctness of binary OR in setMinificationFilter(). If nobody fucks anything up, this assert should produce the same results on all dimensions, 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), "Unsupported constants for GL texture filtering"); #undef filter_or -#endif Int AbstractTexture::maxSupportedLayerCount() { return Context::current()->state()->texture->maxSupportedLayerCount; @@ -198,7 +195,6 @@ void AbstractTexture::mipmapImplementationDSA() { } #endif -#ifndef DOXYGEN_GENERATING_OUTPUT void AbstractTexture::bindInternal() { Implementation::TextureState* const textureState = Context::current()->state()->texture; @@ -215,7 +211,6 @@ void AbstractTexture::bindInternal() { if(textureState->bindings[internalLayer] != _id) glBindTexture(_target, (textureState->bindings[internalLayer] = _id)); } -#endif void AbstractTexture::initializeContextBasedFunctionality(Context* context) { Implementation::TextureState* const textureState = context->state()->texture; diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index a67b00430..2ebdba862 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -1158,15 +1158,17 @@ class MAGNUM_EXPORT AbstractTexture { */ AbstractTexture* generateMipmap(); + #ifdef DOXYGEN_GENERATING_OUTPUT + private: + #else protected: - #ifndef DOXYGEN_GENERATING_OUTPUT + #endif template struct DataHelper {}; /* Unlike bind() this also sets the binding layer as active */ void MAGNUM_LOCAL bindInternal(); GLenum _target; - #endif private: static void MAGNUM_LOCAL initializeContextBasedFunctionality(Context* context); diff --git a/src/Color.h b/src/Color.h index f6b06325d..c2113f6f8 100644 --- a/src/Color.h +++ b/src/Color.h @@ -36,7 +36,6 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { /* Convert color from HSV */ @@ -133,7 +132,6 @@ template inline constexpr typename std::enable_if:: } } -#endif /** @brief Three-component (RGB) color diff --git a/src/Context.h b/src/Context.h index b5e63df5e..814ba770b 100644 --- a/src/Context.h +++ b/src/Context.h @@ -37,11 +37,9 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { struct State; } -#endif /** @brief OpenGL version diff --git a/src/DebugTools/Profiler.h b/src/DebugTools/Profiler.h index f3a4745b0..e91910993 100644 --- a/src/DebugTools/Profiler.h +++ b/src/DebugTools/Profiler.h @@ -114,9 +114,7 @@ class MAGNUM_DEBUGTOOLS_EXPORT Profiler { */ static const Section otherSection = 0; - #ifndef DOXYGEN_GENERATING_OUTPUT explicit Profiler(): enabled(false), measureDuration(60), currentFrame(0), frameCount(0), sections{"Other"}, currentSection(otherSection) {} - #endif /** * @brief Set measure duration diff --git a/src/DebugTools/ShapeRenderer.cpp b/src/DebugTools/ShapeRenderer.cpp index 060bfffcc..7bf36b95c 100644 --- a/src/DebugTools/ShapeRenderer.cpp +++ b/src/DebugTools/ShapeRenderer.cpp @@ -43,7 +43,6 @@ namespace Magnum { namespace DebugTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template<> void createDebugMesh(ShapeRenderer<2>* renderer, Physics::AbstractShape<2>* shape) { @@ -98,7 +97,6 @@ template<> void createDebugMesh(ShapeRenderer<3>* renderer, Physics::AbstractSha } } -#endif template ShapeRenderer::ShapeRenderer(Physics::ObjectShape* shape, ResourceKey options, SceneGraph::DrawableGroup* drawables): SceneGraph::Drawable(shape->object(), drawables), options(ResourceManager::instance()->get(options)) { CORRADE_ASSERT(shape->shape() != nullptr, "DebugTools::ShapeRenderer: cannot create renderer for empty shape", ); diff --git a/src/DebugTools/ShapeRenderer.h b/src/DebugTools/ShapeRenderer.h index 35c062915..d52d20af2 100644 --- a/src/DebugTools/ShapeRenderer.h +++ b/src/DebugTools/ShapeRenderer.h @@ -42,13 +42,11 @@ namespace Magnum { namespace DebugTools { template class ShapeRenderer; #endif -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class AbstractShapeRenderer; template void createDebugMesh(ShapeRenderer* renderer, Physics::AbstractShape* shape); } -#endif /** @brief Shape renderer options @@ -140,9 +138,7 @@ new DebugTools::ShapeRenderer2D(shape, "red", debugDrawables); @see ShapeRenderer2D, ShapeRenderer3D */ template class MAGNUM_DEBUGTOOLS_EXPORT ShapeRenderer: public SceneGraph::Drawable { - #ifndef DOXYGEN_GENERATING_OUTPUT friend void Implementation::createDebugMesh<>(ShapeRenderer*, Physics::AbstractShape*); - #endif public: /** diff --git a/src/Math/Algorithms/Svd.h b/src/Math/Algorithms/Svd.h index 8249e0bbb..406a6d38b 100644 --- a/src/Math/Algorithms/Svd.h +++ b/src/Math/Algorithms/Svd.h @@ -35,7 +35,6 @@ namespace Magnum { namespace Math { namespace Algorithms { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template T pythagoras(T a, T b) { @@ -56,7 +55,6 @@ template<> inline constexpr Double smallestDelta() { return 1.0e-64; } #endif } -#endif /** @brief Singular Value Decomposition diff --git a/src/Math/BoolVector.h b/src/Math/BoolVector.h index bb1433091..44d84416b 100644 --- a/src/Math/BoolVector.h +++ b/src/Math/BoolVector.h @@ -35,10 +35,10 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct Sequence {}; + #ifndef DOXYGEN_GENERATING_OUTPUT /* E.g. GenerateSequence<3>::Type is Sequence<0, 1, 2> */ template struct GenerateSequence: GenerateSequence {}; @@ -46,10 +46,10 @@ namespace Implementation { template struct GenerateSequence<0, sequence...> { typedef Sequence Type; }; + #endif template inline constexpr T repeat(T value, std::size_t) { return value; } } -#endif /** @brief %Vector storing boolean values diff --git a/src/Math/Complex.h b/src/Math/Complex.h index 2fd77e6ae..288279def 100644 --- a/src/Math/Complex.h +++ b/src/Math/Complex.h @@ -37,14 +37,12 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { /* No assertions fired, for internal use */ template inline static Complex complexFromMatrix(const Matrix<2, T>& matrix) { return {matrix[0][0], matrix[0][1]}; } } -#endif /** @brief %Complex number diff --git a/src/Math/Functions.h b/src/Math/Functions.h index cf49d82cd..0563d556c 100644 --- a/src/Math/Functions.h +++ b/src/Math/Functions.h @@ -38,7 +38,6 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct Pow { Pow() = delete; @@ -53,7 +52,6 @@ namespace Implementation { template inline constexpr static T pow(T) { return 1; } }; } -#endif /** * @brief Integral power diff --git a/src/Math/Matrix.h b/src/Math/Matrix.h index 1db788d34..4ebb07b6a 100644 --- a/src/Math/Matrix.h +++ b/src/Math/Matrix.h @@ -32,11 +32,9 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class MatrixDeterminant; } -#endif /** @brief Square matrix diff --git a/src/Math/Quaternion.h b/src/Math/Quaternion.h index 0cc1ac8ad..f7d6465b1 100644 --- a/src/Math/Quaternion.h +++ b/src/Math/Quaternion.h @@ -38,7 +38,6 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { /* No assertions fired, for internal use */ @@ -75,7 +74,6 @@ template inline Quaternion quaternionFromMatrix(const Matrix<3, T>& } } -#endif /** @brief %Quaternion diff --git a/src/Math/Swizzle.h b/src/Math/Swizzle.h index a36234206..064023a28 100644 --- a/src/Math/Swizzle.h +++ b/src/Math/Swizzle.h @@ -32,7 +32,6 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct ComponentAtPosition { static_assert(size > position, "Swizzle parameter out of range of base vector"); @@ -52,7 +51,6 @@ namespace Implementation { template inline constexpr static T value(const Math::Vector&) { return T(1); } }; } -#endif /** @brief Swizzle Vector components diff --git a/src/Math/TypeTraits.h b/src/Math/TypeTraits.h index e79c8dca4..136083681 100644 --- a/src/Math/TypeTraits.h +++ b/src/Math/TypeTraits.h @@ -52,7 +52,6 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct TypeTraitsDefault { TypeTraitsDefault() = delete; @@ -62,7 +61,6 @@ namespace Implementation { } }; } -#endif /** @brief Traits class for numeric types @@ -115,7 +113,6 @@ template struct TypeTraits: Implementation::TypeTraitsDefault { * http://www.cygnus-software.com/papers/comparingfloats/comparingfloats.htm */ -#ifndef DOXYGEN_GENERATING_OUTPUT /* Integral scalar types */ namespace Implementation { template struct TypeTraitsIntegral: TypeTraitsDefault { @@ -123,6 +120,7 @@ namespace Implementation { }; } +#ifndef DOXYGEN_GENERATING_OUTPUT template<> struct TypeTraits: Implementation::TypeTraitsIntegral { typedef Float FloatingPointType; }; diff --git a/src/Math/Vector.h b/src/Math/Vector.h index 2fb6adfa0..d20861288 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -42,11 +42,9 @@ namespace Magnum { namespace Math { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template struct VectorConverter; } -#endif /** @brief %Vector diff --git a/src/MeshTools/Clean.h b/src/MeshTools/Clean.h index 369fbc680..873c6fbc0 100644 --- a/src/MeshTools/Clean.h +++ b/src/MeshTools/Clean.h @@ -36,7 +36,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class Clean { @@ -126,7 +125,6 @@ template class Clean { }; } -#endif /** @brief %Clean the mesh diff --git a/src/MeshTools/CombineIndexedArrays.h b/src/MeshTools/CombineIndexedArrays.h index 1650b443d..4ab24854b 100644 --- a/src/MeshTools/CombineIndexedArrays.h +++ b/src/MeshTools/CombineIndexedArrays.h @@ -37,7 +37,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { class CombineIndexedArrays { @@ -96,7 +95,6 @@ class CombineIndexedArrays { }; } -#endif /** @brief Combine indexed arrays diff --git a/src/MeshTools/CompressIndices.cpp b/src/MeshTools/CompressIndices.cpp index 2506fb346..fbaea7cbc 100644 --- a/src/MeshTools/CompressIndices.cpp +++ b/src/MeshTools/CompressIndices.cpp @@ -31,7 +31,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace { template constexpr Mesh::IndexType indexType(); @@ -65,7 +64,6 @@ std::tuple compressIndicesInternal(const st } } -#endif std::tuple compressIndices(const std::vector& indices) { return compressIndicesInternal(indices, *std::max_element(indices.begin(), indices.end())); diff --git a/src/MeshTools/Interleave.h b/src/MeshTools/Interleave.h index 42c907cdc..7d6b27fc9 100644 --- a/src/MeshTools/Interleave.h +++ b/src/MeshTools/Interleave.h @@ -38,7 +38,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { class Interleave { @@ -133,7 +132,6 @@ class Interleave { }; } -#endif /** @brief %Interleave vertex attributes diff --git a/src/MeshTools/Subdivide.h b/src/MeshTools/Subdivide.h index 371aeca24..f1062d06c 100644 --- a/src/MeshTools/Subdivide.h +++ b/src/MeshTools/Subdivide.h @@ -33,7 +33,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class Subdivide { @@ -91,7 +90,6 @@ template class Subdivide { }; } -#endif /** @brief %Subdivide the mesh diff --git a/src/MeshTools/Tipsify.cpp b/src/MeshTools/Tipsify.cpp index fea4ddd21..8075b5d9c 100644 --- a/src/MeshTools/Tipsify.cpp +++ b/src/MeshTools/Tipsify.cpp @@ -26,7 +26,6 @@ #include -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Magnum { namespace MeshTools { namespace Implementation { void Tipsify::operator()(std::size_t cacheSize) { @@ -156,4 +155,3 @@ void Tipsify::buildAdjacency(std::vector& liveTriangleCount, std::v } }}} -#endif diff --git a/src/MeshTools/Tipsify.h b/src/MeshTools/Tipsify.h index 057b76b96..6fca93f18 100644 --- a/src/MeshTools/Tipsify.h +++ b/src/MeshTools/Tipsify.h @@ -35,7 +35,6 @@ namespace Magnum { namespace MeshTools { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { class MAGNUM_MESHTOOLS_EXPORT Tipsify { @@ -59,7 +58,6 @@ class MAGNUM_MESHTOOLS_EXPORT Tipsify { }; } -#endif /** @brief %Tipsify the mesh diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h index ac7e119f2..98057cb81 100644 --- a/src/Platform/NaClApplication.h +++ b/src/Platform/NaClApplication.h @@ -520,7 +520,6 @@ class NaClApplication::MouseMoveEvent: public NaClApplication::InputEvent { CORRADE_ENUMSET_OPERATORS(NaClApplication::Flags) -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class NaClModule: public pp::Module { public: @@ -537,7 +536,6 @@ namespace Implementation { } }; } -#endif /** @hideinitializer @brief Entry point for NaCl application diff --git a/src/Resource.h b/src/Resource.h index 6848bbb12..17b053f9a 100644 --- a/src/Resource.h +++ b/src/Resource.h @@ -103,11 +103,9 @@ inline Debug operator<<(Debug debug, const ResourceKey& value) { return debug << static_cast&>(value); } -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class ResourceManagerData; } -#endif /** @brief %Resource reference diff --git a/src/ResourceManager.h b/src/ResourceManager.h index 41d8a2105..4787ce947 100644 --- a/src/ResourceManager.h +++ b/src/ResourceManager.h @@ -89,7 +89,6 @@ enum class ResourcePolicy: UnsignedByte { template class AbstractResourceLoader; -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { struct ResourceKeyHash { inline std::size_t operator()(ResourceKey key) const { @@ -271,7 +270,6 @@ namespace Implementation { std::size_t _lastChange; }; } -#endif /** @brief %Resource manager diff --git a/src/SceneGraph/AbstractCamera.h b/src/SceneGraph/AbstractCamera.h index f1128651a..d7818c8ea 100644 --- a/src/SceneGraph/AbstractCamera.h +++ b/src/SceneGraph/AbstractCamera.h @@ -47,11 +47,9 @@ enum class AspectRatioPolicy: UnsignedByte { Clip /**< Clip on smaller side of view */ }; -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template typename DimensionTraits::MatrixType aspectRatioFix(AspectRatioPolicy aspectRatioPolicy, const Math::Vector2& projectionScale, const Vector2i& viewport); } -#endif /** @brief Base for cameras diff --git a/src/SceneGraph/AbstractCamera.hpp b/src/SceneGraph/AbstractCamera.hpp index f2ecd960b..ceacc265e 100644 --- a/src/SceneGraph/AbstractCamera.hpp +++ b/src/SceneGraph/AbstractCamera.hpp @@ -36,7 +36,6 @@ using namespace std; namespace Magnum { namespace SceneGraph { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { template class Camera {}; @@ -70,7 +69,6 @@ template typename DimensionTraits AbstractCamera::AbstractCamera(AbstractObject* object): AbstractFeature(object), _aspectRatioPolicy(AspectRatioPolicy::NotPreserved) { AbstractFeature::setCachedTransformations(AbstractFeature::CachedTransformation::InvertedAbsolute); diff --git a/src/SceneGraph/AbstractFeature.h b/src/SceneGraph/AbstractFeature.h index e77137611..3205f0f50 100644 --- a/src/SceneGraph/AbstractFeature.h +++ b/src/SceneGraph/AbstractFeature.h @@ -36,7 +36,6 @@ namespace Magnum { namespace SceneGraph { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { enum class FeatureCachedTransformation: UnsignedByte { Absolute = 1 << 0, @@ -47,7 +46,6 @@ namespace Implementation { CORRADE_ENUMSET_OPERATORS(FeatureCachedTransformations) } -#endif /** @brief Base for object features diff --git a/src/SceneGraph/Camera.cpp b/src/SceneGraph/Camera.cpp index 982d76a01..530397487 100644 --- a/src/SceneGraph/Camera.cpp +++ b/src/SceneGraph/Camera.cpp @@ -27,11 +27,9 @@ namespace Magnum { namespace SceneGraph { -#ifndef DOXYGEN_GENERATING_OUTPUT template class AbstractCamera<2, Float>; template class AbstractCamera<3, Float>; template class Camera2D; template class Camera3D; -#endif }} diff --git a/src/SceneGraph/Object.h b/src/SceneGraph/Object.h index f287af3b4..34218ed4d 100644 --- a/src/SceneGraph/Object.h +++ b/src/SceneGraph/Object.h @@ -37,7 +37,6 @@ namespace Magnum { namespace SceneGraph { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Implementation { enum class ObjectFlag: UnsignedByte { Dirty = 1 << 0, @@ -49,7 +48,6 @@ namespace Implementation { CORRADE_ENUMSET_OPERATORS(ObjectFlags) } -#endif /** @brief %Object diff --git a/src/Swizzle.h b/src/Swizzle.h index 972cf70cc..28e931a17 100644 --- a/src/Swizzle.h +++ b/src/Swizzle.h @@ -33,7 +33,6 @@ namespace Magnum { -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Math { namespace Implementation { template struct Component: public ComponentAtPosition {}; template struct Component: public ComponentAtPosition {}; @@ -53,7 +52,6 @@ namespace Implementation { template struct TypeForSize<4, Color3> { typedef Color4 Type; }; template struct TypeForSize<4, Color4> { typedef Color4 Type; }; } -#endif /** @brief Swizzle Vector components