Sfoglia il codice sorgente

RENAMED: LoadDefaultFont() -> LoadFontDefault()

Renamed internal function for consistency with similar functions.
pull/897/head
Ray 5 anni fa
parent
commit
f951f0c536
2 ha cambiato i file con 9 aggiunte e 9 eliminazioni
  1. +5
    -5
      src/core.c
  2. +4
    -4
      src/text.c

+ 5
- 5
src/core.c Vedi File

@ -445,8 +445,8 @@ static bool gifRecording = false; // GIF recording state
// Other Modules Functions Declaration (required by core)
//----------------------------------------------------------------------------------
#if defined(SUPPORT_DEFAULT_FONT)
extern void LoadDefaultFont(void); // [Module: text] Loads default font on InitWindow()
extern void UnloadDefaultFont(void); // [Module: text] Unloads default font from GPU memory
extern void LoadFontDefault(void); // [Module: text] Loads default font on InitWindow()
extern void UnloadFontDefault(void); // [Module: text] Unloads default font from GPU memory
#endif
//----------------------------------------------------------------------------------
@ -661,7 +661,7 @@ void InitWindow(int width, int height, const char *title)
#if defined(SUPPORT_DEFAULT_FONT)
// Load default font
// NOTE: External function (defined in module: text)
LoadDefaultFont();
LoadFontDefault();
#endif
#if defined(PLATFORM_RPI)
@ -719,7 +719,7 @@ void CloseWindow(void)
#endif
#if defined(SUPPORT_DEFAULT_FONT)
UnloadDefaultFont();
UnloadFontDefault();
#endif
rlglClose(); // De-init rlgl
@ -3880,7 +3880,7 @@ static void AndroidCommandCallback(struct android_app *app, int32_t cmd)
#if defined(SUPPORT_DEFAULT_FONT)
// Load default font
// NOTE: External function (defined in module: text)
LoadDefaultFont();
LoadFontDefault();
#endif
// TODO: GPU assets reload in case of lost focus (lost context)

+ 4
- 4
src/text.c Vedi File

@ -91,8 +91,8 @@ static Font LoadBMFont(const char *fileName); // Load a BMFont file (AngelCo
#endif
#if defined(SUPPORT_DEFAULT_FONT)
extern void LoadDefaultFont(void);
extern void UnloadDefaultFont(void);
extern void LoadFontDefault(void);
extern void UnloadFontDefault(void);
#endif
//----------------------------------------------------------------------------------
@ -101,7 +101,7 @@ extern void UnloadDefaultFont(void);
#if defined(SUPPORT_DEFAULT_FONT)
// Load raylib default font
extern void LoadDefaultFont(void)
extern void LoadFontDefault(void)
{
#define BIT_CHECK(a,b) ((a) & (1u << (b)))
@ -246,7 +246,7 @@ extern void LoadDefaultFont(void)
}
// Unload raylib default font
extern void UnloadDefaultFont(void)
extern void UnloadFontDefault(void)
{
UnloadTexture(defaultFont.texture);
RL_FREE(defaultFont.chars);

Caricamento…
Annulla
Salva