Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
3 changed files with 5 additions and 5 deletions
Showing only changes of commit 3e897b67cc - Show all commits

View File

@ -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 {

View File

@ -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);

View File

@ -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);