jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +5 -4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1b6ac8e280 - Show all commits

2
support/include/FontWriter/Type/types.hpp
View File

@ -4,7 +4,7 @@
#include <PSX/GPU/make_gpu_primitives.hpp>
namespace JabyEngine {
using FontPrimitive = GPU::SPRT_16::Linked;
using FontPrimitive = GPU::SPRT::Linked;
struct FontInfo {
GPU::SizeU16 texture_size;

4
support/include/FontWriter/font_writer.hpp
View File

@ -16,8 +16,6 @@ namespace JabyEngine {
GPU::PageClut clut;
GPU::Link* last_primitive;
void setup(const SimpleTIM& vram_dst, const GPU::SizeI16& font_size);
public:
static constexpr FontWriter empty() {
FontWriter instance;
@ -30,6 +28,8 @@ namespace JabyEngine {
return instance;
}
void setup(const SimpleTIM& vram_dst, const GPU::SizeI16& font_size);
void setup(const SimpleTIM& vram_dst, const FontInfo& font_info) {
FontWriter::setup(vram_dst, Make::SizeI16(font_info.font_size.width, font_info.font_size.height));
}

1
support/src/FontWriter/src/font_writer.cpp
View File

@ -70,6 +70,7 @@ namespace JabyEngine {
auto& primitive = GlobalPrimitiveFactory.new_primitive();
primitive->position = state.pos;
primitive->size = this->font_size;
if(wiggle) {
const auto [off_x, off_y] = (*wiggle)[(state.wiggle_count++)&0x7];
primitive->position.move(off_x, off_y);

2
support/src/FontWriter/src/global_primitive_buffer.cpp
View File

@ -8,7 +8,7 @@ namespace JabyEngine {
const auto*const buffer_end = start + length;
for(auto* cur_prim = start; cur_prim < buffer_end; cur_prim++) {
*cur_prim = FontPrimitive::create(Make::SPRT_16(Make::Vertex(), Make::OffsetPageWithClut()));
*cur_prim = FontPrimitive::create(Make::SPRT(Make::AreaI16(), Make::OffsetPageWithClut()));
}
GlobalPrimitiveFactory = PrimitiveFactory::create(start, length);