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

Rename 'State' to 'Cursor'

Browse Source
This commit is contained in:
jaby
2024-01-05 12:33:14 -06:00
parent 3e6f5505c2
commit d37bff2f66
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,23 +32,14 @@ namespace JabyEngine {
}
};
struct State {
struct Cursor {
GPU::PositionI16 pos;
uint8_t wiggle_count;
static constexpr State create(GPU::PositionI16 pos, uint8_t wiggle_count = 0) {
return State{.pos = pos, .wiggle_count = wiggle_count};
static constexpr Cursor create(GPU::PositionI16 pos, uint8_t wiggle_count = 0) {
return Cursor{.pos = pos, .wiggle_count = wiggle_count};
}
};
using Wiggle = GPU::PositionI8[8];
/*struct Wiggle {
GPU::PositionI8 offset[8];
uint8_t count;
GPU::PositionI8 next() {
return this->offset[(this->count++)&0x7];
}
};*/
}

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

@@ -8,7 +8,7 @@ namespace JabyEngine {
#define __write_impl(start, color, wiggle) \
va_list list; \
va_start(list, start); \
FontWriter::write(state, str, color, wiggle, list); \
FontWriter::write(cursor, str, color, wiggle, list); \
va_end(list)
GPU::TexPage::Linked tex_page[2];
@@ -36,16 +36,16 @@ namespace JabyEngine {
void clear();
void write(State& state, const char* str, ...) {
void write(Cursor& cursor, const char* str, ...) {
__write_impl(str, GPU::Color24::Grey(), nullptr);
}
void write(State& state, const char* str, GPU::Color24 color, ...) {
void write(Cursor& cursor, const char* str, GPU::Color24 color, ...) {
__write_impl(color, color, nullptr);
}
void write(State& state, const char* str, GPU::Color24 color, const Wiggle* wiggle, ...) {
void write(Cursor& cursor, const char* str, GPU::Color24 color, const Wiggle* wiggle, ...) {
__write_impl(wiggle, color, wiggle);
}
void write(State& state, const char* str, GPU::Color24 color, const Wiggle* wiggle, va_list list);
void write(Cursor& cursor, const char* str, GPU::Color24 color, const Wiggle* wiggle, va_list list);
void render();
#undef __write_impl