mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-04 06:54:33 +00:00
rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c (#181)
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c * pr updates
This commit is contained in:
krimtonz
GitHub
parent
69e30364b9
commit
d6fc300ed2
56 changed files with 501 additions and 503 deletions
|
|
@ -1850,7 +1850,7 @@ Vec3f* func_80043BC4(Vec3f* arg0, Vec3s* arg1) {
|
|||
|
||||
Vec3f* func_80043C28(Vec3f* arg0, Vec3f* arg1, VecSph* arg2) {
|
||||
Vec3f sp24, sp18;
|
||||
func_8007C25C(&sp18, arg2);
|
||||
OLib_VecSphRot90ToVec3f(&sp18, arg2);
|
||||
|
||||
sp24.x = arg1->x + sp18.x;
|
||||
sp24.y = arg1->y + sp18.y;
|
||||
|
|
@ -1880,12 +1880,12 @@ s32 func_80043D18(Camera* camera, Vec3f* arg1, struct_80043D18* arg2) {
|
|||
VecSph sp3C;
|
||||
|
||||
colCtx = &camera->globalCtx->colCtx;
|
||||
func_8007C490(&sp3C, arg1, &arg2->unk_00);
|
||||
OLib_Vec3fDiffToVecSphRot90(&sp3C, arg1, &arg2->unk_00);
|
||||
sp3C.r += 8.0f;
|
||||
func_80043C28(&sp5C, arg1, &sp3C);
|
||||
|
||||
if (func_8003DD6C(colCtx, arg1, &sp5C, &sp68, &arg2->unk_18, 1, 1, 1, -1, &arg2->unk_24) == 0) {
|
||||
func_8007C0F8(&sp50, arg1, &arg2->unk_00);
|
||||
OLib_Vec3fDistNormalize(&sp50, arg1, &arg2->unk_00);
|
||||
|
||||
arg2->unk_0C.x = -sp50.x;
|
||||
arg2->unk_0C.y = -sp50.y;
|
||||
|
|
@ -2152,7 +2152,7 @@ f32 func_80045714(Vec3f* arg0, s16 arg1, s16 arg2, f32 arg3) {
|
|||
VecSph sp1C;
|
||||
f32 sp18;
|
||||
|
||||
func_8007C3F4(&sp1C, arg0);
|
||||
OLib_Vec3fToVecSphRot90(&sp1C, arg0);
|
||||
sp18 = Math_Coss(sp1C.phi);
|
||||
sp18 = fabsf(Math_Coss(arg1 - sp1C.theta) * sp18);
|
||||
return Math_Coss(arg1 - arg2) * (sp18 * arg3);
|
||||
|
|
@ -2213,7 +2213,7 @@ s32 func_800458D4(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, s16 arg4) {
|
|||
}
|
||||
|
||||
sp48 = temp_s1->pos.y - *arg3;
|
||||
temp_ret = Math_atan2f(sp48, func_8007C028(&camera->at, &camera->eye)); // f2 and f14 are swapped
|
||||
temp_ret = Math_atan2f(sp48, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); // f2 and f14 are swapped
|
||||
|
||||
if (OREG(32) * (M_PI / 180) < temp_ret) {
|
||||
phi_f2 = 1.0f - sinf(temp_ret - OREG(32) * (M_PI / 180));
|
||||
|
|
@ -2509,8 +2509,8 @@ s32 Camera_Normal3(Camera* camera) {
|
|||
sp44 = &camera->at;
|
||||
sp40 = &camera->eyeNext;
|
||||
playerPostRot = &camera->playerPosRot;
|
||||
func_8007C490(&sp7C, sp44, sp48);
|
||||
func_8007C490(&sp74, sp44, sp40);
|
||||
OLib_Vec3fDiffToVecSphRot90(&sp7C, sp44, sp48);
|
||||
OLib_Vec3fDiffToVecSphRot90(&sp74, sp44, sp40);
|
||||
D_8011D3E8 = 1;
|
||||
D_8011D3A0.w = normal3->unk_1E;
|
||||
unk20 = &normal3->unk_20;
|
||||
|
|
@ -2565,7 +2565,7 @@ s32 Camera_Normal3(Camera* camera) {
|
|||
temp_f0 + (temp_f0 * (1.0f - camera->unk_E0)), 0xF);
|
||||
func_800466F8(camera, &sp74, normal3->unk_00, &unk20->unk_20, 1);
|
||||
sp90 = (normal3->unk_08 + normal3->unk_04) * 0.5f;
|
||||
func_8007C490(&sp84, sp44, sp40);
|
||||
OLib_Vec3fDiffToVecSphRot90(&sp84, sp44, sp40);
|
||||
sp84.r = func_800469C0(camera, sp84.r, normal3->unk_04, normal3->unk_08, unk20->unk_2A);
|
||||
camera->dist = sp84.r;
|
||||
if (0.001f < camera->unk_D8) {
|
||||
|
|
@ -2786,12 +2786,12 @@ s32 Camera_Unique6(Camera* camera) {
|
|||
playerPosRot = &camera->playerPosRot.pos;
|
||||
sp2C = *playerPosRot;
|
||||
sp2C.y += offset;
|
||||
camera->dist = func_8007BF90(&sp2C, &camera->eye);
|
||||
camera->dist = OLib_Vec3fDist(&sp2C, &camera->eye);
|
||||
camera->unk_E4.x = camera->at.x - playerPosRot->x;
|
||||
camera->unk_E4.y = camera->at.y - playerPosRot->y;
|
||||
camera->unk_E4.z = camera->at.z - playerPosRot->z;
|
||||
} else {
|
||||
camera->dist = func_8007BF90(&camera->at, &camera->eye);
|
||||
camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye);
|
||||
}
|
||||
if (camera->unk_00.sh[0] & 1) {
|
||||
if (camera->unk_160 > 0) {
|
||||
|
|
@ -2837,7 +2837,7 @@ void func_80054478(PosRot* arg0, Vec3f* arg1, Vec3f* arg2) {
|
|||
Vec3f sp1C;
|
||||
|
||||
Camera_Vec3fCopy(arg1, &sp1C);
|
||||
func_8007C3F4(&sp28, &sp1C);
|
||||
OLib_Vec3fToVecSphRot90(&sp28, &sp1C);
|
||||
sp28.theta += arg0->rot.y;
|
||||
func_80043C28(arg2, &arg0->pos, &sp28);
|
||||
}
|
||||
|
|
@ -2907,7 +2907,7 @@ s32 Camera_Demo1(Camera* camera) {
|
|||
}
|
||||
*eye = *eyeNext;
|
||||
camera->roll = sp4C * 256.0f;
|
||||
camera->dist = func_8007BF90(at, eye);
|
||||
camera->dist = OLib_Vec3fDist(at, eye);
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
|
|
@ -2985,7 +2985,7 @@ s32 Camera_Special0(Camera* camera) {
|
|||
camera->unk_E4.x = camera->at.x - playerPosRot->x;
|
||||
camera->unk_E4.y = camera->at.y - playerPosRot->y;
|
||||
camera->unk_E4.z = camera->at.z - playerPosRot->z;
|
||||
camera->dist = func_8007BF90(&camera->at, &camera->eye);
|
||||
camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye);
|
||||
camera->unk_D8 = 0.0f;
|
||||
if (camera->unk_160 > 0) {
|
||||
camera->unk_160--;
|
||||
|
|
@ -3900,7 +3900,7 @@ s32 func_8005AE64(Camera* camera, Camera* otherCamera) {
|
|||
camera->eyeNext = sp30;
|
||||
camera->eye = sp30;
|
||||
|
||||
camera->dist = func_8007BF90(&camera->at, &camera->eye);
|
||||
camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye);
|
||||
camera->fov = otherCamera->fov;
|
||||
camera->roll = otherCamera->roll;
|
||||
func_80043B60(camera);
|
||||
|
|
@ -3910,7 +3910,7 @@ s32 func_8005AE64(Camera* camera, Camera* otherCamera) {
|
|||
camera->unk_E4.x = camera->at.x - camera->playerPosRot.pos.x;
|
||||
camera->unk_E4.y = camera->at.y - camera->playerPosRot.pos.y;
|
||||
camera->unk_E4.z = camera->at.z - camera->playerPosRot.pos.z;
|
||||
camera->dist = func_8007BF90(&camera->playerPosRot.pos, &camera->eye);
|
||||
camera->dist = OLib_Vec3fDist(&camera->playerPosRot.pos, &camera->eye);
|
||||
camera->unk_CC.x = 1.0f;
|
||||
camera->unk_CC.y = 1.0f;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
#include <ultra64.h>
|
||||
#include <global.h>
|
||||
|
||||
Vec3f* func_8007C1AC(Vec3f* dest, VecSph* arg1);
|
||||
|
||||
f32 func_8007BF90(Vec3f* a, Vec3f* b) {
|
||||
f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b) {
|
||||
f32 dx = a->x - b->x;
|
||||
f32 dy = a->y - b->y;
|
||||
f32 dz = a->z - b->z;
|
||||
|
|
@ -11,7 +9,7 @@ f32 func_8007BF90(Vec3f* a, Vec3f* b) {
|
|||
return sqrtf(SQ(dx) + SQ(dy) + SQ(dz));
|
||||
}
|
||||
|
||||
f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) {
|
||||
f32 OLib_Vec3fDistOutDiff(Vec3f* a, Vec3f* b, Vec3f* dest) {
|
||||
dest->x = a->x - b->x;
|
||||
dest->y = a->y - b->y;
|
||||
dest->z = a->z - b->z;
|
||||
|
|
@ -19,7 +17,7 @@ f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) {
|
|||
return sqrtf(SQ(dest->x) + SQ(dest->y) + SQ(dest->z));
|
||||
}
|
||||
|
||||
f32 func_8007C028(Vec3f* a, Vec3f* b) {
|
||||
f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b) {
|
||||
return sqrtf(SQ(a->x - b->x) + SQ(a->z - b->z));
|
||||
}
|
||||
|
||||
|
|
@ -31,7 +29,7 @@ f32 func_8007C0A8(f32 arg0, f32 arg1) {
|
|||
return (fabsf(arg0) <= arg1) ? arg0 : ((arg0 >= 0) ? arg1 : -arg1);
|
||||
}
|
||||
|
||||
Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) {
|
||||
Vec3f* OLib_Vec3fDistNormalize(Vec3f* dest, Vec3f* a, Vec3f* b) {
|
||||
Vec3f v1;
|
||||
Vec3f v2;
|
||||
f32 temp;
|
||||
|
|
@ -51,93 +49,93 @@ Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) {
|
|||
return dest;
|
||||
}
|
||||
|
||||
Vec3f* func_8007C1AC(Vec3f* dest, VecSph* arg1) {
|
||||
Vec3f* OLib_VecSphToVec3f(Vec3f* dest, VecSph* sph) {
|
||||
Vec3f v;
|
||||
f32 sin4;
|
||||
f32 cos4;
|
||||
f32 sin6;
|
||||
f32 cos6;
|
||||
f32 sinPhi;
|
||||
f32 cosPhi;
|
||||
f32 sinTheta;
|
||||
f32 cosTheta;
|
||||
|
||||
cos4 = Math_Coss(arg1->phi);
|
||||
cos6 = Math_Coss(arg1->theta);
|
||||
sin4 = Math_Sins(arg1->phi);
|
||||
sin6 = Math_Sins(arg1->theta);
|
||||
cosPhi = Math_Coss(sph->phi);
|
||||
cosTheta = Math_Coss(sph->theta);
|
||||
sinPhi = Math_Sins(sph->phi);
|
||||
sinTheta = Math_Sins(sph->theta);
|
||||
|
||||
v.x = arg1->r * sin4 * sin6;
|
||||
v.y = arg1->r * cos4;
|
||||
v.z = arg1->r * sin4 * cos6;
|
||||
v.x = sph->r * sinPhi * sinTheta;
|
||||
v.y = sph->r * cosPhi;
|
||||
v.z = sph->r * sinPhi * cosTheta;
|
||||
|
||||
*dest = v;
|
||||
|
||||
return dest;
|
||||
}
|
||||
|
||||
void func_8007C25C(Vec3f* dest, VecSph* arg1) {
|
||||
VecSph var;
|
||||
void OLib_VecSphRot90ToVec3f(Vec3f* dest, VecSph* sph) {
|
||||
VecSph src;
|
||||
|
||||
var.r = arg1->r;
|
||||
var.phi = 0x3FFF - arg1->phi;
|
||||
var.theta = arg1->theta;
|
||||
src.r = sph->r;
|
||||
src.phi = 0x3FFF - sph->phi;
|
||||
src.theta = sph->theta;
|
||||
|
||||
func_8007C1AC(dest, &var);
|
||||
OLib_VecSphToVec3f(dest, &src);
|
||||
}
|
||||
|
||||
VecSph* func_8007C29C(VecSph* arg0, Vec3f* arg1) {
|
||||
VecSph sp28;
|
||||
VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec) {
|
||||
VecSph sph;
|
||||
|
||||
f32 distSquared;
|
||||
f32 dist;
|
||||
|
||||
distSquared = SQ(arg1->x) + SQ(arg1->z);
|
||||
distSquared = SQ(vec->x) + SQ(vec->z);
|
||||
dist = sqrtf(distSquared);
|
||||
|
||||
if ((dist == 0.0f) && (arg1->y == 0.0f)) {
|
||||
sp28.phi = 0;
|
||||
if ((dist == 0.0f) && (vec->y == 0.0f)) {
|
||||
sph.phi = 0;
|
||||
} else {
|
||||
sp28.phi = Math_atan2f(dist, arg1->y) * 57.295776f * 182.04167f + 0.5f;
|
||||
sph.phi = Math_atan2f(dist, vec->y) * 57.295776f * 182.04167f + 0.5f;
|
||||
}
|
||||
|
||||
sp28.r = sqrtf(SQ(arg1->y) + distSquared);
|
||||
if ((arg1->x == 0.0f) && (arg1->z == 0.0f)) {
|
||||
sp28.theta = 0;
|
||||
sph.r = sqrtf(SQ(vec->y) + distSquared);
|
||||
if ((vec->x == 0.0f) && (vec->z == 0.0f)) {
|
||||
sph.theta = 0;
|
||||
} else {
|
||||
sp28.theta = Math_atan2f(arg1->x, arg1->z) * 57.295776f * 182.04167f + 0.5f;
|
||||
sph.theta = Math_atan2f(vec->x, vec->z) * 57.295776f * 182.04167f + 0.5f;
|
||||
}
|
||||
|
||||
*arg0 = sp28;
|
||||
*dest = sph;
|
||||
|
||||
return arg0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
VecSph* func_8007C3F4(VecSph* arg0, Vec3f* arg1) {
|
||||
VecSph sp18;
|
||||
VecSph* OLib_Vec3fToVecSphRot90(VecSph* dest, Vec3f* vec) {
|
||||
VecSph sph;
|
||||
|
||||
func_8007C29C(&sp18, arg1);
|
||||
sp18.phi = 0x3FFF - sp18.phi;
|
||||
OLib_Vec3fToVecSph(&sph, vec);
|
||||
sph.phi = 0x3FFF - sph.phi;
|
||||
|
||||
*arg0 = sp18;
|
||||
*dest = sph;
|
||||
|
||||
return arg0;
|
||||
return dest;
|
||||
}
|
||||
|
||||
void func_8007C440(VecSph* arg0, Vec3f* a, Vec3f* b) {
|
||||
Vec3f var;
|
||||
VecSph* OLib_Vec3fDiffToVecSph(VecSph* dest, Vec3f* a, Vec3f* b) {
|
||||
Vec3f sph;
|
||||
|
||||
var.x = b->x - a->x;
|
||||
var.y = b->y - a->y;
|
||||
var.z = b->z - a->z;
|
||||
sph.x = b->x - a->x;
|
||||
sph.y = b->y - a->y;
|
||||
sph.z = b->z - a->z;
|
||||
|
||||
func_8007C29C(arg0, &var);
|
||||
return OLib_Vec3fToVecSph(dest, &sph);
|
||||
}
|
||||
|
||||
void func_8007C490(VecSph* arg0, Vec3f* a, Vec3f* b) {
|
||||
Vec3f var;
|
||||
VecSph* OLib_Vec3fDiffToVecSphRot90(VecSph* dest, Vec3f* a, Vec3f* b) {
|
||||
Vec3f sph;
|
||||
|
||||
var.x = b->x - a->x;
|
||||
var.y = b->y - a->y;
|
||||
var.z = b->z - a->z;
|
||||
sph.x = b->x - a->x;
|
||||
sph.y = b->y - a->y;
|
||||
sph.z = b->z - a->z;
|
||||
|
||||
func_8007C3F4(arg0, &var);
|
||||
return OLib_Vec3fToVecSphRot90(dest, &sph);
|
||||
}
|
||||
|
||||
Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) {
|
||||
|
|
@ -13,7 +13,7 @@ Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, VecSph* arg2) {
|
|||
Vec3f vec1;
|
||||
Vec3f vec2;
|
||||
|
||||
func_8007C25C(&vec2, arg2);
|
||||
OLib_VecSphRot90ToVec3f(&vec2, arg2);
|
||||
vec1.x = arg1->x + vec2.x;
|
||||
vec1.y = arg1->y + vec2.y;
|
||||
vec1.z = arg1->z + vec2.z;
|
||||
|
|
@ -34,7 +34,7 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) {
|
|||
vec.x = 0;
|
||||
vec.y = 0;
|
||||
vec.z = 0;
|
||||
func_8007C490(&struc1, unk5C, unk50);
|
||||
OLib_Vec3fDiffToVecSphRot90(&struc1, unk5C, unk50);
|
||||
struc2.r = req->y * y;
|
||||
struc2.phi = struc1.phi + req->unk_14.unk_00 + 0x4000;
|
||||
struc2.theta = struc1.theta + req->unk_14.unk_02;
|
||||
|
|
@ -367,8 +367,8 @@ s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData) {
|
|||
camData->zoom = shake.zoom;
|
||||
}
|
||||
|
||||
max = func_8007BF90(&shake.vec1, &vec) * absSpeedDiv;
|
||||
max2 = func_8007BF90(&shake.vec2, &vec) * absSpeedDiv;
|
||||
max = OLib_Vec3fDist(&shake.vec1, &vec) * absSpeedDiv;
|
||||
max2 = OLib_Vec3fDist(&shake.vec2, &vec) * absSpeedDiv;
|
||||
if (max < max2) {
|
||||
max = max2;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue