admin/CSFML
1
0 Fork 0
mirror of https://github.com/SFML/CSFML.git synced 2026-10-27 21:36:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from zsbzsb/update/font_metrics

Browse Source 
Changed the font metrics to return floats instead of ints
This commit is contained in:
Laurent Gomila committed 2014-10-09 17:30:19 +02:00
2 parents 59a7060088 1f8b022d17
commit d105eded16
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/SFML/Graphics/Font.h
+2 -2
View File
@@ -108,7 +108,7 @@ CSFML_GRAPHICS_API sfGlyph sfFont_getGlyph(sfFont* font, sfUint32 codePoint, uns
/// \return Kerning offset, in pixels /// \return Kerning offset, in pixels
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
CSFML_GRAPHICS_API int sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize); CSFML_GRAPHICS_API float sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the line spacing value /// \brief Get the line spacing value
@@ -119,7 +119,7 @@ CSFML_GRAPHICS_API int sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32
/// \return Line spacing, in pixels /// \return Line spacing, in pixels
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
CSFML_GRAPHICS_API int sfFont_getLineSpacing(sfFont* font, unsigned int characterSize); CSFML_GRAPHICS_API float sfFont_getLineSpacing(sfFont* font, unsigned int characterSize);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// \brief Get the texture containing the glyphs of a given size in a font /// \brief Get the texture containing the glyphs of a given size in a font
include/SFML/Graphics/Glyph.h
+3 -3
View File
@@ -37,9 +37,9 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
typedef struct typedef struct
{ {
int advance; ///< Offset to move horizontically to the next character float advance; ///< Offset to move horizontically to the next character
sfIntRect bounds; ///< Bounding rectangle of the glyph, in coordinates relative to the baseline sfFloatRect bounds; ///< Bounding rectangle of the glyph, in coordinates relative to the baseline
sfIntRect textureRect; ///< Texture coordinates of the glyph inside the font's image sfIntRect textureRect; ///< Texture coordinates of the glyph inside the font's image
} sfGlyph; } sfGlyph;
src/SFML/Graphics/Font.cpp
+2 -2
View File
@@ -129,7 +129,7 @@ sfGlyph sfFont_getGlyph(sfFont* font, sfUint32 codePoint, unsigned int character
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the kerning value corresponding to a given pair of characters in a font /// Get the kerning value corresponding to a given pair of characters in a font
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
int sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize) float sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned int characterSize)
{ {
CSFML_CALL_RETURN(font, getKerning(first, second, characterSize), 0); CSFML_CALL_RETURN(font, getKerning(first, second, characterSize), 0);
} }
@@ -138,7 +138,7 @@ int sfFont_getKerning(sfFont* font, sfUint32 first, sfUint32 second, unsigned in
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the line spacing value /// Get the line spacing value
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
int sfFont_getLineSpacing(sfFont* font, unsigned int characterSize) float sfFont_getLineSpacing(sfFont* font, unsigned int characterSize)
{ {
CSFML_CALL_RETURN(font, getLineSpacing(characterSize), 0); CSFML_CALL_RETURN(font, getLineSpacing(characterSize), 0);
} }