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 +6 -6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6c5ed6d43 - Show all commits

4
examples/PoolBox/application/src/application.cpp
View File

@ -79,7 +79,7 @@ namespace NormalScene {
auto cursor = FontWriter::update(JabyEngine::Make::PositionI16((GPU::Display::Width-TitleLength)/2, 16));
paco.update();
FontWriter::new_font_writer.write(cursor, Title, GPU::Color24::Yellow(), &FontWriter::wiggle);
FontWriter::new_font_writer.write(cursor, Title, GPU::Color24::Yellow(0xD0), &FontWriter::wiggle);
menu.update(FontWriter::bios_font_writer, cursor, Make::PositionI16(8, 64));
}
@ -102,7 +102,7 @@ namespace LoadingScene {
static constexpr auto TitleLength = (sizeof(Title) - 1)*DefaultFont::Info.font_size.width;
auto cursor = FontWriter::update(JabyEngine::Make::PositionI16((GPU::Display::Width-TitleLength)/2, (GPU::Display::Height-16)/2));
FontWriter::new_font_writer.write(cursor, Title, GPU::Color24::Blue());
FontWriter::new_font_writer.write(cursor, Title, GPU::Color24::Blue(0xD0));
}
static void render() {

2
examples/PoolBox/application/src/menu.cpp
View File

@ -63,7 +63,7 @@ namespace Menu {
if(this->waiting) {
auto state = JabyEngine::State::create(position);
this->font_writer->write(state, "Press and hold ()\nto get back", GPU::Color24::Red());
this->font_writer->write(state, "Press and hold ()\nto get back", GPU::Color24::Red(0xD0));
}
else {

4
include/PSX/GPU/gpu_types.hpp
View File

@ -64,8 +64,8 @@ namespace JabyEngine {
return T::from_rgb(0x80, 0x80, 0x80);
}
static constexpr T White() {
return T::from_rgb(0xFF, 0xFF, 0xFF);
static constexpr T White(uint8_t base = 0xFF) {
return T::from_rgb(base, base, base);
}
static constexpr T Red(uint8_t base = 0xFF) {

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

@ -78,7 +78,7 @@ namespace JabyEngine {
const auto row_count = 256/font_size.width;
const auto push_char = [&](State& state, char cur_char) -> bool {
auto& primitive = GlobalPrimitiveFactory.new_primitive();
auto& primitive = GlobalPrimitiveFactory.new_primitive();
primitive->position = state.pos;
primitive->size = this->font_size;