Skip to content

Commit

Permalink
font: update polish, adjust english & change atlas filter (thanks to …
Browse files Browse the repository at this point in the history
…Maximus32)
  • Loading branch information
Tupakaveli committed Jan 22, 2020
1 parent a40dd25 commit 7431497
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ GFX_OBJS = usb_icon.o hdd_icon.o eth_icon.o app_icon.o \
Scan_240p.o Scan_240p1.o Scan_480i.o Scan_480p.o Scan_480p1.o Scan_480p2.o \
Scan_480p3.o Scan_480p4.o Scan_480p5.o Scan_576i.o Scan_576p.o Scan_720p.o \
Scan_1080i.o Scan_1080i2.o Scan_1080p.o Vmode_multi.o Vmode_ntsc.o Vmode_pal.o \
freesans.o icon_sys.o icon_icn.o
poeveticanew.o icon_sys.o icon_icn.o

MISC_OBJS = icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.o \
boot.o cancel.o confirm.o cursor.o message.o transition.o
Expand Down Expand Up @@ -844,8 +844,8 @@ $(EE_ASM_DIR)logo.s: gfx/logo.png | $(EE_ASM_DIR)
$(EE_ASM_DIR)case.s: gfx/case.png | $(EE_ASM_DIR)
$(BIN2S) $< $@ case_png

$(EE_ASM_DIR)freesans.s: thirdparty/PoeVeticaNew.ttf | $(EE_ASM_DIR)
$(BIN2S) $< $@ freesansfont_raw
$(EE_ASM_DIR)poeveticanew.s: thirdparty/PoeVeticaNew.ttf | $(EE_ASM_DIR)
$(BIN2S) $< $@ poeveticanew_raw

$(EE_ASM_DIR)icon_sys.s: gfx/icon.sys | $(EE_ASM_DIR)
$(BIN2S) $< $@ icon_sys
Expand Down
2 changes: 1 addition & 1 deletion src/atlas.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ atlas_t *atlasNew(size_t width, size_t height, u8 psm)
atlas->surface.Width = width;
atlas->surface.Height = height;

atlas->surface.Filter = GS_FILTER_LINEAR;
atlas->surface.Filter = GS_FILTER_NEAREST;

size_t txtsize = gsKit_texture_size(width, height, psm);
atlas->surface.PSM = psm;
Expand Down
8 changes: 4 additions & 4 deletions src/fntsys.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include FT_FREETYPE_H

extern void *freesansfont_raw;
extern int size_freesansfont_raw;
extern void *poeveticanew_raw;
extern int size_poeveticanew_raw;

/// Maximal count of atlases per font
#define ATLAS_MAX 4
Expand Down Expand Up @@ -243,8 +243,8 @@ static int fntLoadSlot(font_t *font, char *path)
}
font->dataPtr = buffer;
} else {
buffer = &freesansfont_raw;
bufferSize = size_freesansfont_raw;
buffer = &poeveticanew_raw;
bufferSize = size_poeveticanew_raw;
}

// load the font via memory handle
Expand Down
Binary file removed thirdparty/FreeSans.ttf
Binary file not shown.
Binary file removed thirdparty/FreeSans_basic_latin.ttf
Binary file not shown.
Binary file modified thirdparty/PoeVeticaNew.ttf
Binary file not shown.
Binary file modified thirdparty/font_Polish.ttf
Binary file not shown.

0 comments on commit 7431497

Please sign in to comment.