NepuShiro/libsm64
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #73 from MeltyPlayer/main

Browse Source 
Exposed forwardVelocity, animID, and animFrame in outState.
This commit is contained in:
Jeremy Burns
2025-09-17 14:26:01 -06:00
committed by GitHub
parent 8e4c594195 685da11088
commit fb93a63df0
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsm64.c
+7
View File
@@ -15,6 +15,7 @@
#include "decomp/engine/math_util.h" #include "decomp/engine/math_util.h"
#include "decomp/include/sm64.h" #include "decomp/include/sm64.h"
#include "decomp/include/seq_ids.h" #include "decomp/include/seq_ids.h"
#include "decomp/include/types.h"
#include "decomp/shim.h" #include "decomp/shim.h"
#include "decomp/memory.h" #include "decomp/memory.h"
#include "decomp/global_state.h" #include "decomp/global_state.h"
@@ -255,7 +256,13 @@ SM64_LIB_FN void sm64_mario_tick( int32_t marioId, const struct SM64MarioInputs
vec3f_copy( outState->position, gMarioState->pos ); vec3f_copy( outState->position, gMarioState->pos );
vec3f_copy( outState->velocity, gMarioState->vel ); vec3f_copy( outState->velocity, gMarioState->vel );
outState->faceAngle = (float)gMarioState->faceAngle[1] / 32768.0f * 3.14159f; outState->faceAngle = (float)gMarioState->faceAngle[1] / 32768.0f * 3.14159f;
outState->forwardVelocity = gMarioState->forwardVel;
outState->action = gMarioState->action; outState->action = gMarioState->action;
struct AnimInfo animInfo = gMarioState->marioObj->header.gfx.animInfo;
outState->animID = animInfo.animID;
outState->animID = animInfo.animFrame;
outState->flags = gMarioState->flags; outState->flags = gMarioState->flags;
outState->particleFlags = gMarioState->particleFlags; outState->particleFlags = gMarioState->particleFlags;
outState->invincTimer = gMarioState->invincTimer; outState->invincTimer = gMarioState->invincTimer;
src/libsm64.h
+3
View File
@@ -58,8 +58,11 @@ struct SM64MarioState
float position[3]; float position[3];
float velocity[3]; float velocity[3];
float faceAngle; float faceAngle;
float forwardVelocity;
int16_t health; int16_t health;
uint32_t action; uint32_t action;
int32_t animID;
int16_t animFrame;
uint32_t flags; uint32_t flags;
uint32_t particleFlags; uint32_t particleFlags;
int16_t invincTimer; int16_t invincTimer;