Basic rendering of the font

This commit is contained in:
Jaby 2023-11-30 20:24:26 -05:00 committed by Jaby
parent c751e9e5ed
commit ce42bda6a5
3 changed files with 58 additions and 24 deletions

View File

@ -29,10 +29,13 @@ static void setup() {
static void update() { static void update() {
FontWriter::FontWriter cursor; FontWriter::FontWriter cursor;
auto new_cursor = NewFontWriter::start(Make::PositionI16(16, 16));
const auto end_pos = cursor.write(FontWriter::Position::create(0, 32), "Cody is cute\n&\na \x1b[8;0;0mBAAAAABY!!!"); const auto end_pos = cursor.write(FontWriter::Position::create(0, 32), "Cody is cute\n&\na \x1b[8;0;0mBAAAAABY!!!");
cursor.write(end_pos, "\x1b[0;7;7mJaby was\nhere c:"); cursor.write(end_pos, "\x1b[0;7;7mJaby was\nhere c:");
new_cursor.write("0");
paco.update(); paco.update();
} }

View File

@ -3,7 +3,14 @@
namespace JabyEngine { namespace JabyEngine {
struct FontWriter { struct FontWriter {
struct Cursor {
GPU::PositionI16 pos;
void write(const char* str);
};
static void setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const FontInfo& font_info); static void setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const FontInfo& font_info);
static Cursor start(const GPU::PositionI16& pos);
static void render(); static void render();
}; };
} }

View File

@ -8,23 +8,17 @@
namespace JabyEngine { namespace JabyEngine {
struct DoubleBuffer { struct DoubleBuffer {
GPU::TexPage::Linked tex_page; GPU::TexPage::Linked tex_page;
GPU::SPRT::Linked* cur_sprt_ptr;
FontBufferInfo prim_buffer; FontBufferInfo prim_buffer;
FontPrimitive* cur_primitive;
GPU::SPRT_16::Linked planschi;
static constexpr DoubleBuffer empty() { static constexpr DoubleBuffer empty() {
return DoubleBuffer{.tex_page = {0}, .cur_sprt_ptr = nullptr, .prim_buffer = FontBufferInfo::empty()}; return DoubleBuffer{.tex_page = {0}, .prim_buffer = FontBufferInfo::empty(), .cur_primitive = nullptr};
} }
void setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const GPU::SizeI16& font_size) { void setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const GPU::SizeI16& font_size) {
this->tex_page = Make::TexPage(vram_dst.get_texture_position(), GPU::TexturePageColor::$4bit).linked(); this->tex_page = Make::TexPage(vram_dst.get_texture_position(), GPU::TexturePageColor::$4bit).linked();
this->prim_buffer = buffer_info; this->prim_buffer = buffer_info;
this->cur_primitive = buffer_info.double_buffer[GPU::Display::current_id];
this->planschi = Make::SPRT_16(
Make::PositionI16(0, 0),
Make::OffsetPageWithClut(Make::PageOffset(0, 0), Make::PageClut(vram_dst.get_clut_position()))
).linked();
for(size_t buffer_id = 0; buffer_id < 2; buffer_id++) { for(size_t buffer_id = 0; buffer_id < 2; buffer_id++) {
for(size_t buffer_element_id = 0; buffer_element_id < buffer_info.single_buffer_length; buffer_element_id++) { for(size_t buffer_element_id = 0; buffer_element_id < buffer_info.single_buffer_length; buffer_element_id++) {
@ -32,26 +26,56 @@ namespace JabyEngine {
Make::AreaI16(Make::PositionI16(0, 0), font_size), Make::AreaI16(Make::PositionI16(0, 0), font_size),
Make::OffsetPageWithClut(Make::PageOffset(0, 0), Make::PageClut(vram_dst.get_clut_position())) Make::OffsetPageWithClut(Make::PageOffset(0, 0), Make::PageClut(vram_dst.get_clut_position()))
).linked(); ).linked();
}
}
}
this->prim_buffer.double_buffer[buffer_id][buffer_element_id]->set_identitiy(); void write(GPU::PositionI16 pos, const char* str) {
const auto* primitive_end = &this->prim_buffer.double_buffer[GPU::Display::current_id][this->prim_buffer.single_buffer_length];
while(this->cur_primitive < primitive_end && *str != '\0') {
auto& primitive = *this->cur_primitive;
this->cur_primitive++;
str++;
primitive->position = pos;
primitive.concat(*this->cur_primitive);
pos.move(primitive->size.width, 0);
} }
} }
void render() {
const auto update_id = GPU::Display::current_id;
const auto render_id = update_id ^ 1;
this->cur_primitive -= 1;
if(this->cur_primitive >= this->prim_buffer.double_buffer[render_id]) {
this->cur_primitive->terminate();
this->tex_page.concat(*this->prim_buffer.double_buffer[render_id]);
GPU::render(this->tex_page);
}
this->cur_primitive = this->prim_buffer.double_buffer[update_id];
} }
}; };
static auto double_buffer = DoubleBuffer::empty(); static auto double_buffer = DoubleBuffer::empty();
void FontWriter :: setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const FontInfo& font_info) { void FontWriter::Cursor :: write(const char* str) {
printf("Hello Planschi c: @0x%p @0x%p\n", buffer_info.double_buffer[0], buffer_info.double_buffer[1]); double_buffer.write(this->pos, str);
double_buffer.setup(buffer_info, vram_dst, Make::SizeI16(font_info.FontSize.width, font_info.FontSize.height)); }
//TMP void FontWriter :: setup(const FontBufferInfo& buffer_info, const SimpleTIM& vram_dst, const FontInfo& font_info) {
double_buffer.prim_buffer.double_buffer[0][0].terminate(); double_buffer.setup(buffer_info, vram_dst, Make::SizeI16(font_info.FontSize.width, font_info.FontSize.height));
double_buffer.tex_page.concat(double_buffer.prim_buffer.double_buffer[0][0]); }
//TMP-END
FontWriter::Cursor FontWriter :: start(const GPU::PositionI16& pos) {
return Cursor{.pos = pos};
} }
void FontWriter :: render() { void FontWriter :: render() {
GPU::render(double_buffer.tex_page); double_buffer.render();
} }
} }