From 6324234cf936a4d6eeb00d179f49fa8914de35b4 Mon Sep 17 00:00:00 2001 From: jaby Date: Fri, 1 Dec 2023 20:44:35 -0500 Subject: [PATCH] Adjust casing for FontInfo --- support/include/FontWriter/Type/types.hpp | 4 ++-- support/include/FontWriter/default_font.hpp | 4 ++-- support/include/FontWriter/font_writer.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/include/FontWriter/Type/types.hpp b/support/include/FontWriter/Type/types.hpp index 1b063294..771b8902 100644 --- a/support/include/FontWriter/Type/types.hpp +++ b/support/include/FontWriter/Type/types.hpp @@ -7,8 +7,8 @@ namespace JabyEngine { using FontPrimitive = GPU::SPRT::Linked; struct FontInfo { - GPU::SizeU16 VRAMSize; - GPU::SizeU16 FontSize; + GPU::SizeU16 texture_size; + GPU::SizeU16 font_size; }; struct FontBufferInfo { diff --git a/support/include/FontWriter/default_font.hpp b/support/include/FontWriter/default_font.hpp index a3b978ed..90771ada 100644 --- a/support/include/FontWriter/default_font.hpp +++ b/support/include/FontWriter/default_font.hpp @@ -4,8 +4,8 @@ namespace JabyEngine { struct DefaultFont { static constexpr auto Info = FontInfo { - .VRAMSize = {64, 80}, - .FontSize = {12, 16} + .texture_size = {64, 80}, + .font_size = {12, 16} }; static void load(uint32_t* work_area, SimpleTIM vram_dst); diff --git a/support/include/FontWriter/font_writer.hpp b/support/include/FontWriter/font_writer.hpp index 5853cf3b..fc9ae0bc 100644 --- a/support/include/FontWriter/font_writer.hpp +++ b/support/include/FontWriter/font_writer.hpp @@ -21,7 +21,7 @@ namespace JabyEngine { } void setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const FontInfo& font_info) { - FontWriter::setup(buffer_info, vram_dst, Make::SizeI16(font_info.FontSize.width, font_info.FontSize.height)); + FontWriter::setup(buffer_info, vram_dst, Make::SizeI16(font_info.font_size.width, font_info.font_size.height)); } GPU::PositionI16 write(GPU::PositionI16 pos, const char* str, GPU::Color24 color = GPU::Color24::Grey(), uint8_t wiggle_count = 0);