From d2448d151edad03fb2ca2274cb02426f5fb69582 Mon Sep 17 00:00:00 2001 From: Benji Dial Date: Sun, 19 May 2024 11:39:07 -0400 Subject: [PATCH] add font loading and rendering to daguerre --- applications/init/source/main.cpp | 29 ++++---- euler/include/cstdio | 5 ++ euler/makefile | 2 +- euler/source/io/fseek.cpp | 11 +++ libraries/daguerre/include/daguerre.hpp | 68 +++++++++++++++-- libraries/daguerre/source/daguerre.cpp | 45 ++++++++++++ readme.txt | 5 ++ skeleton/assets/readme.txt | 4 + skeleton/assets/terminus-bold-18x10.psf | Bin 0 -> 10741 bytes skeleton/assets/terminus-ofl.txt | 94 ++++++++++++++++++++++++ 10 files changed, 241 insertions(+), 22 deletions(-) create mode 100644 euler/source/io/fseek.cpp create mode 100644 skeleton/assets/terminus-bold-18x10.psf create mode 100644 skeleton/assets/terminus-ofl.txt diff --git a/applications/init/source/main.cpp b/applications/init/source/main.cpp index 6aa85a4..c5df77c 100644 --- a/applications/init/source/main.cpp +++ b/applications/init/source/main.cpp @@ -1,9 +1,9 @@ #include -void overlay_encode( +void alpha_overlay( daguerre::hilbert_color &dest, const daguerre::rgb24 &src) { if (src.r != 0xff || src.g != 0x00 || src.b != 0xff) - daguerre::encode(dest, src); + daguerre::default_overlay(dest, src); } void invert(daguerre::rgb24 &dest, const daguerre::rgb24 &src) { @@ -17,14 +17,15 @@ int main(int, char **) { auto framebuffer = daguerre::get_hilbert_framebuffer(); daguerre::image burden; - std::FILE *burden_file = std::fopen("/assets/burden.ppm", "r"); - daguerre::try_load_ppm(burden_file, burden); - std::fclose(burden_file); + daguerre::try_load_ppm("/assets/burden.ppm", burden); daguerre::image pointer; - std::FILE *pointer_file = std::fopen("/assets/pointer.ppm", "r"); - daguerre::try_load_ppm(pointer_file, pointer); - std::fclose(pointer_file); + daguerre::try_load_ppm("/assets/pointer.ppm", pointer); + + daguerre::fixed_bitmap_font terminus; + daguerre::try_load_psf("/assets/terminus-bold-18x10.psf", terminus); + + terminus.overlay_text<>(burden, 0, 0, "this is a test"); int32_t width = burden.width < framebuffer.width ? burden.width : framebuffer.width; @@ -39,9 +40,7 @@ int main(int, char **) { int32_t old_mouse_y = new_mouse_y; bool was_left_mouse_down = false; - daguerre::overlay_region< - daguerre::hilbert_color, daguerre::rgb24, daguerre::encode>( - framebuffer, x, y, burden, 0, 0, width, height); + daguerre::overlay_region<>(framebuffer, x, y, burden, 0, 0, width, height); while (1) { @@ -96,8 +95,7 @@ int main(int, char **) { daguerre::overlay_region( burden, 0, 0, burden, 0, 0, width, height); - daguerre::overlay_region< - daguerre::hilbert_color, daguerre::rgb24, daguerre::encode>( + daguerre::overlay_region<>( framebuffer, x, y, burden, 0, 0, width, height); anything_changed = true; @@ -105,12 +103,11 @@ int main(int, char **) { } if (anything_changed) { - daguerre::overlay_region< - daguerre::hilbert_color, daguerre::rgb24, daguerre::encode>( + daguerre::overlay_region<>( framebuffer, old_mouse_x + x, old_mouse_y + y, burden, old_mouse_x, old_mouse_y, pointer.width, pointer.height); daguerre::overlay_region< - daguerre::hilbert_color, daguerre::rgb24, overlay_encode>( + daguerre::hilbert_color, daguerre::rgb24, alpha_overlay>( framebuffer, new_mouse_x + x, new_mouse_y + y, pointer, 0, 0, pointer.width, pointer.height); } diff --git a/euler/include/cstdio b/euler/include/cstdio index 27073db..75472c1 100644 --- a/euler/include/cstdio +++ b/euler/include/cstdio @@ -10,6 +10,11 @@ namespace std { FILE *fopen(const char *filename, const char *mode); int fclose(FILE *stream); + int fseek(FILE *stream, long offset, int origin); + #define SEEK_SET 0 + #define SEEK_CUR 2 + #define SEEK_END 1 + size_t fread(void *buffer, size_t size, size_t count, FILE *stream); } diff --git a/euler/makefile b/euler/makefile index 3b8022d..b9d440f 100644 --- a/euler/makefile +++ b/euler/makefile @@ -1,6 +1,6 @@ LIBSTDCPP_SOURCES = euler/stream.cpp strings/strlen.cpp euler/syscall.asm \ euler/entry.cpp io/fopen.cpp euler/gcc.asm memory/delete.cpp euler/heap.cpp \ - memory/new.cpp io/fclose.cpp io/fread.cpp strings/memcpy.cpp + memory/new.cpp io/fclose.cpp io/fread.cpp strings/memcpy.cpp io/fseek.cpp clean: rm -rf build diff --git a/euler/source/io/fseek.cpp b/euler/source/io/fseek.cpp new file mode 100644 index 0000000..3254468 --- /dev/null +++ b/euler/source/io/fseek.cpp @@ -0,0 +1,11 @@ +#include + +namespace std { + + int fseek(FILE *stream, long offset, int origin) { + if (origin < 0 || origin > 2) + return 1; + return stream->try_seek((__euler_seek_from)origin, offset) ? 0 : 2; + } + +} diff --git a/libraries/daguerre/include/daguerre.hpp b/libraries/daguerre/include/daguerre.hpp index 62d10f0..c236cb9 100644 --- a/libraries/daguerre/include/daguerre.hpp +++ b/libraries/daguerre/include/daguerre.hpp @@ -14,6 +14,16 @@ namespace daguerre { uint8_t b; }; + static inline void default_overlay(hilbert_color &dest, const rgb24 &src) { + dest = __euler_encode_color(src.r, src.g, src.b); + } + + static inline void default_overlay(rgb24 &dest, const bool &src) { + dest.r = src ? 255 : 0; + dest.g = src ? 255 : 0; + dest.b = src ? 255 : 0; + } + template class image { @@ -100,7 +110,7 @@ namespace daguerre { //from [from_x, from_x + width) x [from_y, from_y + height). template < class to_color_t, class from_color_t, - void overlay(to_color_t &dest, const from_color_t &src)> + void overlay(to_color_t &dest, const from_color_t &src) = default_overlay> void overlay_region( image &to, unsigned to_x, unsigned to_y, const image &from, unsigned from_x, unsigned from_y, @@ -116,12 +126,60 @@ namespace daguerre { } - static inline void encode(hilbert_color &dest, const rgb24 &src) { - dest = __euler_encode_color(src.r, src.g, src.b); - } - image get_hilbert_framebuffer(); bool try_load_ppm(std::FILE *input, image &into); + static inline bool try_load_ppm(const char *path, image &into) { + std::FILE *f = std::fopen(path, "r"); + if (!f) + return false; + bool success = try_load_ppm(f, into); + std::fclose(f); + return success; + } + + //TODO: unicode + template + class fixed_bitmap_font { + + public: + unsigned width; + unsigned height; + image glyphs[128]; + + template + void overlay_text( + image &target, unsigned x, + unsigned y, const char *text) const { + + while (1) { + uint8_t ch = (uint8_t)*text; + if (ch == 0) + return; + if (ch < 128) { + overlay_region( + target, x, y, glyphs[ch], 0, 0, width, height); + x += width; + } + ++text; + } + + } + + }; + + bool try_load_psf(std::FILE *input, fixed_bitmap_font &into); + + static inline bool try_load_psf( + const char *path, fixed_bitmap_font &into) { + std::FILE *f = std::fopen(path, "r"); + if (!f) + return false; + bool success = try_load_psf(f, into); + std::fclose(f); + return success; + } + } diff --git a/libraries/daguerre/source/daguerre.cpp b/libraries/daguerre/source/daguerre.cpp index 7c13a88..2f7fe4d 100644 --- a/libraries/daguerre/source/daguerre.cpp +++ b/libraries/daguerre/source/daguerre.cpp @@ -26,6 +26,7 @@ namespace daguerre { return n; } + //only supports p6 format bool try_load_ppm(std::FILE *input, image &into) { char header[3]; @@ -62,4 +63,48 @@ namespace daguerre { } + //assumes the font is in psf2 format, and has a unicode table + bool try_load_psf(std::FILE *input, fixed_bitmap_font &into) { + + uint32_t header[8]; + if (std::fread(header, 4, 8, input) != 8) + return false; + + const uint32_t glyphs_start = header[2]; + const uint32_t glyph_count = header[4]; + const uint32_t glyph_length = header[5]; + into.height = header[6]; + into.width = header[7]; + + const uint32_t unicode_start = glyphs_start + glyph_count * glyph_length; + std::fseek(input, unicode_start, SEEK_SET); + + uint32_t indices[128]; + + for (uint32_t index = 0; index < glyph_count; ++index) { + uint8_t ch; + std::fread(&ch, 1, 1, input); + if (ch < 128) + indices[ch] = index; + do + std::fread(&ch, 1, 1, input); + while (ch != 0xff); + } + + for (uint8_t ch = 0; ch < 128; ++ch) { + std::fseek(input, glyphs_start + glyph_length * indices[ch], SEEK_SET); + into.glyphs[ch] = image(into.width, into.height); + for (unsigned h = 0; h < into.height; ++h) + for (unsigned wb = 0; wb < into.width; wb += 8) { + uint8_t byte; + std::fread(&byte, 1, 1, input); + for (unsigned x = 0; x < 8 && wb + x < into.width; ++x) + into.glyphs[ch].set(wb + x, h, (byte >> (7 - x)) & 1); + } + } + + return true; + + } + } diff --git a/readme.txt b/readme.txt index d48c43c..3cd85d9 100644 --- a/readme.txt +++ b/readme.txt @@ -39,6 +39,11 @@ acknowledgements (any under "dependencies" are downloaded during build): license: https://unsplash.com/license source: https://unsplash.com/photos/selective-focus-photography-snowflakes-9yhy1FXlKwI + - skeleton/assets/terminus-bold-18x10.psf (terminus font, bold, 18x10) + copyright 2020 dimitar toshkov zhekov + license: skeleton/assets/terminus-ofl.txt (sil open font license v1.1) + homepage: https://terminus-font.sourceforge.net/ + everything in the following directories is copyright 2024 benji dial, under the license in license.txt (the isc license): diff --git a/skeleton/assets/readme.txt b/skeleton/assets/readme.txt index 72476c5..3991684 100644 --- a/skeleton/assets/readme.txt +++ b/skeleton/assets/readme.txt @@ -4,3 +4,7 @@ https://unsplash.com/photos/selective-focus-photography-snowflakes-9yhy1FXlKwI. its license can be found online at https://unsplash.com/license. the icon in pointer.ppm is by me :) + +the font in terminus-bold-18x10.psf is the "terminus" font, in bold weight, at +18x10. it can be found only at https://terminus-font.sourceforge.net/ and is +under the license in terminus-ofl.txt (the sil open font license v1.1). diff --git a/skeleton/assets/terminus-bold-18x10.psf b/skeleton/assets/terminus-bold-18x10.psf new file mode 100644 index 0000000000000000000000000000000000000000..6a7e29c5a7d30478e55e704205f994b9c9b09899 GIT binary patch literal 10741 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