Browse Source

Text: synchronized function parameter naming with documentation.

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
195ec4e9b2
  1. 8
      src/Text/Font.cpp
  2. 2
      src/Text/Font.h

8
src/Text/Font.cpp

@ -133,7 +133,7 @@ void Font::prerender(const std::string& characters, const Vector2i& atlasSize) {
prerenderInternal(characters, atlasSize, 0, &_texture); prerenderInternal(characters, atlasSize, 0, &_texture);
} }
void Font::prerenderDistanceField(const std::string& characters, const Vector2i& atlasSize, const Vector2i& distanceFieldAtlasSize, Int radius) { void Font::prerenderDistanceField(const std::string& characters, const Vector2i& sourceAtlasSize, const Vector2i& atlasSize, Int radius) {
MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::ARB::texture_storage); MAGNUM_ASSERT_EXTENSION_SUPPORTED(Extensions::GL::ARB::texture_storage);
/* Render input texture */ /* Render input texture */
@ -141,11 +141,11 @@ void Font::prerenderDistanceField(const std::string& characters, const Vector2i&
input.setWrapping(Texture2D::Wrapping::ClampToEdge) input.setWrapping(Texture2D::Wrapping::ClampToEdge)
->setMinificationFilter(Texture2D::Filter::Linear) ->setMinificationFilter(Texture2D::Filter::Linear)
->setMagnificationFilter(Texture2D::Filter::Linear); ->setMagnificationFilter(Texture2D::Filter::Linear);
prerenderInternal(characters, atlasSize, radius, &input); prerenderInternal(characters, sourceAtlasSize, radius, &input);
/* Create distance field from input texture */ /* Create distance field from input texture */
_texture.setStorage(1, Texture2D::InternalFormat::R8, distanceFieldAtlasSize); _texture.setStorage(1, Texture2D::InternalFormat::R8, atlasSize);
TextureTools::distanceField(&input, &_texture, Rectanglei::fromSize({}, distanceFieldAtlasSize), radius); TextureTools::distanceField(&input, &_texture, Rectanglei::fromSize({}, atlasSize), radius);
} }
void Font::destroy() { void Font::destroy() {

2
src/Text/Font.h

@ -109,7 +109,7 @@ class MAGNUM_TEXT_EXPORT Font {
* @attention @p sourceAtlasSize must be large enough to contain all * @attention @p sourceAtlasSize must be large enough to contain all
* rendered glyphs with padding given by @p radius. * rendered glyphs with padding given by @p radius.
*/ */
void prerenderDistanceField(const std::string& characters, const Vector2i& atlasSize, const Vector2i& distanceFieldAtlasSize, Int radius); void prerenderDistanceField(const std::string& characters, const Vector2i& sourceAtlasSize, const Vector2i& atlasSize, Int radius);
~Font(); ~Font();

Loading…
Cancel
Save