From b042fe12e6c413e3cdcd706949dd285571647848 Mon Sep 17 00:00:00 2001 From: Ray Date: Mon, 6 Aug 2018 20:49:47 +0200 Subject: Reviewed spacings on latest PR --- src/text.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/text.c') diff --git a/src/text.c b/src/text.c index af3952b1..9ed283b2 100644 --- a/src/text.c +++ b/src/text.c @@ -220,12 +220,12 @@ extern void LoadDefaultFont(void) { defaultFont.chars[i].value = 32 + i; // First char is 32 - defaultFont.chars[i].rec.x = (float) currentPosX; - defaultFont.chars[i].rec.y = (float) charsDivisor + currentLine*(charsHeight + charsDivisor); - defaultFont.chars[i].rec.width = (float) charsWidth[i]; - defaultFont.chars[i].rec.height = (float) charsHeight; + defaultFont.chars[i].rec.x = (float)currentPosX; + defaultFont.chars[i].rec.y = (float)charsDivisor + currentLine*(charsHeight + charsDivisor); + defaultFont.chars[i].rec.width = (float)charsWidth[i]; + defaultFont.chars[i].rec.height = (float)charsHeight; - testPosX += (int) (defaultFont.chars[i].rec.width + (float) charsDivisor); + testPosX += (int)(defaultFont.chars[i].rec.width + (float)charsDivisor); if (testPosX >= defaultFont.texture.width) { @@ -361,7 +361,7 @@ CharInfo *LoadFontData(const char *fileName, int fontSize, int *fontChars, int c if (!stbtt_InitFont(&fontInfo, fontBuffer, 0)) TraceLog(LOG_WARNING, "Failed to init font!"); // Calculate font scale factor - float scaleFactor = stbtt_ScaleForPixelHeight(&fontInfo, (float) fontSize); + float scaleFactor = stbtt_ScaleForPixelHeight(&fontInfo, (float)fontSize); // Calculate font basic metrics // NOTE: ascent is equivalent to font baseline @@ -460,8 +460,8 @@ Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int paddi } } - chars[i].rec.x = (float) offsetX; - chars[i].rec.y = (float) offsetY; + chars[i].rec.x = (float)offsetX; + chars[i].rec.y = (float)offsetY; // Move atlas position X for next character drawing offsetX += ((int)chars[i].rec.width + 2*padding); @@ -502,8 +502,8 @@ Image GenImageFontAtlas(CharInfo *chars, int charsCount, int fontSize, int paddi for (int i = 0; i < charsCount; i++) { - chars[i].rec.x = rects[i].x + (float) padding; - chars[i].rec.y = rects[i].y + (float) padding; + chars[i].rec.x = rects[i].x + (float)padding; + chars[i].rec.y = rects[i].y + (float)padding; if (rects[i].was_packed) { @@ -834,15 +834,15 @@ static Font LoadImageFont(Image image, Color key, int firstChar) { tempCharValues[index] = firstChar + index; - tempCharRecs[index].x = (float) xPosToRead; - tempCharRecs[index].y = (float) (lineSpacing + lineToRead*(charHeight + lineSpacing)); - tempCharRecs[index].height = (float) charHeight; + tempCharRecs[index].x = (float)xPosToRead; + tempCharRecs[index].y = (float)(lineSpacing + lineToRead*(charHeight + lineSpacing)); + tempCharRecs[index].height = (float)charHeight; int charWidth = 0; while (!COLOR_EQUAL(pixels[(lineSpacing + (charHeight+lineSpacing)*lineToRead)*image.width + xPosToRead + charWidth], key)) charWidth++; - tempCharRecs[index].width = (float) charWidth; + tempCharRecs[index].width = (float)charWidth; index++; @@ -996,7 +996,7 @@ static Font LoadBMFont(const char *fileName) // Save data properly in sprite font font.chars[i].value = charId; - font.chars[i].rec = (Rectangle){ (float) charX, (float) charY, (float) charWidth, (float) charHeight }; + font.chars[i].rec = (Rectangle){ (float)charX, (float)charY, (float)charWidth, (float)charHeight }; font.chars[i].offsetX = charOffsetX; font.chars[i].offsetY = charOffsetY; font.chars[i].advanceX = charAdvanceX; -- cgit v1.2.3