Make RadioFont and SmallFont extern to other compilation units

This commit is contained in:
Xavier Del Campo Romero 2020-12-31 03:28:36 +01:00
parent 5d64366056
commit 3aadb2ca61
2 changed files with 336 additions and 332 deletions

View File

@ -1,293 +1,298 @@
/* *************************************
* Includes
* *************************************/
#include "Font.h"
#include "System.h"
#include "Gfx.h"
#include <stdarg.h>
/* *************************************
* Defines
* *************************************/
#define FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE 200
#define FONT_DEFAULT_CHAR_SIZE 16
#define FONT_DEFAULT_INIT_CHAR '!'
/* *************************************
* Structs and enums
* *************************************/
enum
{
// We will use the most significant bit
// for internal purposes.
SQUARE_BTN_8BIT = 128,
CROSS_BTN_8BIT,
CIRCLE_BTN_8BIT,
TRIANGLE_BTN_8BIT
};
/* *************************************
* Local Prototypes
* *************************************/
/* *************************************
* Local Variables
* *************************************/
static char _internal_text[FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE];
static volatile unsigned char _blend_effect_lum;
bool FontLoadImage(const char* strPath, TYPE_FONT * ptrFont)
{
if (GfxSpriteFromFile(strPath, &ptrFont->spr) == false)
{
return false;
}
ptrFont->spr_w = ptrFont->spr.w;
ptrFont->spr_h = ptrFont->spr.h;
ptrFont->spr_u = ptrFont->spr.u;
ptrFont->spr_v = ptrFont->spr.v;
//Now set default values to font
ptrFont->char_w = FONT_DEFAULT_CHAR_SIZE;
ptrFont->char_h = FONT_DEFAULT_CHAR_SIZE;
ptrFont->spr.attribute |= COLORMODE(COLORMODE_4BPP);
ptrFont->spr.attribute &= COLORMODE(~(COLORMODE_8BPP | COLORMODE_16BPP | COLORMODE_24BPP));
ptrFont->spr.r = NORMAL_LUMINANCE;
ptrFont->spr.g = NORMAL_LUMINANCE;
ptrFont->spr.b = NORMAL_LUMINANCE;
//At this point, spr.w and spr.h = real w/h
ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
ptrFont->max_ch_wrap = 0;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
ptrFont->flags = FONT_NOFLAGS;
ptrFont->init_ch = FONT_DEFAULT_INIT_CHAR;
Serial_printf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);
return true;
}
void FontSetInitChar(TYPE_FONT * ptrFont, char c)
{
ptrFont->init_ch = c;
}
void FontSetFlags(TYPE_FONT * ptrFont, FONT_FLAGS flags)
{
ptrFont->flags = flags;
}
void FontSetSize(TYPE_FONT * ptrFont, short size)
{
ptrFont->char_w = size;
ptrFont->char_h = size;
//At this point, spr.w and spr.h = real w/h
ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
ptrFont->max_ch_wrap = 0;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
}
void FontSetMaxCharPerLine(TYPE_FONT* ptrFont, uint8_t max)
{
ptrFont->max_ch_wrap = max;
}
void FontSetSpacing(TYPE_FONT* ptrFont, short spacing)
{
ptrFont->char_spacing = spacing;
}
void FontCyclic(void)
{
_blend_effect_lum -= 8;
}
void FontPrintText(TYPE_FONT * ptrFont, short x, short y, const char* str, ...)
{
uint16_t i;
uint8_t line_count = 0;
int result;
short orig_x = x;
va_list ap;
// Do not print anything if either 1Hz or 2Hz flags are configured
// and 1/2Hz signal has not been yet emitted by Gfx.
if (ptrFont->flags & FONT_1HZ_FLASH)
{
if (Gfx1HzFlash() == false)
{
return;
}
}
else if (ptrFont->flags & FONT_2HZ_FLASH)
{
if (Gfx2HzFlash() == false)
{
return;
}
}
va_start(ap, str);
result = vsnprintf( _internal_text,
FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE,
str,
ap );
for (i = 0; i < result ; i++)
{
unsigned char _ch = _internal_text[i];
if (_ch == '\0')
{
// End of string
break;
}
switch(_ch)
{
case ' ':
{
bool linefeed_needed = false;
// Check if the next word fits on the same line
if ( (ptrFont->flags & FONT_WRAP_LINE) && (ptrFont->max_ch_wrap != 0) )
{
uint16_t j;
uint8_t aux_line_count = line_count;
for (j = i + 1; j < result; j++)
{
if (_internal_text[j] != ' ')
{
if (++aux_line_count >= ptrFont->max_ch_wrap)
{
line_count = 0;
x = orig_x;
y += ptrFont->char_h;
linefeed_needed = true;
break;
}
}
else
{
break;
}
}
}
if (linefeed_needed == false)
{
x += ptrFont->char_w;
}
continue;
}
case '\n':
x = orig_x;
y += ptrFont->char_h;
break;
case SQUARE_BTN_8BIT:
GfxDrawButton(x, y, PAD_SQUARE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case CIRCLE_BTN_8BIT:
GfxDrawButton(x, y, PAD_CIRCLE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case TRIANGLE_BTN_8BIT:
GfxDrawButton(x, y, PAD_TRIANGLE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case CROSS_BTN_8BIT:
GfxDrawButton(x, y, PAD_CROSS);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
default:
if ( (ptrFont->flags & FONT_WRAP_LINE) && (ptrFont->max_ch_wrap != 0) )
{
if (++line_count >= ptrFont->max_ch_wrap)
{
line_count = 0;
x = orig_x;
y += ptrFont->char_h;
}
}
ptrFont->spr.x = x;
ptrFont->spr.y = y;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
ptrFont->spr.u = (short)( (_ch - ptrFont->init_ch) % ptrFont->char_per_row) * ptrFont->char_w;
ptrFont->spr.u += ptrFont->spr_u; // Add original offset for image
ptrFont->spr.v = (short)( (_ch - ptrFont->init_ch) / ptrFont->char_per_row) * ptrFont->char_h;
ptrFont->spr.v += ptrFont->spr_v; // Add original offset for image
if (ptrFont->flags & FONT_BLEND_EFFECT)
{
ptrFont->spr.r += 8;
ptrFont->spr.g += 8;
ptrFont->spr.b += 8;
}
else
{
ptrFont->spr.r = NORMAL_LUMINANCE;
ptrFont->spr.g = NORMAL_LUMINANCE;
ptrFont->spr.b = NORMAL_LUMINANCE;
}
/*Serial_printf("char_w = %d, char_h = %d, char_per_row = %d, init_ch: %c\n",
ptrFont->char_w,
ptrFont->char_h,
ptrFont->char_per_row,
ptrFont->init_ch);
Serial_printf("Char: %c, spr.u = %d, spr.v = %d\n",str[i],ptrFont->spr.u, ptrFont->spr.v);
Serial_printf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);*/
//Serial_printf("Sprite rgb={%d,%d,%d}\n",ptrFont->spr.r, ptrFont->spr.g, ptrFont->spr.b);
GfxSortSprite(&ptrFont->spr);
x += ptrFont->char_spacing;
break;
}
}
if (ptrFont->flags & FONT_BLEND_EFFECT)
{
ptrFont->spr.r = _blend_effect_lum;
ptrFont->spr.g = _blend_effect_lum;
ptrFont->spr.b = _blend_effect_lum;
}
va_end(ap);
}
/* *************************************
* Includes
* *************************************/
#include "Font.h"
#include "System.h"
#include "Gfx.h"
#include <stdarg.h>
/* *************************************
* Defines
* *************************************/
#define FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE 200
#define FONT_DEFAULT_CHAR_SIZE 16
#define FONT_DEFAULT_INIT_CHAR '!'
/* *************************************
* Structs and enums
* *************************************/
enum
{
// We will use the most significant bit
// for internal purposes.
SQUARE_BTN_8BIT = 128,
CROSS_BTN_8BIT,
CIRCLE_BTN_8BIT,
TRIANGLE_BTN_8BIT
};
/* *************************************
* Local Prototypes
* *************************************/
/* *************************************
* Local Variables
* *************************************/
TYPE_FONT RadioFont, SmallFont;
/* *************************************
* Local Variables
* *************************************/
static char _internal_text[FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE];
static volatile unsigned char _blend_effect_lum;
bool FontLoadImage(const char* strPath, TYPE_FONT * ptrFont)
{
if (GfxSpriteFromFile(strPath, &ptrFont->spr) == false)
{
return false;
}
ptrFont->spr_w = ptrFont->spr.w;
ptrFont->spr_h = ptrFont->spr.h;
ptrFont->spr_u = ptrFont->spr.u;
ptrFont->spr_v = ptrFont->spr.v;
//Now set default values to font
ptrFont->char_w = FONT_DEFAULT_CHAR_SIZE;
ptrFont->char_h = FONT_DEFAULT_CHAR_SIZE;
ptrFont->spr.attribute |= COLORMODE(COLORMODE_4BPP);
ptrFont->spr.attribute &= COLORMODE(~(COLORMODE_8BPP | COLORMODE_16BPP | COLORMODE_24BPP));
ptrFont->spr.r = NORMAL_LUMINANCE;
ptrFont->spr.g = NORMAL_LUMINANCE;
ptrFont->spr.b = NORMAL_LUMINANCE;
//At this point, spr.w and spr.h = real w/h
ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
ptrFont->max_ch_wrap = 0;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
ptrFont->flags = FONT_NOFLAGS;
ptrFont->init_ch = FONT_DEFAULT_INIT_CHAR;
Serial_printf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);
return true;
}
void FontSetInitChar(TYPE_FONT * ptrFont, char c)
{
ptrFont->init_ch = c;
}
void FontSetFlags(TYPE_FONT * ptrFont, FONT_FLAGS flags)
{
ptrFont->flags = flags;
}
void FontSetSize(TYPE_FONT * ptrFont, short size)
{
ptrFont->char_w = size;
ptrFont->char_h = size;
//At this point, spr.w and spr.h = real w/h
ptrFont->char_per_row = (uint8_t)(ptrFont->spr_w / ptrFont->char_w);
ptrFont->max_ch_wrap = 0;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
}
void FontSetMaxCharPerLine(TYPE_FONT* ptrFont, uint8_t max)
{
ptrFont->max_ch_wrap = max;
}
void FontSetSpacing(TYPE_FONT* ptrFont, short spacing)
{
ptrFont->char_spacing = spacing;
}
void FontCyclic(void)
{
_blend_effect_lum -= 8;
}
void FontPrintText(TYPE_FONT * ptrFont, short x, short y, const char* str, ...)
{
uint16_t i;
uint8_t line_count = 0;
int result;
short orig_x = x;
va_list ap;
// Do not print anything if either 1Hz or 2Hz flags are configured
// and 1/2Hz signal has not been yet emitted by Gfx.
if (ptrFont->flags & FONT_1HZ_FLASH)
{
if (Gfx1HzFlash() == false)
{
return;
}
}
else if (ptrFont->flags & FONT_2HZ_FLASH)
{
if (Gfx2HzFlash() == false)
{
return;
}
}
va_start(ap, str);
result = vsnprintf( _internal_text,
FONT_INTERNAL_TEXT_BUFFER_MAX_SIZE,
str,
ap );
for (i = 0; i < result ; i++)
{
unsigned char _ch = _internal_text[i];
if (_ch == '\0')
{
// End of string
break;
}
switch(_ch)
{
case ' ':
{
bool linefeed_needed = false;
// Check if the next word fits on the same line
if ( (ptrFont->flags & FONT_WRAP_LINE) && (ptrFont->max_ch_wrap != 0) )
{
uint16_t j;
uint8_t aux_line_count = line_count;
for (j = i + 1; j < result; j++)
{
if (_internal_text[j] != ' ')
{
if (++aux_line_count >= ptrFont->max_ch_wrap)
{
line_count = 0;
x = orig_x;
y += ptrFont->char_h;
linefeed_needed = true;
break;
}
}
else
{
break;
}
}
}
if (linefeed_needed == false)
{
x += ptrFont->char_w;
}
continue;
}
case '\n':
x = orig_x;
y += ptrFont->char_h;
break;
case SQUARE_BTN_8BIT:
GfxDrawButton(x, y, PAD_SQUARE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case CIRCLE_BTN_8BIT:
GfxDrawButton(x, y, PAD_CIRCLE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case TRIANGLE_BTN_8BIT:
GfxDrawButton(x, y, PAD_TRIANGLE);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
case CROSS_BTN_8BIT:
GfxDrawButton(x, y, PAD_CROSS);
x += BUTTON_SIZE;
line_count += BUTTON_SIZE / ptrFont->char_w;
break;
default:
if ( (ptrFont->flags & FONT_WRAP_LINE) && (ptrFont->max_ch_wrap != 0) )
{
if (++line_count >= ptrFont->max_ch_wrap)
{
line_count = 0;
x = orig_x;
y += ptrFont->char_h;
}
}
ptrFont->spr.x = x;
ptrFont->spr.y = y;
ptrFont->spr.w = ptrFont->char_w;
ptrFont->spr.h = ptrFont->char_h;
ptrFont->spr.u = (short)( (_ch - ptrFont->init_ch) % ptrFont->char_per_row) * ptrFont->char_w;
ptrFont->spr.u += ptrFont->spr_u; // Add original offset for image
ptrFont->spr.v = (short)( (_ch - ptrFont->init_ch) / ptrFont->char_per_row) * ptrFont->char_h;
ptrFont->spr.v += ptrFont->spr_v; // Add original offset for image
if (ptrFont->flags & FONT_BLEND_EFFECT)
{
ptrFont->spr.r += 8;
ptrFont->spr.g += 8;
ptrFont->spr.b += 8;
}
else
{
ptrFont->spr.r = NORMAL_LUMINANCE;
ptrFont->spr.g = NORMAL_LUMINANCE;
ptrFont->spr.b = NORMAL_LUMINANCE;
}
/*Serial_printf("char_w = %d, char_h = %d, char_per_row = %d, init_ch: %c\n",
ptrFont->char_w,
ptrFont->char_h,
ptrFont->char_per_row,
ptrFont->init_ch);
Serial_printf("Char: %c, spr.u = %d, spr.v = %d\n",str[i],ptrFont->spr.u, ptrFont->spr.v);
Serial_printf("Sprite CX = %d, sprite CY = %d\n",ptrFont->spr.cx, ptrFont->spr.cy);*/
//Serial_printf("Sprite rgb={%d,%d,%d}\n",ptrFont->spr.r, ptrFont->spr.g, ptrFont->spr.b);
GfxSortSprite(&ptrFont->spr);
x += ptrFont->char_spacing;
break;
}
}
if (ptrFont->flags & FONT_BLEND_EFFECT)
{
ptrFont->spr.r = _blend_effect_lum;
ptrFont->spr.g = _blend_effect_lum;
ptrFont->spr.b = _blend_effect_lum;
}
va_end(ap);
}

View File

@ -1,39 +1,38 @@
#ifndef FONT_HEADER__
#define FONT_HEADER__
/* *************************************
* Includes
* *************************************/
#include "Global_Inc.h"
#include "GameStructures.h"
/* *************************************
* Defines
* *************************************/
/* **************************************
* Structs and enums *
* *************************************/
/* *************************************
* Global prototypes
* *************************************/
bool FontLoadImage(const char* strPath, TYPE_FONT * ptrFont);
void FontSetSize(TYPE_FONT * ptrFont, short size);
void FontPrintText(TYPE_FONT *ptrFont, short x, short y, const char* str, ...);
void FontSetInitChar(TYPE_FONT * ptrFont, char c);
void FontSetFlags(TYPE_FONT * ptrFont, FONT_FLAGS flags);
void FontCyclic(void);
void FontSetSpacing(TYPE_FONT* ptrFont, short spacing);
void FontSetMaxCharPerLine(TYPE_FONT* ptrFont, uint8_t max);
/* *************************************
* Global variables
* *************************************/
TYPE_FONT RadioFont;
TYPE_FONT SmallFont;
#endif //FONT_HEADER__
#ifndef FONT_HEADER__
#define FONT_HEADER__
/* *************************************
* Includes
* *************************************/
#include "Global_Inc.h"
#include "GameStructures.h"
/* *************************************
* Defines
* *************************************/
/* **************************************
* Structs and enums *
* *************************************/
/* *************************************
* Global prototypes
* *************************************/
bool FontLoadImage(const char* strPath, TYPE_FONT * ptrFont);
void FontSetSize(TYPE_FONT * ptrFont, short size);
void FontPrintText(TYPE_FONT *ptrFont, short x, short y, const char* str, ...);
void FontSetInitChar(TYPE_FONT * ptrFont, char c);
void FontSetFlags(TYPE_FONT * ptrFont, FONT_FLAGS flags);
void FontCyclic(void);
void FontSetSpacing(TYPE_FONT* ptrFont, short spacing);
void FontSetMaxCharPerLine(TYPE_FONT* ptrFont, uint8_t max);
/* *************************************
* Global variables
* *************************************/
extern TYPE_FONT RadioFont, SmallFont;
#endif //FONT_HEADER__