mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup around some generic animation info structs (#1059)

Browse source 
* Name generic anim info structs and cleanup usage

* Make `EnDaiku` use generic struct

* Add `/* decimalid */` comments to all added enums

* small fixes

* Two more generic animinfo structs

* Cleanup usage of newly generic structs

* Cleanup x2 usage of newly generic structs

* `transitionRate` -> `morphFrames`

* Properly name generic anim structs (attempt to at least)

* `anim` -> `animation`

* fixes

* run formatter

* Use consistent prototypes for each actor's ChangeAnim helper

* run formatter

* minor cleanup

* Run formatter

* `Animation_ChangeInfo` -> `Animation_ChangeByInfo`
This commit is contained in:
Dragorn421 2022-01-12 03:10:43 +01:00 • committed by GitHub
parent d3a8ade6ba
commit 11917bf640
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 675 additions and 467 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -21,7 +21,6 @@ void func_80AA2E54(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2EC8(EnMa3* this, GlobalContext* globalCtx);
s32 func_80AA2F28(EnMa3* this);
void EnMa3_UpdateEyes(EnMa3* this);
void EnMa3_ChangeAnim(EnMa3* this, s32 arg1);
void func_80AA3200(EnMa3* this, GlobalContext* globalCtx);
const ActorInit En_Ma3_InitVars = {
@ -58,7 +57,15 @@ static ColliderCylinderInit sCylinderInit = {
static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };
static struct_D_80AA1678 sAnimationInfo[] = {
typedef enum {
/* 0 */ ENMA3_ANIM_0,
/* 1 */ ENMA3_ANIM_1,
/* 2 */ ENMA3_ANIM_2,
/* 3 */ ENMA3_ANIM_3,
/* 4 */ ENMA3_ANIM_4
} EnMa3Animation;
static AnimationFrameCountInfo sAnimationInfo[] = {
{ &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultIdleAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
{ &gMalonAdultStandStillAnim, 1.0f, ANIMMODE_LOOP, 0.0f }, { &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, 0.0f },
{ &gMalonAdultSingAnim, 1.0f, ANIMMODE_LOOP, -10.0f },
@ -224,11 +231,11 @@ void EnMa3_UpdateEyes(EnMa3* this) {
}
}
void EnMa3_ChangeAnim(EnMa3* this, s32 idx) {
f32 frameCount = Animation_GetLastFrame(sAnimationInfo[idx].animation);
void EnMa3_ChangeAnim(EnMa3* this, s32 index) {
f32 frameCount = Animation_GetLastFrame(sAnimationInfo[index].animation);
Animation_Change(&this->skelAnime, sAnimationInfo[idx].animation, 1.0f, 0.0f, frameCount, sAnimationInfo[idx].mode,
sAnimationInfo[idx].transitionRate);
Animation_Change(&this->skelAnime, sAnimationInfo[index].animation, 1.0f, 0.0f, frameCount,
sAnimationInfo[index].mode, sAnimationInfo[index].morphFrames);
}
void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
@ -243,11 +250,11 @@ void EnMa3_Init(Actor* thisx, GlobalContext* globalCtx) {
switch (func_80AA2EC8(this, globalCtx)) {
case 0:
EnMa3_ChangeAnim(this, 0);
EnMa3_ChangeAnim(this, ENMA3_ANIM_0);
this->actionFunc = func_80AA3200;
break;
case 1:
EnMa3_ChangeAnim(this, 0);
EnMa3_ChangeAnim(this, ENMA3_ANIM_0);
this->actionFunc = func_80AA3200;
break;
case 2: