Browse Source

Doxygen fixes and workarounds.

pull/216/merge
Vladimír Vondruš 9 years ago
parent
commit
b16755fc13
  1. 8
      src/Magnum/AbstractTexture.cpp
  2. 3
      src/Magnum/DebugTools/ObjectRenderer.cpp
  3. 4
      src/Magnum/Math/Packing.h
  4. 2
      src/Magnum/Math/Range.h

8
src/Magnum/AbstractTexture.cpp

@ -1498,7 +1498,8 @@ void AbstractTexture::subImage2DImplementationDefault(GLint level, const Vector2
glTexSubImage2D(_target, level, offset.x(), offset.y(), size.x(), size.y(), GLenum(format), GLenum(type), data);
}
#ifndef MAGNUM_TARGET_GLES
/* Doxygen gets confused by the template parameter */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(MAGNUM_TARGET_GLES)
template<void(AbstractTexture::*original)(GLint, const Vector2i&, const Vector2i&, PixelFormat, PixelType, const GLvoid*, const PixelStorage&)> void AbstractTexture::subImageImplementationSvga3DSliceBySlice(GLint level, const Vector2i& offset, const Vector2i& size, PixelFormat format, PixelType type, const GLvoid* const data, const PixelStorage& storage) {
/* Upload the data slice by slice only if this is an array texture and we
are copying from user memory (not from a buffer) */
@ -1603,8 +1604,9 @@ void AbstractTexture::subImage3DImplementationDefault(GLint level, const Vector3
#endif
}
#ifndef MAGNUM_TARGET_WEBGL
template<void(AbstractTexture::*original)(GLint, const Vector3i&, const Vector3i&, PixelFormat, PixelType, const GLvoid*, const PixelStorage&)> void AbstractTexture::subImageImplementationSvga3DSliceBySlice(GLint level, const Vector3i& offset, const Vector3i& size, PixelFormat format, PixelType type, const GLvoid* data, const PixelStorage& storage) {
/* Doxygen gets confused by the template parameter */
#if !defined(DOXYGEN_GENERATING_OUTPUT) && !defined(MAGNUM_TARGET_WEBGL)
template<void(AbstractTexture::*original)(GLint, const Vector3i&, const Vector3i&, PixelFormat, PixelType, const GLvoid*, const PixelStorage&)> void AbstractTexture::subImageImplementationSvga3DSliceBySlice(GLint level, const Vector3i& offset, const Vector3i& size, PixelFormat format, PixelType type, const GLvoid* const data, const PixelStorage& storage) {
/* Upload the data slice by slice only if this is an array texture and we
are copying from user memory (not from a buffer) */
if(

3
src/Magnum/DebugTools/ObjectRenderer.cpp

@ -60,7 +60,8 @@ template<> struct Renderer<3> {
}
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(SceneGraph::AbstractObject<dimensions, Float>& object, ResourceKey options, SceneGraph::DrawableGroup<dimensions, Float>* drawables): SceneGraph::Drawable<dimensions, Float>{object, drawables}, _options{ResourceManager::instance().get<ObjectRendererOptions>(options)} {
/* Doxygen gets confused when using {} to initialize parent object */
template<UnsignedInt dimensions> ObjectRenderer<dimensions>::ObjectRenderer(SceneGraph::AbstractObject<dimensions, Float>& object, ResourceKey options, SceneGraph::DrawableGroup<dimensions, Float>* drawables): SceneGraph::Drawable<dimensions, Float>(object, drawables), _options{ResourceManager::instance().get<ObjectRendererOptions>(options)} {
/* Shader */
_shader = ResourceManager::instance().get<AbstractShaderProgram, Shaders::VertexColor<dimensions>>(Renderer<dimensions>::shader());
if(!_shader) ResourceManager::instance().set<AbstractShaderProgram>(_shader.key(), new Shaders::VertexColor<dimensions>);

4
src/Magnum/Math/Packing.h

@ -25,6 +25,10 @@
DEALINGS IN THE SOFTWARE.
*/
/** @file
* @brief Functions @ref Magnum::Math::pack(), @ref Magnum::Math::unpack(), @ref Magnum::Math::packHalf(), @ref Magnum::Math::unpackHalf()
*/
#include "Magnum/Math/Functions.h"
namespace Magnum { namespace Math {

2
src/Magnum/Math/Range.h

@ -526,7 +526,7 @@ template<class T> class Range3D: public Range<3, T> {
MAGNUM_RANGE_SUBCLASS_IMPLEMENTATION(3, Range3D, Vector3)
};
/** @relates Range
/** @relatesalso Range
@brief Join two ranges
Returns a range that contains both input ranges. If one of the ranges is empty,

Loading…
Cancel
Save