UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED: LoadFontDataBDF() name and formating

Browse source
This commit is contained in:
Ray 2024-02-04 11:10:46 +01:00
parent 0932cd3059
commit eed56a45d6
1 changed files with 61 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

124
src/rtext.c
View file

@ -142,7 +142,7 @@ static Font defaultFont = { 0 };
static Font LoadBMFont(const char *fileName); // Load a BMFont file (AngelCode font file) static Font LoadBMFont(const char *fileName); // Load a BMFont file (AngelCode font file)
#endif #endif
#if defined(SUPPORT_FILEFORMAT_BDF) #if defined(SUPPORT_FILEFORMAT_BDF)
static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, int *codepoints, int codepointCount, int* outFontSize); static GlyphInfo *LoadFontDataBDF(const unsigned char *fileData, int dataSize, int *codepoints, int codepointCount, int *outFontSize);
#endif #endif
static int textLineSpacing = 15; // Text vertical line spacing in pixels static int textLineSpacing = 15; // Text vertical line spacing in pixels
@ -547,7 +547,7 @@ Font LoadFontFromMemory(const char *fileType, const unsigned char *fileData, int
#if defined(SUPPORT_FILEFORMAT_BDF) #if defined(SUPPORT_FILEFORMAT_BDF)
if (TextIsEqual(fileExtLower, ".bdf")) if (TextIsEqual(fileExtLower, ".bdf"))
{ {
font.glyphs = LoadBDFFontData(fileData, dataSize, codepoints, font.glyphCount, &font.baseSize); font.glyphs = LoadFontDataBDF(fileData, dataSize, codepoints, font.glyphCount, &font.baseSize);
} }
else else
#endif #endif
@ -1457,6 +1457,9 @@ int TextToInteger(const char *text)
return value*sign; return value*sign;
} }
// Get float value from text
// NOTE: This function replaces atof() [stdlib.h]
// WARNING: Only '.' character is understood as decimal point
float TextToFloat(const char *text) float TextToFloat(const char *text)
{ {
float value = 0.0f; float value = 0.0f;
@ -1464,18 +1467,23 @@ float TextToFloat(const char *text)
if ((text[0] == '+') || (text[0] == '-')) if ((text[0] == '+') || (text[0] == '-'))
{ {
if (text[0] == '-') sign = -1; if (text[0] == '-') sign = -1.0f;
text++; text++;
} }
int i = 0;
for (; ((text[i] >= '0') && (text[i] <= '9')); ++i) value = value*10.0f + (float)(text[i] - '0'); for (int i = 0; ((text[i] >= '0') && (text[i] <= '9')); i++) value = value*10.0f + (float)(text[i] - '0');
if (text[i++] != '.') return value*sign;
float divisor = 10.0f; if (text[i++] != '.') value *= sign;
for (; ((text[i] >= '0') && (text[i] <= '9')); ++i) else
{ {
value += ((float)(text[i] - '0'))/divisor; float divisor = 10.0f;
divisor = divisor*10.0f; for (int i = 0; ((text[i] >= '0') && (text[i] <= '9')); i++)
{
value += ((float)(text[i] - '0'))/divisor;
divisor = divisor*10.0f;
}
} }
return value; return value;
} }
@ -2275,41 +2283,41 @@ static char HexToInt(char hex) {
// Load font data for further use // Load font data for further use
// NOTE: Requires BDF font memory data // NOTE: Requires BDF font memory data
static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, int *codepoints, int codepointCount, int* outFontSize) static GlyphInfo *LoadFontDataBDF(const unsigned char *fileData, int dataSize, int *codepoints, int codepointCount, int *outFontSize)
{ {
#define MAX_BUFFER_SIZE 256 #define MAX_BUFFER_SIZE 256
char buffer[MAX_BUFFER_SIZE] = { 0 }; char buffer[MAX_BUFFER_SIZE] = { 0 };
GlyphInfo *glyphs = NULL; GlyphInfo *glyphs = NULL;
bool genFontChars = false; bool genFontChars = false;
int totalReadBytes = 0; // Data bytes read (total) int totalReadBytes = 0; // Data bytes read (total)
int readBytes = 0; // Data bytes read (line) int readBytes = 0; // Data bytes read (line)
int readVars = 0; // Variables filled by sscanf() int readVars = 0; // Variables filled by sscanf()
const char *fileText = (const char*)fileData; const char *fileText = (const char*)fileData;
const char *fileTextPtr = fileText; const char *fileTextPtr = fileText;
bool fontMalformed = false; // Is the font malformed bool fontMalformed = false; // Is the font malformed
bool fontStarted = false; // Has font started (STARTFONT) bool fontStarted = false; // Has font started (STARTFONT)
int fontBBw = 0; // Font base character bounding box width int fontBBw = 0; // Font base character bounding box width
int fontBBh = 0; // Font base character bounding box height int fontBBh = 0; // Font base character bounding box height
int fontBBxoff0 = 0; // Font base character bounding box X0 offset int fontBBxoff0 = 0; // Font base character bounding box X0 offset
int fontBByoff0 = 0; // Font base character bounding box Y0 offset int fontBByoff0 = 0; // Font base character bounding box Y0 offset
int fontAscent = 0; // Font ascent int fontAscent = 0; // Font ascent
bool charStarted = false; // Has character started (STARTCHAR) bool charStarted = false; // Has character started (STARTCHAR)
bool charBitmapStarted = false; // Has bitmap data started (BITMAP) bool charBitmapStarted = false; // Has bitmap data started (BITMAP)
int charBitmapNextRow = 0; // Y position for the next row of bitmap data int charBitmapNextRow = 0; // Y position for the next row of bitmap data
int charEncoding = -1; // The unicode value of the character (-1 if not set) int charEncoding = -1; // The unicode value of the character (-1 if not set)
int charBBw = 0; // Character bounding box width int charBBw = 0; // Character bounding box width
int charBBh = 0; // Character bounding box height int charBBh = 0; // Character bounding box height
int charBBxoff0 = 0; // Character bounding box X0 offset int charBBxoff0 = 0; // Character bounding box X0 offset
int charBByoff0 = 0; // Character bounding box Y0 offset int charBByoff0 = 0; // Character bounding box Y0 offset
int charDWidthX = 0; // Character advance X int charDWidthX = 0; // Character advance X
int charDWidthY = 0; // Character advance Y (unused) int charDWidthY = 0; // Character advance Y (unused)
GlyphInfo *charGlyphInfo = NULL; // Pointer to output glyph info (NULL if not set) GlyphInfo *charGlyphInfo = NULL; // Pointer to output glyph info (NULL if not set)
if (fileData == NULL) return glyphs; if (fileData == NULL) return glyphs;
@ -2333,12 +2341,12 @@ static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, i
totalReadBytes += (readBytes + 1); totalReadBytes += (readBytes + 1);
fileTextPtr += (readBytes + 1); fileTextPtr += (readBytes + 1);
// COMMENT // Line: COMMENT
if (strstr(buffer, "COMMENT") != NULL) continue; // Ignore line if (strstr(buffer, "COMMENT") != NULL) continue; // Ignore line
if (charStarted) if (charStarted)
{ {
// ENDCHAR // Line: ENDCHAR
if (strstr(buffer, "ENDCHAR") != NULL) if (strstr(buffer, "ENDCHAR") != NULL)
{ {
charStarted = false; charStarted = false;
@ -2347,59 +2355,56 @@ static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, i
if (charBitmapStarted) if (charBitmapStarted)
{ {
if (charGlyphInfo != NULL) { if (charGlyphInfo != NULL)
{
int pixelY = charBitmapNextRow++; int pixelY = charBitmapNextRow++;
if (pixelY >= charGlyphInfo->image.height)
{ if (pixelY >= charGlyphInfo->image.height) break;
break;
}
for (int x = 0; x < readBytes; x++) for (int x = 0; x < readBytes; x++)
{ {
char byte = HexToInt(buffer[x]); char byte = HexToInt(buffer[x]);
for (int bitX = 0; bitX < 4; bitX++) for (int bitX = 0; bitX < 4; bitX++)
{ {
int pixelX = ((x * 4) + bitX); int pixelX = ((x * 4) + bitX);
if (pixelX >= charGlyphInfo->image.width)
{
break;
}
if ((byte & (8 >> bitX)) > 0) if (pixelX >= charGlyphInfo->image.width) break;
{
((unsigned char*)charGlyphInfo->image.data)[(pixelY * charGlyphInfo->image.width) + pixelX] = 255; if ((byte & (8 >> bitX)) > 0) ((unsigned char*)charGlyphInfo->image.data)[(pixelY * charGlyphInfo->image.width) + pixelX] = 255;
}
} }
} }
} }
continue; continue;
} }
// ENCODING // Line: ENCODING
if (strstr(buffer, "ENCODING") != NULL) if (strstr(buffer, "ENCODING") != NULL)
{ {
readVars = sscanf(buffer, "ENCODING %i", &charEncoding); readVars = sscanf(buffer, "ENCODING %i", &charEncoding);
continue; continue;
} }
// BBX // Line: BBX
if (strstr(buffer, "BBX") != NULL) if (strstr(buffer, "BBX") != NULL)
{ {
readVars = sscanf(buffer, "BBX %i %i %i %i", &charBBw, &charBBh, &charBBxoff0, &charBByoff0); readVars = sscanf(buffer, "BBX %i %i %i %i", &charBBw, &charBBh, &charBBxoff0, &charBByoff0);
continue; continue;
} }
// DWIDTH // Line: DWIDTH
if (strstr(buffer, "DWIDTH") != NULL) if (strstr(buffer, "DWIDTH") != NULL)
{ {
readVars = sscanf(buffer, "DWIDTH %i %i", &charDWidthX, &charDWidthY); readVars = sscanf(buffer, "DWIDTH %i %i", &charDWidthX, &charDWidthY);
continue; continue;
} }
// BITMAP // Line: BITMAP
if (strstr(buffer, "BITMAP") != NULL) if (strstr(buffer, "BITMAP") != NULL)
{ {
// Search for glyph index in codepoints // Search for glyph index in codepoints
charGlyphInfo = NULL; charGlyphInfo = NULL;
for (int codepointIndex = 0; codepointIndex < codepointCount; codepointIndex++) for (int codepointIndex = 0; codepointIndex < codepointCount; codepointIndex++)
{ {
if (codepoints[codepointIndex] == charEncoding) if (codepoints[codepointIndex] == charEncoding)
@ -2432,30 +2437,24 @@ static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, i
} }
else if (fontStarted) else if (fontStarted)
{ {
// ENDFONT // Line: ENDFONT
if (strstr(buffer, "ENDFONT") != NULL) if (strstr(buffer, "ENDFONT") != NULL)
{ {
fontStarted = false; fontStarted = false;
break; break;
} }
// SIZE // Line: SIZE
if (strstr(buffer, "SIZE") != NULL) if (strstr(buffer, "SIZE") != NULL)
{ {
if (outFontSize != NULL) if (outFontSize != NULL) readVars = sscanf(buffer, "SIZE %i", outFontSize);
{
readVars = sscanf(buffer, "SIZE %i", outFontSize);
}
continue; continue;
} }
// PIXEL_SIZE // PIXEL_SIZE
if (strstr(buffer, "PIXEL_SIZE") != NULL) if (strstr(buffer, "PIXEL_SIZE") != NULL)
{ {
if (outFontSize != NULL) if (outFontSize != NULL) readVars = sscanf(buffer, "PIXEL_SIZE %i", outFontSize);
{
readVars = sscanf(buffer, "PIXEL_SIZE %i", outFontSize);
}
continue; continue;
} }
@ -2520,7 +2519,6 @@ static GlyphInfo *LoadBDFFontData(const unsigned char *fileData, int dataSize, i
return glyphs; return glyphs;
} }
#endif #endif
#endif // SUPPORT_MODULE_RTEXT #endif // SUPPORT_MODULE_RTEXT