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

Implement Wiggle Title Text

Browse Source
This commit is contained in:
Jaby
2024-01-03 15:18:44 -06:00
parent 9efcf87ecc
commit a7096ac92c
8 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support/src/FontWriter/Makefile
View File

@@ -21,7 +21,7 @@ LIB_OBJS = $(filter-out $(MAIN_BOOT_OBJ) $(OVERLAY_BOOT_OBJ),$(OBJS))
#$(info $$var2 is [${LIB_OBJS}])
$(DEFAULT_FONT_IMAGE): ressources/DefaultFont.png
jaby_engine_fconv --lz4 $< simple-tim clut4 --color-trans | cpp_out --name default_font_data -o $@
jaby_engine_fconv --lz4 $< simple-tim clut4 --semi-trans --color-trans | cpp_out --name default_font_data -o $@
#Linking rule
$(TARGET).a: $(LIB_OBJS)

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

@@ -63,7 +63,7 @@ namespace JabyEngine {
this->last_primitive = nullptr;
}
void FontWriter :: write(State& state, const char* str, GPU::Color24 color, Wiggle* wiggle, va_list list) {
void FontWriter :: write(State& state, const char* str, GPU::Color24 color, const Wiggle* wiggle, va_list list) {
static const auto exchang_str = [](const char* str, const char* new_str) -> pair<const char*, const char*> {
return {str + 1, new_str};
};