Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make certain GraphNodeObject fields mutable again

This commit is contained in:
MysterD 2023-05-16 00:05:26 -07:00
parent 2703f7193a
commit 3a93423fcc
6 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen/convert_structs.py
View File

@ -101,7 +101,7 @@ override_field_immutable = {
"SpawnInfo": [ "syncID", "next", "unk18" ], "SpawnInfo": [ "syncID", "next", "unk18" ],
"CustomLevelInfo": [ "next" ], "CustomLevelInfo": [ "next" ],
"GraphNode": [ "children", "next", "parent", "prev", "type" ], "GraphNode": [ "children", "next", "parent", "prev", "type" ],
"GraphNodeObject": [ "*" ], "GraphNodeObject": [ "activeAreaIndex", "angle", "animInfo", "areaIndex", "cameraToObject", "node", "pos", "prevAngle", "prevPos", "prevScale", "prevScaleTimestamp", "prevShadowPos", "prevShadowPosTimestamp", "prevThrowMatrix", "prevThrowMatrixTimestamp", "prevTimestamp", "scale", "shadowPos", "sharedChild", "skipInterpolationTimestamp", "throwMatrix", "throwMatrixPrev", "unk4C", ],
"ObjectWarpNode": [ "next "], "ObjectWarpNode": [ "next "],
"Animation": [ "length" ], "Animation": [ "length" ],
"AnimationTable": [ "count" ], "AnimationTable": [ "count" ],

9
autogen/lua_definitions/constants.lua
View File

@ -342,15 +342,6 @@ INSTANT_WARP_INDEX_START = 0x00
--- @type integer --- @type integer
INSTANT_WARP_INDEX_STOP = 0x04 INSTANT_WARP_INDEX_STOP = 0x04
--- @type integer
LOADED_GRAPH_NODES_EXTENDED = 512
--- @type integer
LOADED_GRAPH_NODES_VANILLA = 256
--- @type integer
MAX_LOADED_GRAPH_NODES = (LOADED_GRAPH_NODES_VANILLA + LOADED_GRAPH_NODES_EXTENDED)
--- @type integer --- @type integer
WARP_TRANSITION_FADE_FROM_BOWSER = 0x12 WARP_TRANSITION_FADE_FROM_BOWSER = 0x12

3
docs/lua/constants.md
View File

@ -70,9 +70,6 @@
## [area.h](#area.h) ## [area.h](#area.h)
- INSTANT_WARP_INDEX_START - INSTANT_WARP_INDEX_START
- INSTANT_WARP_INDEX_STOP - INSTANT_WARP_INDEX_STOP
- LOADED_GRAPH_NODES_EXTENDED
- LOADED_GRAPH_NODES_VANILLA
- MAX_LOADED_GRAPH_NODES
- WARP_TRANSITION_FADE_FROM_BOWSER - WARP_TRANSITION_FADE_FROM_BOWSER
- WARP_TRANSITION_FADE_FROM_CIRCLE - WARP_TRANSITION_FADE_FROM_CIRCLE
- WARP_TRANSITION_FADE_FROM_COLOR - WARP_TRANSITION_FADE_FROM_COLOR

6
docs/lua/structs.md
View File

@ -831,7 +831,7 @@
| animInfo | [AnimInfo](structs.md#AnimInfo) | read-only | | animInfo | [AnimInfo](structs.md#AnimInfo) | read-only |
| areaIndex | `integer` | read-only | | areaIndex | `integer` | read-only |
| cameraToObject | [Vec3f](structs.md#Vec3f) | read-only | | cameraToObject | [Vec3f](structs.md#Vec3f) | read-only |
| disableAutomaticShadowPos | `boolean` | read-only | | disableAutomaticShadowPos | `boolean` | |
| node | [GraphNode](structs.md#GraphNode) | read-only | | node | [GraphNode](structs.md#GraphNode) | read-only |
| pos | [Vec3f](structs.md#Vec3f) | read-only | | pos | [Vec3f](structs.md#Vec3f) | read-only |
| prevAngle | [Vec3s](structs.md#Vec3s) | read-only | | prevAngle | [Vec3s](structs.md#Vec3s) | read-only |
@ -844,10 +844,10 @@
| prevThrowMatrixTimestamp | `integer` | read-only | | prevThrowMatrixTimestamp | `integer` | read-only |
| prevTimestamp | `integer` | read-only | | prevTimestamp | `integer` | read-only |
| scale | [Vec3f](structs.md#Vec3f) | read-only | | scale | [Vec3f](structs.md#Vec3f) | read-only |
| shadowInvisible | `boolean` | read-only | | shadowInvisible | `boolean` | |
| shadowPos | [Vec3f](structs.md#Vec3f) | read-only | | shadowPos | [Vec3f](structs.md#Vec3f) | read-only |
| sharedChild | [GraphNode](structs.md#GraphNode) | read-only | | sharedChild | [GraphNode](structs.md#GraphNode) | read-only |
| skipInViewCheck | `boolean` | read-only | | skipInViewCheck | `boolean` | |
| skipInterpolationTimestamp | `integer` | read-only | | skipInterpolationTimestamp | `integer` | read-only |
| throwMatrix | `Pointer` <`Mat4`> | read-only | | throwMatrix | `Pointer` <`Mat4`> | read-only |
| throwMatrixPrev | `Pointer` <`Mat4`> | read-only | | throwMatrixPrev | `Pointer` <`Mat4`> | read-only |

52
src/pc/lua/smlua_cobject_autogen.c
View File

@ -644,32 +644,32 @@ static struct LuaObjectField sGraphNodeFields[LUA_GRAPH_NODE_FIELD_COUNT] = {
#define LUA_GRAPH_NODE_OBJECT_FIELD_COUNT 26 #define LUA_GRAPH_NODE_OBJECT_FIELD_COUNT 26
static struct LuaObjectField sGraphNodeObjectFields[LUA_GRAPH_NODE_OBJECT_FIELD_COUNT] = { static struct LuaObjectField sGraphNodeObjectFields[LUA_GRAPH_NODE_OBJECT_FIELD_COUNT] = {
{ "activeAreaIndex", LVT_S8, offsetof(struct GraphNodeObject, activeAreaIndex), true, LOT_NONE }, { "activeAreaIndex", LVT_S8, offsetof(struct GraphNodeObject, activeAreaIndex), true, LOT_NONE },
{ "angle", LVT_COBJECT, offsetof(struct GraphNodeObject, angle), true, LOT_VEC3S }, { "angle", LVT_COBJECT, offsetof(struct GraphNodeObject, angle), true, LOT_VEC3S },
{ "animInfo", LVT_COBJECT, offsetof(struct GraphNodeObject, animInfo), true, LOT_ANIMINFO }, { "animInfo", LVT_COBJECT, offsetof(struct GraphNodeObject, animInfo), true, LOT_ANIMINFO },
{ "areaIndex", LVT_S8, offsetof(struct GraphNodeObject, areaIndex), true, LOT_NONE }, { "areaIndex", LVT_S8, offsetof(struct GraphNodeObject, areaIndex), true, LOT_NONE },
{ "cameraToObject", LVT_COBJECT, offsetof(struct GraphNodeObject, cameraToObject), true, LOT_VEC3F }, { "cameraToObject", LVT_COBJECT, offsetof(struct GraphNodeObject, cameraToObject), true, LOT_VEC3F },
{ "disableAutomaticShadowPos", LVT_BOOL, offsetof(struct GraphNodeObject, disableAutomaticShadowPos), true, LOT_NONE }, { "disableAutomaticShadowPos", LVT_BOOL, offsetof(struct GraphNodeObject, disableAutomaticShadowPos), false, LOT_NONE },
{ "node", LVT_COBJECT, offsetof(struct GraphNodeObject, node), true, LOT_GRAPHNODE }, { "node", LVT_COBJECT, offsetof(struct GraphNodeObject, node), true, LOT_GRAPHNODE },
{ "pos", LVT_COBJECT, offsetof(struct GraphNodeObject, pos), true, LOT_VEC3F }, { "pos", LVT_COBJECT, offsetof(struct GraphNodeObject, pos), true, LOT_VEC3F },
{ "prevAngle", LVT_COBJECT, offsetof(struct GraphNodeObject, prevAngle), true, LOT_VEC3S }, { "prevAngle", LVT_COBJECT, offsetof(struct GraphNodeObject, prevAngle), true, LOT_VEC3S },
{ "prevPos", LVT_COBJECT, offsetof(struct GraphNodeObject, prevPos), true, LOT_VEC3F }, { "prevPos", LVT_COBJECT, offsetof(struct GraphNodeObject, prevPos), true, LOT_VEC3F },
{ "prevScale", LVT_COBJECT, offsetof(struct GraphNodeObject, prevScale), true, LOT_VEC3F }, { "prevScale", LVT_COBJECT, offsetof(struct GraphNodeObject, prevScale), true, LOT_VEC3F },
{ "prevScaleTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevScaleTimestamp), true, LOT_NONE }, { "prevScaleTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevScaleTimestamp), true, LOT_NONE },
{ "prevShadowPos", LVT_COBJECT, offsetof(struct GraphNodeObject, prevShadowPos), true, LOT_VEC3F }, { "prevShadowPos", LVT_COBJECT, offsetof(struct GraphNodeObject, prevShadowPos), true, LOT_VEC3F },
{ "prevShadowPosTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevShadowPosTimestamp), true, LOT_NONE }, { "prevShadowPosTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevShadowPosTimestamp), true, LOT_NONE },
{ "prevThrowMatrix", LVT_COBJECT, offsetof(struct GraphNodeObject, prevThrowMatrix), true, LOT_MAT4 }, { "prevThrowMatrix", LVT_COBJECT, offsetof(struct GraphNodeObject, prevThrowMatrix), true, LOT_MAT4 },
{ "prevThrowMatrixTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevThrowMatrixTimestamp), true, LOT_NONE }, { "prevThrowMatrixTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevThrowMatrixTimestamp), true, LOT_NONE },
{ "prevTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevTimestamp), true, LOT_NONE }, { "prevTimestamp", LVT_U32, offsetof(struct GraphNodeObject, prevTimestamp), true, LOT_NONE },
{ "scale", LVT_COBJECT, offsetof(struct GraphNodeObject, scale), true, LOT_VEC3F }, { "scale", LVT_COBJECT, offsetof(struct GraphNodeObject, scale), true, LOT_VEC3F },
{ "shadowInvisible", LVT_BOOL, offsetof(struct GraphNodeObject, shadowInvisible), true, LOT_NONE }, { "shadowInvisible", LVT_BOOL, offsetof(struct GraphNodeObject, shadowInvisible), false, LOT_NONE },
{ "shadowPos", LVT_COBJECT, offsetof(struct GraphNodeObject, shadowPos), true, LOT_VEC3F }, { "shadowPos", LVT_COBJECT, offsetof(struct GraphNodeObject, shadowPos), true, LOT_VEC3F },
{ "sharedChild", LVT_COBJECT_P, offsetof(struct GraphNodeObject, sharedChild), true, LOT_GRAPHNODE }, { "sharedChild", LVT_COBJECT_P, offsetof(struct GraphNodeObject, sharedChild), true, LOT_GRAPHNODE },
{ "skipInViewCheck", LVT_BOOL, offsetof(struct GraphNodeObject, skipInViewCheck), true, LOT_NONE }, { "skipInViewCheck", LVT_BOOL, offsetof(struct GraphNodeObject, skipInViewCheck), false, LOT_NONE },
{ "skipInterpolationTimestamp", LVT_U32, offsetof(struct GraphNodeObject, skipInterpolationTimestamp), true, LOT_NONE }, { "skipInterpolationTimestamp", LVT_U32, offsetof(struct GraphNodeObject, skipInterpolationTimestamp), true, LOT_NONE },
{ "throwMatrix", LVT_COBJECT_P, offsetof(struct GraphNodeObject, throwMatrix), true, LOT_POINTER }, { "throwMatrix", LVT_COBJECT_P, offsetof(struct GraphNodeObject, throwMatrix), true, LOT_POINTER },
{ "throwMatrixPrev", LVT_COBJECT_P, offsetof(struct GraphNodeObject, throwMatrixPrev), true, LOT_POINTER }, { "throwMatrixPrev", LVT_COBJECT_P, offsetof(struct GraphNodeObject, throwMatrixPrev), true, LOT_POINTER },
{ "unk4C", LVT_COBJECT_P, offsetof(struct GraphNodeObject, unk4C), true, LOT_SPAWNINFO }, { "unk4C", LVT_COBJECT_P, offsetof(struct GraphNodeObject, unk4C), true, LOT_SPAWNINFO },
}; };
#define LUA_GRAPH_NODE_802_A45_E4_FIELD_COUNT 6 #define LUA_GRAPH_NODE_802_A45_E4_FIELD_COUNT 6

3
src/pc/lua/smlua_constants_autogen.c
View File

@ -307,9 +307,6 @@ char gSmluaConstants[] = ""
"COURSE_COUNT = 25\n" "COURSE_COUNT = 25\n"
"--- @type integer\n" "--- @type integer\n"
"COURSE_MIN = 1\n" "COURSE_MIN = 1\n"
"LOADED_GRAPH_NODES_VANILLA = 256\n"
"LOADED_GRAPH_NODES_EXTENDED = 512\n"
"MAX_LOADED_GRAPH_NODES = (LOADED_GRAPH_NODES_VANILLA + LOADED_GRAPH_NODES_EXTENDED)\n"
"INSTANT_WARP_INDEX_START = 0x00\n" "INSTANT_WARP_INDEX_START = 0x00\n"
"INSTANT_WARP_INDEX_STOP = 0x04\n" "INSTANT_WARP_INDEX_STOP = 0x04\n"
"WARP_TRANSITION_FADE_FROM_COLOR = 0x00\n" "WARP_TRANSITION_FADE_FROM_COLOR = 0x00\n"