Adjust fonts for hi-res mode

Author: meeq

Makefile

@@ -51,14 +51,15 @@ PNG_FILES := $(wildcard $(PNG_DIR)/*.png)
 SPRITE_FILES := $(patsubst $(PNG_DIR)/%.png,$(SPRITE_DIR)/%.sprite,$(PNG_FILES))
 SPRITE_MANIFEST_TXT := $(PNG_DIR)/manifest.txt
 
+# Font files
+FONT_DIR := $(RESOURCES_DIR)/fonts
+FONT64_DIR := $(N64_MKDFS_ROOT)/fonts
+FONT64_FILES := $(FONT64_DIR)/at01-1x.font64 $(FONT64_DIR)/at01-2x.font64
+
 # Build artifacts
 DFS_FILE := $(BUILD_DIR)/$(N64_ROM_NAME).dfs
 LINKED_OBJS := $(BUILD_DIR)/$(N64_ROM_NAME).elf
 
-# LibDragon tools
-N64_AUDIOCONV ?= $(N64_BINDIR)/audioconv64
-N64_MKSPRITE ?= $(N64_BINDIR)/mksprite
-
 #
 # Compilation pipeline
 #
@@ -88,16 +89,30 @@ $(WAV64_DIR)/%.wav64: $(WAV_DIR)/%.wav
 	@echo "    [SFX] $<"
 	$(N64_AUDIOCONV) -o "$(WAV64_DIR)" "$<" $(REDIRECT_STDOUT)
 
+# Fonts (1x for low-res, 2x for high-res)
+FONT64_SIZE_1x := 16
+FONT64_SIZE_2x := 32
+FONT64_OUTLINE_1x := 1
+FONT64_OUTLINE_2x := 2
+
+# Disable parallel builds for font generation to prevent race conditions
+.NOTPARALLEL: $(FONT64_FILES)
+
+$(FONT64_DIR)/at01-%.font64: $(FONT_DIR)/at01.ttf
+	@mkdir -p "$(dir $@)"
+	@echo "    [FONT] $< ($*)"
+	$(N64_MKFONT) --size $(FONT64_SIZE_$*) --outline $(FONT64_OUTLINE_$*) --range 20-7F -o "$(FONT64_DIR)" "$<" $(REDIRECT_STDOUT)
+	@mv "$(FONT64_DIR)/at01.font64" "$@"
+
 # Filesystem
-$(DFS_FILE): $(SPRITE_FILES) $(WAV64_FILES)
+$(DFS_FILE): $(SPRITE_FILES) $(WAV64_FILES) $(FONT64_FILES)
 
 #
 # Housekeeping
 #
 
 clean:
 	rm -Rf "$(BUILD_DIR)" *.z64
-	git restore '*.z64'
 .PHONY: clean
 
 # Include compiler-generated dependency files

README.md

@@ -102,6 +102,8 @@ This project's source code is [BSD licensed](./LICENSE.txt?raw=true) (c) 2017-20
 The graphic and sound assets are subject to the original work's copyright: [Flappy Bird (c) 2013 .Gears](https://www.dotgears.com/apps/app_flappy.html)<br />
 These assets are used for non-commercial purposes with love, care, and respect, but without permission.
 
+The [at01 font by GrafxKid](https://grafxkid.itch.io/at01) is [Public Domain (CC0 1.0)](https://creativecommons.org/public-domain/cc0/).
+
 LibDragon is [Unlicensed public domain software](https://github.com/DragonMinded/libdragon/blob/trunk/LICENSE.md?raw=true).
 
 "Nintendo 64" is a registered trademark of Nintendo used for informational purposes without permission.

resources/fonts/at01.ttf

@@ -43,11 +43,16 @@ void fps_init(void)
 {
     memset(&fps, 0, sizeof fps);
     FPS_TEXT_COLOR = RGBA32(0x00, 0x00, 0x00, 0xFF);
-    /* Setup font style for FPS text */
-    rdpq_font_t *font = (rdpq_font_t *)rdpq_text_get_font(FONT_DEBUG);
-    if (font)
+    /* Setup font style for FPS text (both 1x and 2x fonts) */
+    rdpq_font_t *font_1x = (rdpq_font_t *)rdpq_text_get_font(FONT_AT01);
+    rdpq_font_t *font_2x = (rdpq_font_t *)rdpq_text_get_font(FONT_AT01_2X);
+    if (font_1x)
     {
-        rdpq_font_style(font, 0, &(rdpq_fontstyle_t){ .color = FPS_TEXT_COLOR });
+        rdpq_font_style(font_1x, 0, &(rdpq_fontstyle_t){ .color = FPS_TEXT_COLOR });
+    }
+    if (font_2x)
+    {
+        rdpq_font_style(font_2x, 0, &(rdpq_fontstyle_t){ .color = FPS_TEXT_COLOR });
     }
 }
 
