etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build, add fonts to dynos packs

Browse source
This commit is contained in:
MysterD 2023-04-02 14:58:43 -07:00
parent 44a1831698
commit 072c36c558
4 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.split
View file

@ -256,6 +256,7 @@ $(BUILD_DIR)/bin/machine.o: $(MACHINE_TEXTURES:%.png=$(BUILD_DIR)/%.in
$(BUILD_DIR)/bin/mountain.o: $(MOUNTAIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/mountain.o: $(MOUNTAIN_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/grass.o: $(GRASS_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/grass.o: $(GRASS_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/custom_font.o: $(CUSTOM_FONT_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c) $(BUILD_DIR)/bin/custom_font.o: $(CUSTOM_FONT_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
$(BUILD_DIR)/bin/custom_textures.o: $(SEGMENT2_TEXTURES:%.png=$(BUILD_DIR)/%.inc.c)
# Others # Others
$(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000 $(BUILD_DIR)/bin/segment2.elf: SEGMENT_ADDRESS := 0x02000000

4
bin/custom_font.c
View file

@ -4,7 +4,7 @@
#include "make_const_nonconst.h" #include "make_const_nonconst.h"
ALIGNED8 const u8 texture_font_normal[] = { ALIGNED8 const u8 texture_font_normal[] = {
#include "textures/custom_font_title/custom_font_normal.rgba32.inc.c" #include "textures/custom_font/custom_font_normal.rgba32.inc.c"
}; };
const f32 font_normal_widths[] = { const f32 font_normal_widths[] = {
@ -27,7 +27,7 @@ const f32 font_normal_widths[] = {
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
ALIGNED8 const u8 texture_font_title[] = { ALIGNED8 const u8 texture_font_title[] = {
#include "textures/custom_font_title/custom_font_title.rgba32.inc.c" #include "textures/custom_font/custom_font_title.rgba32.inc.c"
}; };
const f32 font_title_widths[] = { const f32 font_title_widths[] = {

7
data/dynos_mgr_builtin_tex.cpp
View file

@ -8,6 +8,9 @@ extern "C" {
// Textures // // Textures //
////////////// //////////////
extern ALIGNED8 const u8 texture_font_normal[];
extern ALIGNED8 const u8 texture_font_title[];
#define define_builtin_tex(_ptr, _path, _width, _height, _bitSize) { (const char*)#_ptr, (const void*)_ptr, (const char*)_path, _width, _height, _bitSize } #define define_builtin_tex(_ptr, _path, _width, _height, _bitSize) { (const char*)#_ptr, (const void*)_ptr, (const char*)_path, _width, _height, _bitSize }
#define define_builtin_tex_(_ptr, _path, _width, _height, _bitSize) { (const char*)#_ptr "_", (const void*)_ptr, (const char*)_path, _width, _height, _bitSize } #define define_builtin_tex_(_ptr, _path, _width, _height, _bitSize) { (const char*)#_ptr "_", (const void*)_ptr, (const char*)_path, _width, _height, _bitSize }
@ -1686,6 +1689,10 @@ static const struct BuiltinTexInfo sDynosBuiltinTexs[] = {
define_builtin_tex(waluigi_custom_waluigi_eyes_right_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_right_unused.rgba16.png", 64, 32, 16), define_builtin_tex(waluigi_custom_waluigi_eyes_right_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_right_unused.rgba16.png", 64, 32, 16),
define_builtin_tex(waluigi_custom_waluigi_eyes_up_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_up_unused.rgba16.png", 64, 32, 16), define_builtin_tex(waluigi_custom_waluigi_eyes_up_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_up_unused.rgba16.png", 64, 32, 16),
define_builtin_tex(waluigi_custom_waluigi_eyes_down_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_down_unused.rgba16.png", 64, 32, 16), define_builtin_tex(waluigi_custom_waluigi_eyes_down_unused_rgba16, "actors/waluigi/custom_waluigi_eyes_down_unused.rgba16.png", 64, 32, 16),
// Fonts
define_builtin_tex(texture_font_normal, "textures/custom_font/custom_font_normal.rgba32.png", 512, 256, 32),
define_builtin_tex(texture_font_title, "textures/custom_font/custom_font_title.rgba32.png", 1024, 512, 32),
}; };
const Texture* DynOS_Builtin_Tex_GetFromName(const char* aDataName) { const Texture* DynOS_Builtin_Tex_GetFromName(const char* aDataName) {

BIN
textures/custom_font/custom_font_normal.rgba32.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB