kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

match func_802E4C0C()

Browse Source
This commit is contained in:
Banjo Kazooie
2022-11-27 13:18:49 -06:00
parent 3aa4568342
commit 1f8c460fe1
7 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core2/code_B3A80.c
View File

@@ -5,7 +5,7 @@
#include "assets.h"
#include "animation.h"
extern f32 func_80340A4C(f32, s32, f32 *);
extern f32 glspline_catmull_rom_interpolate(f32, s32, f32 *);
extern f32 D_803709E0[];
extern u8 D_80370A1C;
@@ -107,7 +107,7 @@ f32 func_8033AC38(AnimationFile *this, AnimationFileElement *elem, f32 arg2){
sp38[0] = sp38[1] = D_803709E0[elem->unk0_3];
sp38[2] = (f32) var_a2->unk2 / 64;
sp38[3] = (var_a2->unk0_15 == 1 && elem->data_cnt >= 2) ? (f32)(var_a2 + 1)->unk2/64 : sp38[2];
return func_80340A4C((arg2 - this->unk0)/(var_a2->unk0_13 - this->unk0), 4, sp38);
return glspline_catmull_rom_interpolate((arg2 - this->unk0)/(var_a2->unk0_13 - this->unk0), 4, sp38);
}
var_a0 = var_a2 + elem->data_cnt;
var_a0--;
@@ -116,7 +116,7 @@ f32 func_8033AC38(AnimationFile *this, AnimationFileElement *elem, f32 arg2){
sp38[0] = ((var_a0->unk0_14 == 1) && (elem->data_cnt >= 2)) ? (f32) (var_a0 - 1)->unk2 / 64 : sp38[1];
sp38[2] = sp38[3] = sp38[1];
return func_80340A4C(arg2 - var_a0->unk0_13, 4, sp38);
return glspline_catmull_rom_interpolate(arg2 - var_a0->unk0_13, 4, sp38);
}
@@ -142,7 +142,7 @@ f32 func_8033AC38(AnimationFile *this, AnimationFileElement *elem, f32 arg2){
sp38[0] = (var_a2->unk0_14 == 1 && (var_a2 - 1) >= &elem->data[0]) ? (f32)(var_a2 - 1)->unk2/64 : sp38[1];
sp38[3] = (var_a0->unk0_15 == 1 && (var_a0 + 1) < &elem->data[elem->data_cnt]) ? (f32)(var_a0 + 1)->unk2/64 : sp38[2];
return func_80340A4C(temp_f12, 4, sp38);
return glspline_catmull_rom_interpolate(temp_f12, 4, sp38);
}
void func_8033AFB8(Struct_B1400 *arg0, s32 arg1, f32 arg2[3][3]){