The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2025-02-13 18:29:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update runtime submodule and N64Recomp commit in CI for mod config API, remove unnecessary extern C

Browse Source
This commit is contained in:
Mr-Wiseguy 2025-01-31 11:54:51 -05:00
parent 1125d7e28c
commit 6022b7927b
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/validate.yml vendored
View File

@ -9,7 +9,7 @@ on:
N64RECOMP_COMMIT: N64RECOMP_COMMIT:
type: string type: string
required: false required: false
default: 'b18e0ca2dd359d62dcc019771f0ccc4a1302bd03' default: 'be65d37760e56867fc5ac68510ffdc0f6e00bbb5'
DXC_CHECKSUM: DXC_CHECKSUM:
type: string type: string
required: false required: false

2
lib/N64ModernRuntime

@ -1 +1 @@
Subproject commit 5d9bd566afe7022976153a1c412dd45db7fd5854 Subproject commit 377fed105f87d96fc810c98aaf5f7ae0f385854e

34
src/ui/ui_api.cpp
View File

@ -89,39 +89,39 @@ void return_resource(recomp_context* ctx, ResourceId resource) {
// Context functions // Context functions
extern "C" void recompui_create_context(uint8_t* rdram, recomp_context* ctx) { void recompui_create_context(uint8_t* rdram, recomp_context* ctx) {
(void)rdram; (void)rdram;
ContextId ui_context = create_context(); ContextId ui_context = create_context();
_return<uint32_t>(ctx, ui_context.slot_id); _return<uint32_t>(ctx, ui_context.slot_id);
} }
extern "C" void recompui_open_context(uint8_t* rdram, recomp_context* ctx) { void recompui_open_context(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
ui_context.open(); ui_context.open();
} }
extern "C" void recompui_close_context(uint8_t* rdram, recomp_context* ctx) { void recompui_close_context(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
ui_context.close(); ui_context.close();
} }
extern "C" void recompui_context_root(uint8_t* rdram, recomp_context* ctx) { void recompui_context_root(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
(void)ui_context; (void)ui_context;
return_resource(ctx, root_element_id); return_resource(ctx, root_element_id);
} }
extern "C" void recompui_show_context(uint8_t* rdram, recomp_context* ctx) { void recompui_show_context(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
recompui::show_context(ui_context, ""); recompui::show_context(ui_context, "");
} }
extern "C" void recompui_hide_context(uint8_t* rdram, recomp_context* ctx) { void recompui_hide_context(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
recompui::hide_context(ui_context); recompui::hide_context(ui_context);
@ -129,14 +129,14 @@ extern "C" void recompui_hide_context(uint8_t* rdram, recomp_context* ctx) {
// Resource creation functions // Resource creation functions
extern "C" void recompui_create_style(uint8_t* rdram, recomp_context* ctx) { void recompui_create_style(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
Style* ret = ui_context.create_style(); Style* ret = ui_context.create_style();
return_resource(ctx, ret->get_resource_id()); return_resource(ctx, ret->get_resource_id());
} }
extern "C" void recompui_create_element(uint8_t* rdram, recomp_context* ctx) { void recompui_create_element(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
Element* parent = arg_element<1>(rdram, ctx, ui_context); Element* parent = arg_element<1>(rdram, ctx, ui_context);
@ -144,7 +144,7 @@ extern "C" void recompui_create_element(uint8_t* rdram, recomp_context* ctx) {
return_resource(ctx, ret->get_resource_id()); return_resource(ctx, ret->get_resource_id());
} }
extern "C" void recompui_create_button(uint8_t* rdram, recomp_context* ctx) { void recompui_create_button(uint8_t* rdram, recomp_context* ctx) {
ContextId ui_context = get_context(rdram, ctx); ContextId ui_context = get_context(rdram, ctx);
Element* parent = arg_element<1>(rdram, ctx, ui_context); Element* parent = arg_element<1>(rdram, ctx, ui_context);
std::string text = arg_string<2>(rdram, ctx); std::string text = arg_string<2>(rdram, ctx);
@ -156,7 +156,7 @@ extern "C" void recompui_create_button(uint8_t* rdram, recomp_context* ctx) {
// Style functions // Style functions
extern "C" void recompui_set_width(uint8_t* rdram, recomp_context* ctx) { void recompui_set_width(uint8_t* rdram, recomp_context* ctx) {
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
float width = _arg_float_a1(rdram, ctx); float width = _arg_float_a1(rdram, ctx);
uint32_t unit = _arg<2, uint32_t>(rdram, ctx); uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
@ -164,7 +164,7 @@ extern "C" void recompui_set_width(uint8_t* rdram, recomp_context* ctx) {
resource->set_width(width, static_cast<Unit>(unit)); resource->set_width(width, static_cast<Unit>(unit));
} }
extern "C" void recompui_set_height(uint8_t* rdram, recomp_context* ctx) { void recompui_set_height(uint8_t* rdram, recomp_context* ctx) {
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
float height = _arg_float_a1(rdram, ctx); float height = _arg_float_a1(rdram, ctx);
uint32_t unit = _arg<2, uint32_t>(rdram, ctx); uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
@ -172,41 +172,41 @@ extern "C" void recompui_set_height(uint8_t* rdram, recomp_context* ctx) {
resource->set_height(height, static_cast<Unit>(unit)); resource->set_height(height, static_cast<Unit>(unit));
} }
extern "C" void recompui_set_display(uint8_t* rdram, recomp_context* ctx) { void recompui_set_display(uint8_t* rdram, recomp_context* ctx) {
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
uint32_t display = _arg<1, uint32_t>(rdram, ctx); uint32_t display = _arg<1, uint32_t>(rdram, ctx);
resource->set_display(static_cast<Display>(display)); resource->set_display(static_cast<Display>(display));
} }
extern "C" void recompui_set_flex_direction(uint8_t* rdram, recomp_context* ctx) { void recompui_set_flex_direction(uint8_t* rdram, recomp_context* ctx) {
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
uint32_t direction = _arg<1, uint32_t>(rdram, ctx); uint32_t direction = _arg<1, uint32_t>(rdram, ctx);
resource->set_flex_direction(static_cast<FlexDirection>(direction)); resource->set_flex_direction(static_cast<FlexDirection>(direction));
} }
extern "C" void recompui_set_flex_grow(uint8_t* rdram, recomp_context* ctx) { // float grow void recompui_set_flex_grow(uint8_t* rdram, recomp_context* ctx) { // float grow
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
float grow = _arg_float_a1(rdram, ctx); float grow = _arg_float_a1(rdram, ctx);
resource->set_flex_grow(grow); resource->set_flex_grow(grow);
} }
extern "C" void recompui_set_flex_shrink(uint8_t* rdram, recomp_context* ctx) { // float shrink void recompui_set_flex_shrink(uint8_t* rdram, recomp_context* ctx) { // float shrink
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
float shrink = _arg_float_a1(rdram, ctx); float shrink = _arg_float_a1(rdram, ctx);
resource->set_flex_shrink(shrink); resource->set_flex_shrink(shrink);
} }
extern "C" void recompui_set_flex_basis_auto(uint8_t* rdram, recomp_context* ctx) { void recompui_set_flex_basis_auto(uint8_t* rdram, recomp_context* ctx) {
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
resource->set_flex_basis_auto(); resource->set_flex_basis_auto();
} }
extern "C" void recompui_set_flex_basis(uint8_t* rdram, recomp_context* ctx) { // float basis, Unit unit = Unit::Percent void recompui_set_flex_basis(uint8_t* rdram, recomp_context* ctx) { // float basis, Unit unit = Unit::Percent
Style* resource = arg_style<0>(rdram, ctx); Style* resource = arg_style<0>(rdram, ctx);
float basis = _arg_float_a1(rdram, ctx); float basis = _arg_float_a1(rdram, ctx);
uint32_t unit = _arg<2, uint32_t>(rdram, ctx); uint32_t unit = _arg<2, uint32_t>(rdram, ctx);