Browse Source

TextureTools: don't include Vector2 in DistanceFieldGL.h.

This makes the header pretty much weightless so it doesn't hurt if it's
included directly in Text::DistanceFieldGlyphCache etc.
pull/650/head
Vladimír Vondruš 2 years ago
parent
commit
a056d7de92
  1. 12
      src/Magnum/TextureTools/DistanceFieldGL.cpp
  2. 19
      src/Magnum/TextureTools/DistanceFieldGL.h

12
src/Magnum/TextureTools/DistanceFieldGL.cpp

@ -218,6 +218,12 @@ void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output,
output.setViewport(previousViewport);
}
#ifndef MAGNUM_TARGET_GLES
void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle) {
return operator()(input, output, rectangle, {});
}
#endif
void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle, const Vector2i&
#ifdef MAGNUM_TARGET_GLES
imageSize
@ -233,4 +239,10 @@ void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Texture2D& output, co
);
}
#ifndef MAGNUM_TARGET_GLES
void DistanceFieldGL::operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle) {
return operator()(input, output, rectangle, {});
}
#endif
}}

19
src/Magnum/TextureTools/DistanceFieldGL.h

@ -36,9 +36,6 @@
#include "Magnum/Magnum.h"
#include "Magnum/GL/GL.h"
#ifndef MAGNUM_TARGET_GLES
#include "Magnum/Math/Vector2.h"
#endif
#include "Magnum/TextureTools/visibility.h"
namespace Magnum { namespace TextureTools {
@ -158,11 +155,19 @@ class MAGNUM_TEXTURETOOLS_EXPORT DistanceFieldGL {
* as that's what the generator shader relies on for correct pixel
* addressing.
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
void operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle, const Vector2i& imageSize
#ifndef MAGNUM_TARGET_GLES
= {}
#endif
);
#else
/* To avoid having to include Vector2 */
void operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle, const Vector2i& imageSize);
#ifndef MAGNUM_TARGET_GLES
void operator()(GL::Texture2D& input, GL::Framebuffer& output, const Range2Di& rectangle);
#endif
#endif
/**
* @brief Calculate the distance field to a texture
@ -176,11 +181,19 @@ class MAGNUM_TEXTURETOOLS_EXPORT DistanceFieldGL {
* Creates a framebuffer with @p output attached and calls
* @ref operator()(GL::Texture2D&, GL::Framebuffer&, const Range2Di&, const Vector2i&).
*/
#ifdef DOXYGEN_GENERATING_OUTPUT
void operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle, const Vector2i& imageSize
#ifndef MAGNUM_TARGET_GLES
= {}
#endif
);
#else
/* To avoid having to include Vector2 */
void operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle, const Vector2i& imageSize);
#ifndef MAGNUM_TARGET_GLES
void operator()(GL::Texture2D& input, GL::Texture2D& output, const Range2Di& rectangle);
#endif
#endif
private:
struct State;

Loading…
Cancel
Save