mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-12 12:03:48 +00:00
Code Issues Projects Releases Wiki Activity

Format for angle macros changes

Browse source
This commit is contained in:
Dragorn421 2022-04-03 21:21:13 +02:00
parent 738b76fad4
commit 38f8b3962e
No known key found for this signature in database
GPG key ID: C182A3A3996E8201
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/code/db_camera.c
View file

@ -968,7 +968,8 @@ void DbCamera_Update(DbCamera* dbCamera, Camera* cam) {
}
OLib_Vec3fDiffToVecSphGeo(&spF4, sp80, sp7C);
DbCamera_CalcUpFromPitchYawRoll(&dbCamera->unk_1C, spF4.pitch, spF4.yaw, DEG_TO_BINANG_ALT(dbCamera->rollDegrees));
DbCamera_CalcUpFromPitchYawRoll(&dbCamera->unk_1C, spF4.pitch, spF4.yaw,
DEG_TO_BINANG_ALT(dbCamera->rollDegrees));
if (dbCamera->unk_00 == 1) {
if (CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_CRIGHT)) {
cam->inputDir = dbCamera->sub.unk_104A;

3
src/code/z_camera.c
View file

@ -7550,7 +7550,8 @@ Vec3s Camera_Update(Camera* camera) {
osSyncPrintf("camera: out (%f %f %f) (%f %f %f)\n", camera->at.x, camera->at.y, camera->at.z, camera->eye.x,
camera->eye.y, camera->eye.z);
osSyncPrintf("camera: dir (%f %d(%f) %d(%f)) (%f)\n", eyeAtAngle.r, eyeAtAngle.pitch,
BINANG_TO_DEG_ALT(eyeAtAngle.pitch), eyeAtAngle.yaw, BINANG_TO_DEG_ALT(eyeAtAngle.yaw), camera->fov);
BINANG_TO_DEG_ALT(eyeAtAngle.pitch), eyeAtAngle.yaw, BINANG_TO_DEG_ALT(eyeAtAngle.yaw),
camera->fov);
if (camera->player != NULL) {
osSyncPrintf("camera: foot(%f %f %f) dist (%f)\n", curPlayerPosRot.pos.x, curPlayerPosRot.pos.y,
curPlayerPosRot.pos.z, camera->dist);

3
src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -843,8 +843,7 @@ void BossGanondrof_Charge(BossGanondrof* this, GlobalContext* globalCtx) {
vecToLink.y = playerx->world.pos.y + 40.0f - thisx->world.pos.y;
vecToLink.z = playerx->world.pos.z - thisx->world.pos.z;
thisx->world.rot.y = thisx->shape.rot.y;
thisx->world.rot.x =
RAD_TO_BINANG(Math_FAtan2F(vecToLink.y, sqrtf(SQ(vecToLink.x) + SQ(vecToLink.z))));
thisx->world.rot.x = RAD_TO_BINANG(Math_FAtan2F(vecToLink.y, sqrtf(SQ(vecToLink.x) + SQ(vecToLink.z))));
}
func_8002D908(thisx);

4
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -3174,8 +3174,8 @@ void EnHorse_UpdateBgCheckInfo(EnHorse* this, GlobalContext* globalCtx) {
if (intersectDist < 30.0f) {
EnHorse_ResolveCollision(this, globalCtx, wall);
}
if ((Math_CosS(this->actor.world.rot.y - RAD_TO_BINANG(Math_FAtan2F(wall->normal.x, wall->normal.z)) -
0x7FFF) < 0.5f) ||
if ((Math_CosS(this->actor.world.rot.y - RAD_TO_BINANG(Math_FAtan2F(wall->normal.x, wall->normal.z)) - 0x7FFF) <
0.5f) ||
SurfaceType_IsHorseBlocked(&globalCtx->colCtx, wall, bgId) != 0) {
return;
}

2
src/overlays/actors/ovl_En_Niw/z_en_niw.c
View file

@ -840,7 +840,7 @@ void func_80AB7328(EnNiw* this, GlobalContext* globalCtx) {
this->actionFunc = EnNiw_ResetAction;
} else {
this->unk_2E4 = RAD_TO_BINANG(Math_FAtan2F(this->actor.world.pos.x - player->actor.world.pos.x,
this->actor.world.pos.z - player->actor.world.pos.z));
this->actor.world.pos.z - player->actor.world.pos.z));
func_80AB6100(this, globalCtx, 0);
func_80AB5BF8(this, globalCtx, 2);
}

2
src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c
View file

@ -475,7 +475,7 @@ void func_80B12460(EnSyatekiNiw* this, GlobalContext* globalCtx) {
Math_SmoothStepToS(&this->actor.world.rot.y,
RAD_TO_BINANG(Math_FAtan2F(player->actor.world.pos.x - this->actor.world.pos.x,
player->actor.world.pos.z - this->actor.world.pos.z)) +
player->actor.world.pos.z - this->actor.world.pos.z)) +
phi_f16,
5, this->unk_2C8.y, 0);
Math_ApproachF(&this->unk_2C8.y, 3000.0f, 1.0f, 500.0f);