@@ -101,12 +106,14 @@ void fps_draw(void)
     if (!fps.should_draw) return;
 
     const ticks_t ticks = timer_ticks();
+    const int font_id = gfx->highres ? FONT_AT01_2X : FONT_AT01;
+    const int line_height = gfx->highres ? 26 : 13;
 
-    rdpq_text_printf(NULL, FONT_DEBUG, 10, gfx->height - 33,
+    rdpq_text_printf(NULL, font_id, 10, gfx->height - (line_height * 2 + 7),
         "FPS: %05.2f, Frame: %u, Miss: %u",
         fps.average_fps, fps.total_frames, fps.total_misses);
 
-    rdpq_text_printf(NULL, FONT_DEBUG, 10, gfx->height - 20,
+    rdpq_text_printf(NULL, font_id, 10, gfx->height - (line_height + 7),
         "Milli: %llu, Tick: %llu",
         ticks / TICKS_PER_MS, ticks);
 }

src/fps.c

@@ -11,9 +11,6 @@
 
 gfx_t *gfx;
 
-/* Font IDs for RDPQ text rendering */
-#define FONT_DEBUG 1
-
 void gfx_init(void)
 {
     /* Setup state */
@@ -24,9 +21,11 @@ void gfx_init(void)
     /* Set up the display and RDP subsystems */
     display_init(RESOLUTION_320x240, DEPTH_16_BPP, 3, GAMMA_NONE, FILTERS_RESAMPLE);
     rdpq_init();
-    /* Setup debug font for text rendering */
-    rdpq_font_t *debug_font = rdpq_font_load_builtin(FONT_BUILTIN_DEBUG_MONO);
-    rdpq_text_register_font(FONT_DEBUG, debug_font);
+    /* Load custom fonts for text rendering (1x and 2x for high-res) */
+    rdpq_font_t *font_1x = rdpq_font_load("rom:/fonts/at01-1x.font64");
+    rdpq_font_t *font_2x = rdpq_font_load("rom:/fonts/at01-2x.font64");
+    rdpq_text_register_font(FONT_AT01, font_1x);
+    rdpq_text_register_font(FONT_AT01_2X, font_2x);
     /* Cache display dimensions */
     gfx->width = display_get_width();
     gfx->height = display_get_height();

src/gfx.c

@@ -13,7 +13,8 @@
 #include "system.h"
 
 /* Font IDs for RDPQ text rendering */
-#define FONT_DEBUG 1
+#define FONT_AT01    1
+#define FONT_AT01_2X 2
 
 /* Graphics definitions */
 

src/gfx.h

@@ -202,12 +202,18 @@ static void ui_set_time_mode(ui_t *ui, bg_time_mode_t time_mode)
         ui->text_color = UI_DARK_COLOR;
         ui->shadow_color = UI_LIGHT_COLOR;
     }
-    /* Update font styles for current time mode */
-    rdpq_font_t *font = (rdpq_font_t *)rdpq_text_get_font(FONT_DEBUG);
-    if (font)
+    /* Update font styles for current time mode (both 1x and 2x fonts) */
+    rdpq_font_t *font_1x = (rdpq_font_t *)rdpq_text_get_font(FONT_AT01);
+    rdpq_font_t *font_2x = (rdpq_font_t *)rdpq_text_get_font(FONT_AT01_2X);
+    if (font_1x)
     {
-        rdpq_font_style(font, UI_STYLE_SHADOW, &(rdpq_fontstyle_t){ .color = ui->shadow_color });
-        rdpq_font_style(font, UI_STYLE_TEXT, &(rdpq_fontstyle_t){ .color = ui->text_color });
+        rdpq_font_style(font_1x, UI_STYLE_SHADOW, &(rdpq_fontstyle_t){ .color = ui->shadow_color });
+        rdpq_font_style(font_1x, UI_STYLE_TEXT, &(rdpq_fontstyle_t){ .color = ui->text_color });
+    }
+    if (font_2x)
+    {
+        rdpq_font_style(font_2x, UI_STYLE_SHADOW, &(rdpq_fontstyle_t){ .color = ui->shadow_color });
+        rdpq_font_style(font_2x, UI_STYLE_TEXT, &(rdpq_fontstyle_t){ .color = ui->text_color });
     }
 }
 
