Browse Source

Text: prefix private variables with an underscore.

pull/297/head
Vladimír Vondruš 8 years ago
parent
commit
cb3a5cb515
  1. 4
      src/Magnum/Text/DistanceFieldGlyphCache.cpp
  2. 4
      src/Magnum/Text/DistanceFieldGlyphCache.h

4
src/Magnum/Text/DistanceFieldGlyphCache.cpp

@ -46,7 +46,7 @@ DistanceFieldGlyphCache::DistanceFieldGlyphCache(const Vector2i& originalSize, c
#else #else
GlyphCache(GL::TextureFormat::RGB, originalSize, size, Vector2i(radius)), GlyphCache(GL::TextureFormat::RGB, originalSize, size, Vector2i(radius)),
#endif #endif
scale(Vector2(size)/Vector2(originalSize)), radius(radius) _scale{Vector2(size)/Vector2(originalSize)}, _radius{radius}
{ {
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::texture_rg); MAGNUM_ASSERT_GL_EXTENSION_SUPPORTED(GL::Extensions::ARB::texture_rg);
@ -89,7 +89,7 @@ void DistanceFieldGlyphCache::setImage(const Vector2i& offset, const ImageView2D
#endif #endif
/* Create distance field from input texture */ /* Create distance field from input texture */
TextureTools::distanceField(input, texture(), Range2Di::fromSize(offset*scale, image.size()*scale), radius, image.size()); TextureTools::distanceField(input, texture(), Range2Di::fromSize(offset*_scale, image.size()*_scale), _radius, image.size());
} }
void DistanceFieldGlyphCache::setDistanceFieldImage(const Vector2i& offset, const ImageView2D& image) { void DistanceFieldGlyphCache::setDistanceFieldImage(const Vector2i& offset, const ImageView2D& image) {

4
src/Magnum/Text/DistanceFieldGlyphCache.h

@ -85,8 +85,8 @@ class MAGNUM_TEXT_EXPORT DistanceFieldGlyphCache: public GlyphCache {
void setDistanceFieldImage(const Vector2i& offset, const ImageView2D& image); void setDistanceFieldImage(const Vector2i& offset, const ImageView2D& image);
private: private:
const Vector2 scale; const Vector2 _scale;
const UnsignedInt radius; const UnsignedInt _radius;
}; };
}} }}

Loading…
Cancel
Save