thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-12-04 23:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix gfx_set_command bug if symbol is a substring of another symbol

Browse source
This commit is contained in:
PeachyPeachSM64 2025-11-08 16:46:59 +01:00
parent 70530b1bde
commit a45dbbbeb5
2 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
data/dynos_bin_gfx.cpp
View file

@ -1235,12 +1235,36 @@ struct GfxParamInfo {
const GfxParamType *types;
};
// Allow whitespaces before and after the command symbol name
static const char *ExtractGfxSymbol(const char *command, size_t *symbolLength) {
const char *symbol = NULL;
*symbolLength = 0;
for (; *command != 0; command++) {
if ((u8) *command <= (u8) ' ' || *command == '(') {
if (symbol != NULL) {
return symbol;
}
} else {
if (symbol == NULL) {
symbol = command;
}
(*symbolLength)++;
}
}
return symbol;
}
static const struct GfxParamInfo *GetGfxParamInfo(const char *command) {
#define define_gfx_symbol(symb, params, addPtr, ...) \
static const GfxParamType types_##symb[] = { __VA_ARGS__ }; \
static struct GfxParamInfo info_##symb = { .count = params, .types = types_##symb }; \
static_assert(sizeof(types_##symb) == params, "Parameter count does not match for gfx command."); \
if (!strncmp(#symb, command, strlen(#symb))) { return &info_##symb; }
size_t symbolLength = 0;
const char *symbol = ExtractGfxSymbol(command, &symbolLength);
if (symbol == NULL) { return NULL; }
#define define_gfx_symbol(symb, params, addPtr, ...) \
{ \
static const GfxParamType types_##symb[] = { __VA_ARGS__ }; \
static struct GfxParamInfo info_##symb = { .count = params, .types = types_##symb }; \
static_assert(sizeof(types_##symb) == params, "Parameter count does not match for gfx symbol: " #symb); \
if (symbolLength == sizeof(#symb) - 1 && !memcmp(symbol, #symb, symbolLength)) { return &info_##symb; } \
}
#define define_gfx_symbol_manual(...) define_gfx_symbol(__VA_ARGS__)
#include "gfx_symbols.h"
#undef define_gfx_symbol

2
docs/lua/examples/gfx-vtx-demo/actors/shape/model.inc.c
View file

@ -15,6 +15,6 @@ Gfx shape_template_dl[] = {
/* [11] */ gsSPDisplayList(NULL),
/* [12] */ gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
/* [13] */ gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
/* [14] */ gsSPLoadGeometryMode(G_LIGHTING | G_CULL_BACK),
/* [14] */ gsSPGeometryMode(G_TEXTURE_GEN, G_LIGHTING | G_CULL_BACK),
/* [15] */ gsSPEndDisplayList(),
};