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

src/core1/ml.c: more consistent function names

Browse Source
This commit is contained in:
mariob92
2024-10-17 16:45:16 +02:00
parent bc6680d618
commit e19c5f75d0
78 changed files with 216 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ba/flap.c
View File

@@ -91,7 +91,7 @@ void baflap_update(void) {
if (s_active != 0) {
//update timers
for(i = 0; i < 5; i++){
func_80259430(&s_flap_list[i]);
ml_sub_delta_time(&s_flap_list[i]);
}
if (s_flap_max_timer != 0.0f) {
temp_f0 = s_flap_max_timer;

2
src/core2/ba/physics.c
View File

@@ -57,7 +57,7 @@ void __baphysics_update_normal(void){
if(func_80294548()){
func_80294480(sp54);
ml_vec3f_normalize_copy(sp48, sp60);
sp44 = ml_dotProduct_vec3f(sp48, sp54);
sp44 = ml_vec3f_dot_product(sp48, sp54);
sp40 = get_slope_timer();
if(sp44 != 0.0f){
if(sp44 < 0){

2
src/core2/bs/walrus.c
View File

@@ -76,7 +76,7 @@ void func_802B7F28(void) {
if (900.0 < sp20[0] * sp20[0] + sp20[1] * sp20[1] + sp20[2] * sp20[2]) {
ml_vec3f_normalize(sp20);
func_80294480(sp2C);
if ( ml_dotProduct_vec3f(sp20, sp2C) < -0.2) {
if ( ml_vec3f_dot_product(sp20, sp2C) < -0.2) {
sp3C += D_8037D5C0 * 350.0;
}
}

2
src/core2/ch/bigbutt.c
View File

@@ -358,7 +358,7 @@ Actor *func_802C6E84(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
break;
case 4://L802C6F50
if((globalTimer_getTime() & 1) == 1){
if(func_80259808(actor->yaw)){
if(ml_isViewportYawWithOffsetNormalized(actor->yaw)){
func_802C6E3C(0xb, sp34);
func_802C6E3C(0xa, sp34);
}

14
src/core2/ch/bottlesbonus.c
View File

@@ -326,8 +326,8 @@ void chBottlesBonus_func_802DD8AC(BoneTransformList *arg0, s32 arg1) {
switch(chBottlesBonusCursor_func_802E0538(i)){
case 1://L802DDBB4
chBottlesBonus_func_802DD484(spD8, spD4, 1.0f, 0.2);
func_8025982C(D_8037DEBC[i].unk0, D_8037DEB8[i].unk0, chBottlesBonus_func_802DD60C(i), chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.2));
func_8025982C(D_8037DEBC[i].unk1C, D_8037DEB8[i].unk1C, D_8037DEC4[i].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i]/ 0.2));
ml_vec3f_interpolate(D_8037DEBC[i].unk0, D_8037DEB8[i].unk0, chBottlesBonus_func_802DD60C(i), chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.2));
ml_vec3f_interpolate(D_8037DEBC[i].unk1C, D_8037DEB8[i].unk1C, D_8037DEC4[i].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i]/ 0.2));
func_80345D30(spAC, chBottlesBonusCursor_func_802E068C(i), D_8037DEB8[i].unkC);
func_803458E4(spBC, D_8037DEB8[i].unkC, spAC, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
@@ -345,7 +345,7 @@ void chBottlesBonus_func_802DD8AC(BoneTransformList *arg0, s32 arg1) {
break;
case 2://L802DDD9C
chBottlesBonus_func_802DD484(spD8, spD4, 1.0f, 0.2);
func_8025982C(D_8037DEBC[i].unk0, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk0, chBottlesBonus_func_802DD60C(i), chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.2));
ml_vec3f_interpolate(D_8037DEBC[i].unk0, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk0, chBottlesBonus_func_802DD60C(i), chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.2));
func_80345D30(sp9C, chBottlesBonusCursor_func_802E068C(i), D_8037DEB8[i].unkC);
func_80345D30(sp8C, chBottlesBonusCursor_func_802E0664(i), D_8037DEB8[i].unkC);
func_803458E4(D_8037DEBC[i].unkC, sp9C, sp8C, chBottlesBonus_func_802DD804(D_8037DF18[i] / 0.2));
@@ -362,15 +362,15 @@ void chBottlesBonus_func_802DD8AC(BoneTransformList *arg0, s32 arg1) {
case 3://L802DDF48
chBottlesBonusCursor_func_802DF460(40 + i, chBottlesBonusMarker, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk0);
func_8025982C(D_8037DEBC[i].unk0, D_8037DEC0[i].unk0, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk0, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
func_8025982C(D_8037DEBC[i].unk1C, D_8037DEC0[i].unk1C, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
ml_vec3f_interpolate(D_8037DEBC[i].unk0, D_8037DEC0[i].unk0, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk0, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
ml_vec3f_interpolate(D_8037DEBC[i].unk1C, D_8037DEC0[i].unk1C, D_8037DEC4[chBottlesBonusCursor_func_802E0588(i)].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
func_80345D30(sp7C, chBottlesBonusCursor_func_802E0664(i), D_8037DEB8[i].unkC);
func_803458E4(D_8037DEBC[i].unkC, D_8037DEC0[i].unkC, sp7C, chBottlesBonus_func_802DD804(D_8037DF18[i] / 0.2));
break;
case 0://L802DE084
func_8025982C(D_8037DEBC[i].unk0, D_8037DEC0[i].unk0, D_8037DEB8[i].unk0, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
func_8025982C(D_8037DEBC[i].unk1C, D_8037DEC0[i].unk1C, D_8037DEB8[i].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
ml_vec3f_interpolate(D_8037DEBC[i].unk0, D_8037DEC0[i].unk0, D_8037DEB8[i].unk0, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
ml_vec3f_interpolate(D_8037DEBC[i].unk1C, D_8037DEC0[i].unk1C, D_8037DEB8[i].unk1C, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
func_803458E4(D_8037DEBC[i].unkC, D_8037DEC0[i].unkC, D_8037DEB8[i].unkC, chBottlesBonus_func_802DD804(D_8037DEC8[i] / 0.4));
break;
}

2
src/core2/ch/clankerwhipcrack.c
View File

@@ -37,7 +37,7 @@ void func_803567EC(Actor *this){
}
player_getPosition(plyr_pos);
plyr_dist = ml_distance_vec3f(plyr_pos, this->position);
plyr_dist = ml_vec3f_distance(plyr_pos, this->position);
if(this->state == 1){
if(plyr_dist < 700.0f)
func_80356770(this, 2);

2
src/core2/ch/clucker.c
View File

@@ -148,7 +148,7 @@ void func_8035765C(Actor *this){
}//L803576EC
player_getPosition(sp5C);
sp58 = ml_distance_vec3f(this->position, sp5C);
sp58 = ml_vec3f_distance(this->position, sp5C);
if(this->state == 1){
if(sp58 < this->scale*800.0f){
func_80357264(this, 2);

2
src/core2/ch/code_CFA60.c
View File

@@ -96,7 +96,7 @@ void func_80356CCC(Actor *this){
func_803569F0(this, (this->state < 5)? 1 : 6);
}//L80356D48
player_getPosition(sp5C);
sp58 = ml_distance_vec3f(this->position, sp5C);
sp58 = ml_vec3f_distance(this->position, sp5C);
if( this->state == 1){
if( sp58 < this->scale*400.0f
&& (map_get() != MAP_3C_RBB_KITCHEN || this->position_z < sp5C[2])

6
src/core2/ch/flotsam.c
View File

@@ -146,7 +146,7 @@ void func_8035C080(Actor *this, s32 next_state){
}
}
else if(next_state == 3){//L8035C4C0
if(ml_distance_vec3f(local->unk28, this->position) < 10.0f){
if(ml_vec3f_distance(local->unk28, this->position) < 10.0f){
func_8035C080(this, 1);
return;
}
@@ -293,11 +293,11 @@ void func_8035C8F4(Actor *this){
local->unk0 += 1.9047619047619049*sp34;
if(1.0f <= local->unk0)
local->unk0 = 1.0f;
ml_interpolate_vec3f(this->position, local->unk10, local->unk1C, local->unk0);
ml_vec3f_interpolate_fast(this->position, local->unk10, local->unk1C, local->unk0);
this->position_y += 100.0f*sinf(local->unk0*3.141592654);
this->yaw = local->unk0*(local->unk34[2] - local->unk34[1]) + local->unk34[1];
if(skeletalAnim_getLoopCount(this->unk148) > 0){
if(ml_distance_vec3f(this->position, local->unk28) < 10.0f){
if(ml_vec3f_distance(this->position, local->unk28) < 10.0f){
func_8035C080(this, 1);
}
else if(local->unkC > 0){//L8035CB8C

2
src/core2/ch/mole.c
View File

@@ -387,7 +387,7 @@ void chmole_update(Actor *this){
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
){
player_getPosition(sp34);
if (ml_distance_vec3f(sp34, this->velocity) < this->actor_specific_1_f) {
if (ml_vec3f_distance(sp34, this->velocity) < this->actor_specific_1_f) {
chmole_startingDialog(this);
}
}

2
src/core2/ch/soundsource.c
View File

@@ -84,7 +84,7 @@ void func_802D07C8(Actor *this){
func_802D05A0(this, 1);
}
player_getPosition(sp2C);
sp28 = ml_distance_vec3f(sp2C, this->position);
sp28 = ml_vec3f_distance(sp2C, this->position);
if( this->state == 1){
if(sp28 < D_80367340[(s32)this->yaw].unk6*this->scale){
func_802D05A0(this, 2);

2
src/core2/ch/whipcrack.c
View File

@@ -105,7 +105,7 @@ void chwhipcrack_update(Actor *this){
__chwhipcrack_setState(this, 1);
}
player_getPosition(plyr_pos);
plyr_dist = ml_distance_vec3f(plyr_pos, this->position);
plyr_dist = ml_vec3f_distance(plyr_pos, this->position);
if(this->state == 1){
if(plyr_dist < 700.0f){
__chwhipcrack_setState(this, 2);

2
src/core2/code_16010.c
View File

@@ -188,7 +188,7 @@ bool func_8029D66C(void){
case MAP_31_RBB_RUSTY_BUCKET_BAY:
player_getPosition(sp2C);
return player_inWater() && func_80258424(sp2C, -9000.0f, -3000.0f, -3850.0f, -6820.0f, -700.0f, -1620.0f);
return player_inWater() && ml_vec3f_inside_box_f(sp2C, -9000.0f, -3000.0f, -3850.0f, -6820.0f, -700.0f, -1620.0f);
break;
case MAP_27_FP_FREEZEEZY_PEAK:

2
src/core2/code_34790.c
View File

@@ -217,7 +217,7 @@ f32 func_802BBEA4(f32 arg0[3], f32 arg1[3], f32 arg2, s32 arg3, s32 arg4) {
ml_vec3f_copy(sp4C, sp58[D_8037D8D0.unk30]);
sp38 = func_80320B98(arg0, sp4C, sp3C, arg4);
if (sp38 != NULL) {
phi_f2 = ml_distance_vec3f(arg0, sp4C);
phi_f2 = ml_vec3f_distance(arg0, sp4C);
D_8037D8D0.unk0[D_8037D8D0.unk30] = sp38->flags;
} else {
phi_f2 = arg2;

8
src/core2/code_45310.c
View File

@@ -47,7 +47,7 @@ bool func_802CC2A0(Actor *this) {
if (!this->marker->unk14_21) {
return TRUE;
}
ml_interpolate_vec3f(sp20, local->unk8, local->unk18, func_802575BC(local->unk4 + 0.05));
ml_vec3f_interpolate_fast(sp20, local->unk8, local->unk18, func_802575BC(local->unk4 + 0.05));
sp20[1] += 60.0f;
return func_80320DB0(sp20, 50.0f, sp2C, 0) == 0;
}
@@ -349,7 +349,7 @@ void func_802CCC5C(Actor *this) {
spB0 = (spB0 < spAC) ? spAC : MIN(spA8 , spB0);
}
sfxsource_playSfxAtVolume(local->unk0, spB0);
phi_f12 = 1.0f - ml_distance_vec3f(spC4, this->position) / 2000.0f;
phi_f12 = 1.0f - ml_vec3f_distance(spC4, this->position) / 2000.0f;
if(0.0f > phi_f12){
phi_f12 = 0.0f;
}
@@ -409,7 +409,7 @@ void func_802CCC5C(Actor *this) {
local->unk4 = 1.0f;
}
sp9C = func_802575BC(local->unk4);
ml_interpolate_vec3f(this->position, local->unk8, local->unk18, sp9C);
ml_vec3f_interpolate_fast(this->position, local->unk8, local->unk18, sp9C);
this->yaw = local->unk14 + (sp9C * (local->unk24 - local->unk14));
if ((skeletalAnim_getAnimId(this->unk148) == 0x10E) && (skeletalAnim_getLoopCount(this->unk148) > 0)) {
skeletalAnim_set(this->unk148, 0x10F, 0.1f, 0.45f);
@@ -453,7 +453,7 @@ void func_802CCC5C(Actor *this) {
sp68[1] = this->position[1];
sp68[2] = this->position[2];
sp68[0] = 0.0f;
if (ml_distance_vec3f(sp8C, sp68) < 800.0f) {
if (ml_vec3f_distance(sp8C, sp68) < 800.0f) {
spBC = 3;
}
}

18
src/core2/code_47BD0.c
View File

@@ -121,7 +121,7 @@ void func_802CEDE4(f32 target_position[3], f32 p_ctrl[3], f32 distance, f32 *arg
p_ctrl[1] = randf2(-distance, distance);
p_ctrl[2] = randf2(-distance, distance);
phi_s1++;
}while(phi_s1 < 10 && ml_distance_vec3f(target_position, p_ctrl) < distance);
}while(phi_s1 < 10 && ml_vec3f_distance(target_position, p_ctrl) < distance);
*arg3 = randf2(arg4, arg5);
}
@@ -236,7 +236,7 @@ void chBeeSwarm_802CF434(Actor *this) {
local = (ActorLocal_core2_47BD0 *) &this->local;
for(phi_s2 = 0, phi_s0 = local->unk8; phi_s2 < local->unk0; phi_s2++){
chBeeSwarm_802CF1C8(phi_s0->unk18, phi_s0->unk0, phi_s0->unkC, phi_s0->unk24[2], 150.0f, phi_s0->unk24, &sp58);
if (ml_distance_vec3f(phi_s0->unk0, phi_s0->unk18) < 50.0f) {
if (ml_vec3f_distance(phi_s0->unk0, phi_s0->unk18) < 50.0f) {
func_802CEEA4(this, phi_s0);
}
phi_s0++;
@@ -454,12 +454,12 @@ void chBeeSwarm_update(Actor *this) {
if (chBeeSwarm_802CF5E4(this)) {
subaddie_set_state(this, 2U);
}
if (ml_distance_vec3f(this->position, this->unk1C) < 50.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 50.0f) {
func_802CEF54(this, local->unkC, 100.0f);
}
break;
case 2:
if (ml_distance_vec3f(this->position, this->unk1C) < 50.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 50.0f) {
func_802CEF54(this, local->unkC, 100.0f);
}
chBeeSwarm_802CF518(this);
@@ -470,7 +470,7 @@ void chBeeSwarm_update(Actor *this) {
this->unk1C[2] = spB4[2];
this->unk1C[1] += 50.0f;
this->actor_specific_1_f = 400.0f;
if (ml_distance_vec3f(this->position, this->unk1C) < 100.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 100.0f) {
func_802CEF54(this, spB4, 50.0f);
subaddie_set_state(this, 4);
}
@@ -495,22 +495,22 @@ void chBeeSwarm_update(Actor *this) {
if (local->unk0 == 0) {
marker_despawn(this->marker);
}
if (ml_distance_vec3f(this->position, this->unk1C) < 50.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 50.0f) {
func_802CEF54(this, (s32 *) spB4, 50.0f);
}
if (ml_distance_vec3f(this->position, spB4) > 100.0f) {
if (ml_vec3f_distance(this->position, spB4) > 100.0f) {
subaddie_set_state(this, 3);
}
chBeeSwarm_802CF57C(this);
break;
case 5:
if (ml_distance_vec3f(this->position, this->unk1C) < 50.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 50.0f) {
subaddie_set_state(this, 2);
}
chBeeSwarm_802CF518(this);
break;
case 6:
if (ml_distance_vec3f(this->position, this->unk1C) < 50.0f) {
if (ml_vec3f_distance(this->position, this->unk1C) < 50.0f) {
subaddie_set_state(this, local->unk6);
}
break;

12
src/core2/code_5FD90.c
View File

@@ -206,21 +206,21 @@ bool func_802E74A0(f32 arg0[3], f32 arg1, f32 arg2[3], f32 arg3[3]) {
f32 sp24[3];
f32 sp20;
if (arg1 <= func_802560D0(arg2, arg3, arg0)) {
if (arg1 <= ml_func_802560D0(arg2, arg3, arg0)) {
return FALSE;
}
sp24[0] = (arg2[0] + arg3[0]) / 2;
sp24[1] = (arg2[1] + arg3[1]) / 2;
sp24[2] = (arg2[2] + arg3[2]) / 2;
sp20 = ml_distance_vec3f(sp24, arg0);
if ((ml_distance_vec3f(sp24, arg2) + arg1) <= sp20) {
sp20 = ml_vec3f_distance(sp24, arg0);
if ((ml_vec3f_distance(sp24, arg2) + arg1) <= sp20) {
return FALSE;
}
return TRUE;
}
bool func_802E7588(f32 arg0[3], f32 arg1, f32 arg2[3], f32 arg3) {
return (ml_distance_vec3f(arg0, arg2) < (arg1 + arg3));
return (ml_vec3f_distance(arg0, arg2) < (arg1 + arg3));
}
void calculateBoundsAndDirection(f32 startPoint[3], f32 endPoint[3], s32 minBounds[3], s32 maxBounds[3], f32 directionVector[3]) {
@@ -744,7 +744,7 @@ s32 func_802E9118(BKCollisionList * collision_list, BKVertexList *vtx_list, f32
s32 sp3C;
s32 i;
if (((f32)vtx_list->global_norm * arg4) <= (ml_distance_vec3f(arg6, arg2) - arg7)) {
if (((f32)vtx_list->global_norm * arg4) <= (ml_vec3f_distance(arg6, arg2) - arg7)) {
return 0;
}
mlMtxIdent();
@@ -981,7 +981,7 @@ s32 func_802E9DD8(BKCollisionList *collisionList, BKVertexList *vtxList, f32 pos
s32 i;
// check if (sphere around vtx's) <= ((distance between origins) - (radius of B))
if ((vtxList->global_norm * scaleA) <= (ml_distance_vec3f(posB, posA) - radB)) {
if ((vtxList->global_norm * scaleA) <= (ml_vec3f_distance(posB, posA) - radB)) {
return 0;
}
mlMtxIdent();

4
src/core2/code_637D0.c
View File

@@ -348,7 +348,7 @@ s32 func_802EB8A0(BKModelUnk14List *arg0, f32 *position, f32 *rotation, f32 scal
sp44[1] = sp5C[1] - sp68[1];
sp44[2] = sp5C[2] - sp68[2];
temp_f0 = gu_sqrtf(sp44[0]*sp44[0] + sp44[1]*sp44[1] + sp44[2]*sp44[2]);
if ((arg7 + temp_f0 >= ml_distance_vec3f(sp68, sp74))) {
if ((arg7 + temp_f0 >= ml_vec3f_distance(sp68, sp74))) {
return (s32) i_ptr->unk8;
}
}
@@ -530,7 +530,7 @@ s32 func_802EC238(BKModelUnk14List *arg0, f32 arg1[3], f32 rotation[3], f32 scal
sp40[1] = i_ptr->unk2[1];
sp40[2] = i_ptr->unk2[2];
scale = i_ptr->unk0;
if (ml_distance_vec3f(sp40, sp54) < scale)
if (ml_vec3f_distance(sp40, sp54) < scale)
return i_ptr->unk8;
if (!i_ptr->unk0){ }
}

2
src/core2/code_70F20.c
View File

@@ -166,7 +166,7 @@ void func_802F83AC(struct3s *arg0) {
arg0->unk1C++;
if (arg0->unk1C < vector_size(arg0->unk20)) {
temp_v0 = (struct4s *)vector_at(arg0->unk20, arg0->unk1C);
if (1210.0 < ml_distance_vec3f(temp_v0->unk0, sp3C)) {
if (1210.0 < ml_vec3f_distance(temp_v0->unk0, sp3C)) {
vector_remove(arg0->unk20, arg0->unk1C);
}
} else {

2
src/core2/code_71820.c
View File

@@ -168,7 +168,7 @@ void func_802F8CD0(struct6s * this){
this->unk18++;
if((s32)this->unk18 < vector_size(this->unk1C)){
iPtr = vector_at(this->unk1C, this->unk18);
if(1320.0 < ml_distance_vec3f(iPtr->unk4, plyr_pos)){
if(1320.0 < ml_vec3f_distance(iPtr->unk4, plyr_pos)){
vector_remove(this->unk1C, this->unk18);
}
}

2
src/core2/code_72060.c
View File

@@ -143,7 +143,7 @@ void func_802F919C(void) {
D_8036928C++;
if (D_8036928C < D_80369284) {
sp5C = &D_80369280[0].unk1C[D_8036928C];
if (ml_distance_vec3f((*sp5C).unk0, D_80381040) > 1300.0f) {
if (ml_vec3f_distance((*sp5C).unk0, D_80381040) > 1300.0f) {
func_802F9134(D_8036928C);
}
} else {

2
src/core2/code_7AF80.c
View File

@@ -1166,7 +1166,7 @@ bool func_80305248(f32 arg0[3], s32 arg1, s32 arg2){
}
bool func_8030526C(f32 arg0[3], s32 arg1, s32 arg2){
return func_8030515C(arg0, arg1, arg2, func_802586B0);
return func_8030515C(arg0, arg1, arg2, ml_vec3f_horizontal_distance_squared_zero_likely);
}
bool func_80305290(bool (* arg0)(NodeProp *), bool (* arg1)(Prop *)){

4
src/core2/code_85800.c
View File

@@ -535,7 +535,7 @@ void func_8030DB04(u8 indx, s32 arg1, f32 arg2[3], f32 min_dist, f32 max_dist){
f32 dist;
f32 temp_f2;
__sfx_getPlayerPositionIfPresent(sp24);
dist = ml_distance_vec3f(arg2, sp24);
dist = ml_vec3f_distance(arg2, sp24);
if(max_dist <= dist)
temp_f2 = 0.0f;
else{
@@ -903,7 +903,7 @@ void sfx_play(enum sfx_e uid, f32 volume, u32 sampleRate, f32 position[3], f32 m
f32 player_position[3];
__sfx_getPlayerPositionIfPresent(player_position);
if( !(maxFadeDistance <= ml_distance_vec3f(player_position, position))
if( !(maxFadeDistance <= ml_vec3f_distance(player_position, position))
&& levelSpecificFlags_validateCRC2()
&& dummy_func_80320240()
){

2
src/core2/code_956B0.c
View File

@@ -212,7 +212,7 @@ void func_8031CE70(f32 *arg0, enum map_e arg1, s32 arg2) {
if (phi_s0->unk8 == 0x186) {
phi_f2 = 1000.0f;
}
if (ml_distance_vec3f(arg0, sp38) < phi_f2) {
if (ml_vec3f_distance(arg0, sp38) < phi_f2) {
if (phi_s0->unk8 == 0x184) {
ncDynamicCamera_setUpdateEnabled(0);
func_8031CB50(arg1, arg2, 1);

2
src/core2/code_A4D00.c
View File

@@ -209,7 +209,7 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
arg0->position[0] = var_fp->unk0[0];
arg0->position[1] = var_fp->unk0[1];
arg0->position[2] = var_fp->unk0[2];
if ((temp_f20 != 0.0f) && ((ml_dotProduct_vec3f(var_fp->unk1C, sp284) / temp_f20) < 0.93969262)) {
if ((temp_f20 != 0.0f) && ((ml_vec3f_dot_product(var_fp->unk1C, sp284) / temp_f20) < 0.93969262)) {
var_fp = NULL;
}
}

6
src/core2/code_AC520.c
View File

@@ -44,7 +44,7 @@ extern void func_803334B0(f32 position[3], f32 rotation[3], f32 scale, f32 arg3[
D_80383570.unk44 = D_80383570.unk4;
iPtr = start_ptr;
for(; iPtr < end_ptr && D_80383570.unk44 < D_80383570.unk48; iPtr++){
if(iPtr->unk34 && ml_distance_vec3f(position, iPtr->unk0) < iPtr->unk1C + arg4){
if(iPtr->unk34 && ml_vec3f_distance(position, iPtr->unk0) < iPtr->unk1C + arg4){
mlMtx_apply_vec3f(iPtr->unkC, iPtr->unk0);
iPtr->unk20 = iPtr->unk18/scale;
iPtr->unk24 = iPtr->unk1C/scale;
@@ -157,7 +157,7 @@ s32 func_803339A4(f32 arg0[3]){
for(iPtr = beginPtr; iPtr < endPtr; iPtr++){
if(iPtr->unk34){
if(tmp_s0 == NULL || ml_distance_vec3f(arg0, iPtr->unk0) < ml_distance_vec3f(arg0, tmp_s0->unk0)){
if(tmp_s0 == NULL || ml_vec3f_distance(arg0, iPtr->unk0) < ml_vec3f_distance(arg0, tmp_s0->unk0)){
tmp_s0 = iPtr;
}
}
@@ -249,7 +249,7 @@ void func_80333D48(BKVertexList *arg0, f32 position[3], f32 rotation[3], f32 sca
for(struct_ptr_ptr = &D_80383570.unk4[0]; struct_ptr_ptr < D_80383570.unk44;struct_ptr_ptr++){
struct_ptr = *struct_ptr_ptr;
temp_f0 = ml_distance_vec3f(struct_ptr->unkC, sp74);
temp_f0 = ml_vec3f_distance(struct_ptr->unkC, sp74);
if (!(struct_ptr->unk24 <= temp_f0)) {
if (temp_f0 <= struct_ptr->unk20) {
sp68[0] = sp68[0] + struct_ptr->unk28[0];

2
src/core2/code_B9090.c
View File

@@ -20,7 +20,7 @@ bool func_80340020(Struct83s *self, f32 position[3], f32 arg2[3], f32 arg3, f32
}
self->unk1A = FALSE;
if (0.1 < ml_distance_vec3f(arg6, self->unk8)) {
if (0.1 < ml_vec3f_distance(arg6, self->unk8)) {
return FALSE;
}
for(i = 0; i < 3; i++){

2
src/core2/code_BE2C0.c
View File

@@ -97,7 +97,7 @@ void func_80345650(f32 arg0[4], f32 arg1[4], f32 arg2[4], f32 arg3) {
temp_f12 = (arg1[0]*arg2[0]) + (arg1[1]*arg2[1]) + (arg1[2]*arg2[2]) + (arg1[3]*arg2[3]);
if (0.00001 < (1.0 + temp_f12)) {
if (0.00001 < (1.0 - temp_f12)) {
sp3C = (BAD_PI/180.0) * func_80255D70(temp_f12);
sp3C = (BAD_PI/180.0) * ml_acosf_deg(temp_f12);
sp40 = sinf(sp3C);
if (0.0f != sp40) {
sp48 = sinf((1.0 - arg3) * sp3C) / sp40;

4
src/core2/code_C4B0.c
View File

@@ -296,7 +296,7 @@ void func_80293F0C(void){
f32 sp2C[3];
_player_getPosition(sp44);
if(map_get() == MAP_34_RBB_ENGINE_ROOM && func_80258424(sp44, -900.0f, -940.0f, 200.0f, 900.0f, 940.0f, 800.0f)){
if(map_get() == MAP_34_RBB_ENGINE_ROOM && ml_vec3f_inside_box_f(sp44, -900.0f, -940.0f, 200.0f, 900.0f, 940.0f, 800.0f)){
func_8031C5FC(D_8037C200, 150.0f);
} else{
func_8031C608(D_8037C200);
@@ -428,7 +428,7 @@ void func_80294480(f32 arg0[3]){
f32 func_802944A8(void){
f32 sp1C[3];
func_80294480(sp1C);
return func_80255D70(sp1C[1]);
return ml_acosf_deg(sp1C[1]);
}
void func_802944D0(f32 dst[3]){

4
src/core2/code_C62B0.c
View File

@@ -30,7 +30,7 @@ void func_8034D554(s32 *mesh_id, BKVtxRef *src, Vtx *dst, Struct6Ds *arg3){
temp_f0 = arg3->unk44 / arg3->unk48;
temp_f0 = temp_f0 * temp_f0 * temp_f0 * temp_f0;
ml_interpolate_vec3f(sp18, arg3->unk2C, arg3->unk38, temp_f0);
ml_vec3f_interpolate_fast(sp18, arg3->unk2C, arg3->unk38, temp_f0);
dst->v.ob[0] = (s16)(src->v.v.ob[0] + sp18[0]);
dst->v.ob[1] = (s16)(src->v.v.ob[1] + sp18[1]);
dst->v.ob[2] = (s16)(src->v.v.ob[2] + sp18[2]);
@@ -41,7 +41,7 @@ void func_8034D634(s32 *mesh_id, BKVtxRef *src, Vtx *dst, Struct6Ds *arg3){
f32 sp18[3];
temp_f0 = arg3->unk44 / arg3->unk48;
ml_interpolate_vec3f(sp18, arg3->unk2C, arg3->unk38, temp_f0);
ml_vec3f_interpolate_fast(sp18, arg3->unk2C, arg3->unk38, temp_f0);
dst->v.ob[0] = (s16)(src->v.v.ob[0] + sp18[0]);
dst->v.ob[1] = (s16)(src->v.v.ob[1] + sp18[1]);
dst->v.ob[2] = (s16)(src->v.v.ob[2] + sp18[2]);

2
src/core2/code_C89C0.c
View File

@@ -225,7 +225,7 @@ void func_80350250(void) {
if ((D_80386150.unk0 != NULL) && (func_80334904() == 2)) {
player_getPosition(sp7C);
for(var_s0 = D_80386150.unk8; var_s0 < D_80386150.unkC; var_s0++) {
var_s0->unk4 = (ml_distance_vec3f(var_s0->unkC, sp7C) < 2000.0f);
var_s0->unk4 = (ml_vec3f_distance(var_s0->unkC, sp7C) < 2000.0f);
if (var_s0->unk4) {
if (var_s0->unk8 > 0) {
var_s0->unk28 -= temp_f22;

8
src/core2/code_D0CA0.c
View File

@@ -43,7 +43,7 @@ bool func_80357C30(Actor *this) {
if (!this->marker->unk14_21) {
return TRUE;
}
ml_interpolate_vec3f(sp20, local->unk8, local->unk18, func_802575BC(local->unk4 + 0.05));
ml_vec3f_interpolate_fast(sp20, local->unk8, local->unk18, func_802575BC(local->unk4 + 0.05));
sp20[1] += 60.0f;
return !func_80320DB0(sp20, 50.0f, sp2C, 0);
}
@@ -334,7 +334,7 @@ void func_80358684(Actor *this) {
: sp84;
}
sfxsource_playSfxAtVolume(local->sfxsourceIdx, sp84);
sp78 = 1.0f - ml_distance_vec3f(sp94, this->position) / 2000.0f;
sp78 = 1.0f - ml_vec3f_distance(sp94, this->position) / 2000.0f;
sp78 = (0.0f > sp78) ? 0 : sp78;
if (sp78 > 0.0f) {
sfxsource_setSampleRate(local->sfxsourceIdx, (s32) (sp78 * 10000.0f));
@@ -390,7 +390,7 @@ void func_80358684(Actor *this) {
local->unk4 = 1.0f;
}
sp70 = func_802575BC(local->unk4);
ml_interpolate_vec3f(this->position, local->unk8, local->unk18, sp70);
ml_vec3f_interpolate_fast(this->position, local->unk8, local->unk18, sp70);
this->yaw = local->unk14 + (sp70 * (local->unk24 - local->unk14));
if ((skeletalAnim_getAnimId(this->unk148) == 0x23B) && (skeletalAnim_getLoopCount(this->unk148) > 0)) {
skeletalAnim_set(this->unk148, 0x23C, 0.1f, 0.45f);
@@ -416,7 +416,7 @@ void func_80358684(Actor *this) {
sp54[1] = this->position[1];
sp54[2] = this->position[2];
sp54[0] = 0.0f;
if (ml_distance_vec3f(sp60, sp54) < 800.0f) {
if (ml_vec3f_distance(sp60, sp54) < 800.0f) {
next_state = 3;
}
}

2
src/core2/code_DA3A0.c
View File

@@ -97,7 +97,7 @@ void func_8036158C(Actor *this){
if(this->state == 1){
player_getPosition(sp24);
actor_collisionOff(this);
if( ml_distance_vec3f(this->position, sp24) < 1000.0f
if( ml_vec3f_distance(this->position, sp24) < 1000.0f
&& viewport_isPointOutsideFrustum_3f(this->position_x, this->position_y, this->position_z)
&& ml_timer_update(&local->unk4, sp30)
){

2
src/core2/code_EE40.c
View File

@@ -33,7 +33,7 @@ void func_80295DD0(void){
void func_80295E74(void){
f32 sp1C[3];
_player_getPosition(sp1C);
if(!func_802584FC(sp1C, D_8037C3C0.unkC, D_8037C3C0.unk0)){
if(!ml_vec3f_inside_box_vec3f(sp1C, D_8037C3C0.unkC, D_8037C3C0.unk0)){
if(D_8037C3C0.unk18 == 0){
D_8037C3C0.unk18 = 1;
func_8029B6F0();

6
src/core2/nc/dynamicCam12.c
View File

@@ -100,7 +100,7 @@ f32 func_802C1030(struct56s *arg0, f32 arg1[3], f32 arg2[3]) {
ml_vec3f_set_length_copy(sp30, sp30, 400.0f);
ml_vec3f_add(sp3C, sp30, sp48);
func_80259554(sp54, sp48, sp3C, arg1);
return ml_distance_vec3f(sp54, arg2);
return ml_vec3f_distance(sp54, arg2);
}
else{
func_80323240(arg0, sp2C, sp54);
@@ -139,8 +139,8 @@ s32 func_802C11C8(f32 arg0[3]) {
sp3C = func_80323F74(sp2C, D_8037DBE0.unk8, -1000.0f);
func_80323240(sp2C, sp40, sp64);
func_80323240(sp2C, sp3C, sp58);
sp48 = ml_distance_vec3f(sp4C, sp64);
sp44 = ml_distance_vec3f(sp4C, sp58);
sp48 = ml_vec3f_distance(sp4C, sp64);
sp44 = ml_vec3f_distance(sp4C, sp58);
sp38 = 0.0f;
sp38 = 0.0f;
if (mlAbsF(sp48 - sp44) > 3.0f) {

2
src/core2/nc/dynamicCamera.c
View File

@@ -872,7 +872,7 @@ void func_802BE384(f32 arg0[3], f32 arg1[3], f32 arg2[3], f32 arg3[3], f32 arg4[
sp1C[0] = sp34[0] - sp28[0];
sp1C[1] = sp34[1] - sp28[1];
sp1C[2] = sp34[2] - sp28[2];
dp = -ml_dotProduct_vec3f(arg4, sp1C);
dp = -ml_vec3f_dot_product(arg4, sp1C);
arg3[0] += dp*arg4[0];
arg3[1] += dp*arg4[1];
arg3[2] += dp*arg4[2];

6
src/core2/nc/firstpersoncamera.c
View File

@@ -21,13 +21,13 @@ struct{
/* .code */
bool __ncFirstPersonCamera_fullyZoomedIn(void) {
return (ml_distance_vec3f(D_8037DC60.position, D_8037DC60.zoomed_in_position) < 40.0f);
return (ml_vec3f_distance(D_8037DC60.position, D_8037DC60.zoomed_in_position) < 40.0f);
}
void __ncFirstPersonCamera_getPositionAndRotation_entering(f32 arg0[3], f32 arg1[3]) {
s32 i;
func_80259430(&D_8037DC60.transistion_timer);
ml_sub_delta_time(&D_8037DC60.transistion_timer);
for( i = 0; i<3; i++){
D_8037DC60.position[i] = func_80257CF8(D_8037DC60.transistion_timer, 1.0f, 0.0f, D_8037DC60.zoomed_out_position[i], D_8037DC60.zoomed_in_position[i]);
D_8037DC60.rotation[i] = mlNormalizeAngle(D_8037DC60.zoomed_out_rotation[i] + func_80257CF8(D_8037DC60.transistion_timer, 0.5f, 0.0f, 0.0f, mlDiffDegF(D_8037DC60.zoomed_in_rotation[i], D_8037DC60.zoomed_out_rotation[i])));
@@ -46,7 +46,7 @@ void __ncFirstPersonCamera_getPositionAndRotation_entering(f32 arg0[3], f32 arg1
void __ncFirstPersonCamera_getPositionAndRotation_exiting(f32 arg0[3], f32 arg1[3]) {
s32 i;
func_80259430(&D_8037DC60.transistion_timer);
ml_sub_delta_time(&D_8037DC60.transistion_timer);
for( i = 0; i<3; i++){
D_8037DC60.position[i] = func_80257CF8(D_8037DC60.transistion_timer, 1.0f, 0.0f, D_8037DC60.zoomed_in_position[i], arg0[i]);
D_8037DC60.rotation[i] = mlNormalizeAngle(D_8037DC60.zoomed_in_rotation[i] + func_80257CF8(D_8037DC60.transistion_timer, 1.0f, 0.5f, 0.0f, mlDiffDegF(arg1[i], D_8037DC60.zoomed_in_rotation[i])));