@@ -421,37 +427,42 @@ static void ui_logo_draw(const ui_t *ui)
         .scale_y = gfx->scale,
     });
 
+    /* Select font and character width based on resolution */
+    const int font_id = gfx->highres ? FONT_AT01_2X : FONT_AT01;
+    const int char_w = gfx->highres ? 10 : 5;
+    const int shadow_offset = gfx->highres ? 2 : 1;
+
     const char *const credit1_str = "Game by .GEARS";
-    const int credit1_w = strlen(credit1_str) * 6;
+    const int credit1_w = strlen(credit1_str) * char_w;
     const int credit1_x = center_x - (credit1_w / 2);
     const int credit1_y = gfx->height - GFX_SCALE(80);
 
     const char *const credit2_str = "N64 Port by Meeq";
-    const int credit2_w = strlen(credit2_str) * 6;
+    const int credit2_w = strlen(credit2_str) * char_w;
     const int credit2_x = center_x - (credit2_w / 2);
     const int credit2_y = gfx->height - GFX_SCALE(62);
 
     const char *const version_str = ROM_VERSION;
-    const int version_w = strlen(version_str) * 6;
+    const int version_w = strlen(version_str) * char_w;
     const int version_x = gfx->width - GFX_SCALE(32) - version_w;
     const int version_y = gfx->height - GFX_SCALE(32);
 
     /* Draw a shadow under the text */
     rdpq_textparms_t shadow_parms = { .style_id = UI_STYLE_SHADOW };
-    rdpq_text_print(&shadow_parms, FONT_DEBUG, credit1_x + 1, credit1_y + 1, credit1_str);
-    rdpq_text_print(&shadow_parms, FONT_DEBUG, credit2_x + 1, credit2_y + 1, credit2_str);
+    rdpq_text_print(&shadow_parms, font_id, credit1_x + shadow_offset, credit1_y + shadow_offset, credit1_str);
+    rdpq_text_print(&shadow_parms, font_id, credit2_x + shadow_offset, credit2_y + shadow_offset, credit2_str);
     if (version_w)
     {
-        rdpq_text_print(&shadow_parms, FONT_DEBUG, version_x + 1, version_y + 1, version_str);
+        rdpq_text_print(&shadow_parms, font_id, version_x + shadow_offset, version_y + shadow_offset, version_str);
     }
 
     /* Draw the same text on top of the shadow */
     rdpq_textparms_t text_parms = { .style_id = UI_STYLE_TEXT };
-    rdpq_text_print(&text_parms, FONT_DEBUG, credit1_x, credit1_y, credit1_str);
-    rdpq_text_print(&text_parms, FONT_DEBUG, credit2_x, credit2_y, credit2_str);
+    rdpq_text_print(&text_parms, font_id, credit1_x, credit1_y, credit1_str);
+    rdpq_text_print(&text_parms, font_id, credit2_x, credit2_y, credit2_str);
     if (version_w)
     {
-        rdpq_text_print(&text_parms, FONT_DEBUG, version_x, version_y, version_str);
+        rdpq_text_print(&text_parms, font_id, version_x, version_y, version_str);
     }
 }