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 ae03e4ab1a - Show all commits

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

@ -23,7 +23,7 @@ void font_writer_setup() {
void font_writer_update() {
auto state = JabyEngine::State::create(JabyEngine::Make::PositionI16(8, 8), wiggle_count);
new_font_writer.write(state, "012345 ABCDEFGHIJKL\nabcedfghijkl\n", JabyEngine::GPU::Color24::Blue(), &wiggle);
new_font_writer.write(state, "Mi%iau:", JabyEngine::GPU::Color24::Yellow(), &wiggle, 12345);
new_font_writer.write(state, "Wiggle Count: %i", JabyEngine::GPU::Color24::Green(), &wiggle, wiggle_count);
if(timer.is_expired_for(50_ms)) {
timer.reset();

1
include/stdarg.h
View File

@ -5,5 +5,6 @@ typedef __builtin_va_list va_list;
#define va_start __builtin_va_start
#define va_end __builtin_va_end
#define next_arg __builtin_next_arg
#define va_arg __builtin_va_arg
#endif // !__STDARG__H

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

@ -40,7 +40,7 @@ namespace JabyEngine {
void write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, ...) {
__write_impl(wiggle, color, wiggle);
}
void write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list b);
void write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list list);
void render();
#undef __write_impl

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

@ -43,7 +43,7 @@ namespace JabyEngine {
}
}
void FontWriter :: write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list b) {
void FontWriter :: write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list list) {
const auto* primitive_end = &this->prim_buffer.double_buffer[GPU::Display::current_id][this->prim_buffer.single_buffer_length];
const auto font_size = this->prim_buffer.double_buffer[0][0]->size;
const auto row_count = 256/font_size.width;
@ -91,7 +91,7 @@ namespace JabyEngine {
switch(*str) {
case 'i':
prev_str = str + 1;
str = simple_itoa(buffer, -505, 10);
str = simple_itoa(buffer, va_arg(list, int), 10);
continue;
case '%':