Applying sind/cosd/atan2d macros across the board (#518)
This commit is contained in:
mrshigure
GitHub
parent
40da624fe7
commit
2455408432
47 changed files with 3431 additions and 3414 deletions
|
|
@ -125,7 +125,7 @@ s32 fn_1_4A4(void)
|
|||
var_r30 = 1;
|
||||
}
|
||||
|
||||
var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
|
||||
var_f31 = sind(90.0f * var_f31) * sind(90.0f * var_f31);
|
||||
CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
|
||||
Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
|
||||
Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
|
||||
|
|
@ -152,7 +152,7 @@ s32 fn_1_6C8(void)
|
|||
var_r30 = 1;
|
||||
}
|
||||
|
||||
var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
|
||||
var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
|
||||
CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
|
||||
Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
|
||||
Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
|
||||
|
|
@ -282,7 +282,7 @@ u8 fn_1_E14(omObjData *arg0)
|
|||
var_f31 = 1.0f;
|
||||
var_r30 = 1;
|
||||
}
|
||||
var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
|
||||
var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
|
||||
CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
|
||||
Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
|
||||
Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
|
||||
|
|
@ -338,7 +338,7 @@ u8 fn_1_1138(omObjData *object)
|
|||
var_f31 = 1.0f;
|
||||
var_r28 = 1;
|
||||
}
|
||||
var_f31 = (sin((M_PI * (90.0f * var_f31)) / 180.0) * sin((M_PI * (90.0f * var_f31)) / 180.0));
|
||||
var_f31 = (sind(90.0f * var_f31) * sind(90.0f * var_f31));
|
||||
CZoom = fn_1_93C0(var_r31[0].zoom, var_r31[1].zoom, var_f31);
|
||||
Center.x = fn_1_93C0(var_r31[0].center.x, var_r31[1].center.x, var_f31);
|
||||
Center.y = fn_1_93C0(var_r31[0].center.y, var_r31[1].center.y, var_f31);
|
||||
|
|
@ -628,8 +628,8 @@ void fn_1_2470(omObjData *arg0)
|
|||
Hu3DModelShadowMapSet(arg0->model[0]);
|
||||
|
||||
for (var_r30 = 0; var_r30 < 5; var_r30++) {
|
||||
temp_f31 = (450.0 * cos(M_PI * lbl_1_data_0[var_r30] / 180.0));
|
||||
var_f29 = (450.0 * sin(M_PI * lbl_1_data_0[var_r30] / 180.0));
|
||||
temp_f31 = 450.0 * cosd(lbl_1_data_0[var_r30]);
|
||||
var_f29 = 450.0 * sind(lbl_1_data_0[var_r30]);
|
||||
Hu3DModelPosSet(arg0->model[var_r30 + 4], temp_f31, 0.0f, var_f29);
|
||||
var_f30 = 90.0f - lbl_1_data_0[var_r30];
|
||||
Hu3DModelRotSet(arg0->model[var_r30 + 4], 0.0f, var_f30, 0.0f);
|
||||
|
|
@ -705,7 +705,7 @@ void fn_1_2B04(omObjData *object)
|
|||
fn_1_4EEC(0x20, 0);
|
||||
return;
|
||||
}
|
||||
temp_f31 = sin((M_PI * (90.0f * temp_f31)) / 180.0);
|
||||
temp_f31 = sind(90.0f * temp_f31);
|
||||
temp_r31->center.y = (250.0f + (1750.0f * temp_f31));
|
||||
}
|
||||
Hu3DModelPosSet(object->model[3], temp_r31->center.x, temp_r31->center.y, temp_r31->center.z);
|
||||
|
|
@ -764,7 +764,7 @@ void fn_1_2D28(omObjData *object)
|
|||
if ((11 * REFRESH_RATE_F / 6) == lbl_1_data_F0[0]) {
|
||||
HuAudFXPlay(0x70A);
|
||||
}
|
||||
var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
|
||||
var_f31 = sind(90.0f * var_f31);
|
||||
temp_r31->center.y = (2000.0f + (-1750.0f * var_f31));
|
||||
break;
|
||||
case 0x2:
|
||||
|
|
@ -811,7 +811,7 @@ void fn_1_2D28(omObjData *object)
|
|||
fn_1_4EEC(7, 2);
|
||||
return;
|
||||
}
|
||||
var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
|
||||
var_f31 = sind(90.0f * var_f31);
|
||||
temp_r31->center.y = (250.0f + (1750.0f * var_f31));
|
||||
break;
|
||||
case 0x63:
|
||||
|
|
@ -1030,7 +1030,7 @@ void fn_1_46E0(omObjData *object)
|
|||
fn_1_4EEC(0x18, 0x10);
|
||||
HuAudFXPlay(0x70F);
|
||||
}
|
||||
var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
|
||||
var_f31 = sind(90.0f * var_f31);
|
||||
temp_r31->unk24 = (150.0f * var_f31);
|
||||
break;
|
||||
case 0x63:
|
||||
|
|
@ -1090,7 +1090,7 @@ void fn_1_4B44(omObjData *object)
|
|||
lbl_1_data_108[0] = 0;
|
||||
lbl_1_data_104[0]++;
|
||||
}
|
||||
var_f31 = sin((M_PI * (90.0f * var_f31)) / 180.0);
|
||||
var_f31 = sind(90.0f * var_f31);
|
||||
temp_r31->unk24 = (150.0f + (-150.0f * var_f31));
|
||||
break;
|
||||
case 1:
|
||||
|
|
|
|||
|
|
@ -255,7 +255,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk18.z = (700.0 * sind(lbl_1_data_250));
|
||||
var_f29 = (arg1->unk18.x - arg1->unk24.x);
|
||||
var_f28 = (arg1->unk18.z - arg1->unk24.z);
|
||||
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
|
||||
var_f30 = atan2d(var_f29, var_f28);
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f30 += 360.0f;
|
||||
}
|
||||
|
|
@ -310,7 +310,7 @@ void fn_1_B884(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk18.z = (arg1->unk5C * sind(lbl_1_data_250));
|
||||
var_f29 = (arg1->unk18.x - arg1->unk24.x);
|
||||
var_f28 = (arg1->unk18.z - arg1->unk24.z);
|
||||
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
|
||||
var_f30 = atan2d(var_f29, var_f28);
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f30 += 360.0f;
|
||||
}
|
||||
|
|
@ -551,7 +551,7 @@ void fn_1_C944(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk48 = arg1->unk48 & ~4;
|
||||
var_f26 = (arg1->unk18.x - arg1->unk24.x);
|
||||
var_f25 = (arg1->unk18.z - arg1->unk24.z);
|
||||
var_f29 = (180.0 * (atan2(var_f26, var_f25) / M_PI));
|
||||
var_f29 = atan2d(var_f26, var_f25);
|
||||
if (var_f29 < 0.0f) {
|
||||
var_f29 += 360.0f;
|
||||
}
|
||||
|
|
@ -920,7 +920,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk18.z = (arg1->unk5C * sind(lbl_1_bss_84));
|
||||
var_f29 = (arg1->unk18.x - arg1->unk24.x);
|
||||
var_f28 = (arg1->unk18.z - arg1->unk24.z);
|
||||
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
|
||||
var_f30 = atan2d(var_f29, var_f28);
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f30 += 360.0f;
|
||||
}
|
||||
|
|
@ -949,8 +949,8 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk60++;
|
||||
}
|
||||
var_f29 = arg1->unk5C + ((700.0f - arg1->unk5C) * var_f31);
|
||||
arg1->unk18.x = (var_f29 * cos(2.356194490192345)); // atan2(1.0, -1.0)
|
||||
arg1->unk18.z = (var_f29 * sin(2.356194490192345));
|
||||
arg1->unk18.x = var_f29 * cosd(135);
|
||||
arg1->unk18.z = var_f29 * sind(135);
|
||||
var_f29 = 0.3f;
|
||||
var_f28 = 0.6f;
|
||||
if (var_f31 >= var_f29) {
|
||||
|
|
@ -978,7 +978,7 @@ void fn_1_E034(omObjData *arg0, unkObjStruct *arg1)
|
|||
arg1->unk18.z = (700.0 * sind(lbl_1_bss_84));
|
||||
var_f29 = (arg1->unk18.x - arg1->unk24.x);
|
||||
var_f28 = (arg1->unk18.z - arg1->unk24.z);
|
||||
var_f30 = (180.0 * (atan2(var_f29, var_f28) / M_PI));
|
||||
var_f30 = atan2d(var_f29, var_f28);
|
||||
if (var_f30 < 0.0f) {
|
||||
var_f30 += 360.0f;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue