From 195ec4e9b203f723bbacab46821afbd8bb8b52bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 4 Mar 2013 10:35:49 +0100 Subject: [PATCH] Text: synchronized function parameter naming with documentation. --- src/Text/Font.cpp | 8 ++++---- src/Text/Font.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Text/Font.cpp b/src/Text/Font.cpp index 9f3cd9c61..f99416904 100644 --- a/src/Text/Font.cpp +++ b/src/Text/Font.cpp @@ -133,7 +133,7 @@ void Font::prerender(const std::string& characters, const Vector2i& atlasSize) { 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); /* Render input texture */ @@ -141,11 +141,11 @@ void Font::prerenderDistanceField(const std::string& characters, const Vector2i& input.setWrapping(Texture2D::Wrapping::ClampToEdge) ->setMinificationFilter(Texture2D::Filter::Linear) ->setMagnificationFilter(Texture2D::Filter::Linear); - prerenderInternal(characters, atlasSize, radius, &input); + prerenderInternal(characters, sourceAtlasSize, radius, &input); /* Create distance field from input texture */ - _texture.setStorage(1, Texture2D::InternalFormat::R8, distanceFieldAtlasSize); - TextureTools::distanceField(&input, &_texture, Rectanglei::fromSize({}, distanceFieldAtlasSize), radius); + _texture.setStorage(1, Texture2D::InternalFormat::R8, atlasSize); + TextureTools::distanceField(&input, &_texture, Rectanglei::fromSize({}, atlasSize), radius); } void Font::destroy() { diff --git a/src/Text/Font.h b/src/Text/Font.h index 6745ddf90..82592e9b0 100644 --- a/src/Text/Font.h +++ b/src/Text/Font.h @@ -109,7 +109,7 @@ class MAGNUM_TEXT_EXPORT Font { * @attention @p sourceAtlasSize must be large enough to contain all * 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();