Browse Source

Shaders,Text: fix some Engrish.

pull/589/head
Vladimír Vondruš 4 years ago
parent
commit
d605b06b91
  1. 2
      src/Magnum/Shaders/DistanceFieldVectorGL.h
  2. 2
      src/Magnum/Shaders/VectorGL.h
  3. 10
      src/Magnum/Text/AbstractFont.h
  4. 2
      src/Magnum/Text/DistanceFieldGlyphCache.h

2
src/Magnum/Shaders/DistanceFieldVectorGL.h

@ -554,7 +554,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT DistanceFieldVector
*/ */
/** /**
* @brief Bind vector texture * @brief Bind a vector texture
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* @see @ref DistanceFieldVectorGL::Flag::TextureTransformation, * @see @ref DistanceFieldVectorGL::Flag::TextureTransformation,

2
src/Magnum/Shaders/VectorGL.h

@ -509,7 +509,7 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT VectorGL: public GL
*/ */
/** /**
* @brief Bind vector texture * @brief Bind a vector texture
* @return Reference to self (for method chaining) * @return Reference to self (for method chaining)
* *
* @see @ref Flag::TextureTransformation, @ref setTextureMatrix()s * @see @ref Flag::TextureTransformation, @ref setTextureMatrix()s

10
src/Magnum/Text/AbstractFont.h

@ -312,7 +312,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
bool isOpened() const { return doIsOpened(); } bool isOpened() const { return doIsOpened(); }
/** /**
* @brief Open font from raw data * @brief Open raw data
* @param data File data * @param data File data
* @param size Font size * @param size Font size
* *
@ -339,7 +339,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
#endif #endif
/** /**
* @brief Open font from file * @brief Open a file
* @param filename Font file * @param filename Font file
* @param size Font size * @param size Font size
* *
@ -349,7 +349,7 @@ class MAGNUM_TEXT_EXPORT AbstractFont: public PluginManager::AbstractPlugin {
*/ */
bool openFile(const std::string& filename, Float size); bool openFile(const std::string& filename, Float size);
/** @brief Close font */ /** @brief Close currently opened file */
void close(); void close();
/** /**
@ -592,11 +592,11 @@ class MAGNUM_TEXT_EXPORT AbstractLayouter {
/** @brief Moving is not allowed */ /** @brief Moving is not allowed */
AbstractLayouter& operator=(const AbstractLayouter&&) = delete; AbstractLayouter& operator=(const AbstractLayouter&&) = delete;
/** @brief Count of glyphs in laid out text */ /** @brief Count of glyphs in the laid out text */
UnsignedInt glyphCount() const { return _glyphCount; } UnsignedInt glyphCount() const { return _glyphCount; }
/** /**
* @brief Render glyph * @brief Render a glyph
* @param i Glyph index * @param i Glyph index
* @param cursorPosition Cursor position * @param cursorPosition Cursor position
* @param rectangle Bounding rectangle * @param rectangle Bounding rectangle

2
src/Magnum/Text/DistanceFieldGlyphCache.h

@ -77,7 +77,7 @@ class MAGNUM_TEXT_EXPORT DistanceFieldGlyphCache: public GlyphCache {
explicit DistanceFieldGlyphCache(const Vector2i& originalSize, const Vector2i& size, UnsignedInt radius); explicit DistanceFieldGlyphCache(const Vector2i& originalSize, const Vector2i& size, UnsignedInt radius);
/** /**
* @brief Set distance field cache image * @brief Set a distance field cache image
* *
* Uploads already computed distance field image to given offset in * Uploads already computed distance field image to given offset in
* distance field texture. * distance field texture.

Loading…
Cancel
Save