mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00
Code Issues Projects Releases Wiki Activity

Consistent naming for Math_ functions (#542)

Browse source 
* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* maths

* Factoriali -> Factorial

* soon, soon

* renames

* rand

* docs

* merged

* formatting

* little more cleanup

* asm crept back in

* changes to MathF

* smooth criminal

* functions.h
This commit is contained in:
petrie911 2020-12-26 04:44:53 -06:00 • committed by GitHub
parent 81c269b417
commit 8fa6cb6ff9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1329 changed files with 8413 additions and 8374 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Md/z_en_md.c
View file

@ -469,7 +469,7 @@ void EnMd_UpdateEyes(EnMd* this) {
if (DECR(this->blinkTimer) == 0) {
this->eyeIdx++;
if (this->eyeIdx > 2) {
this->blinkTimer = Math_Rand_S16Offset(30, 30);
this->blinkTimer = Rand_S16Offset(30, 30);
this->eyeIdx = 0;
}
}
@ -540,7 +540,7 @@ u8 EnMd_FollowPath(EnMd* this, GlobalContext* globalCtx) {
pathDiffX = pointPos->x - this->actor.posRot.pos.x;
pathDiffZ = pointPos->z - this->actor.posRot.pos.z;
Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, Math_atan2f(pathDiffX, pathDiffZ) * (65536.0f / (2 * M_PI)), 4,
Math_SmoothStepToS(&this->actor.posRot.rot.y, Math_FAtan2F(pathDiffX, pathDiffZ) * (65536.0f / (2 * M_PI)), 4,
4000, 1);
if ((SQ(pathDiffX) + SQ(pathDiffZ)) < 100.0f) {
@ -664,10 +664,10 @@ void func_80AAB948(EnMd* this, GlobalContext* globalCtx) {
yaw = Math_Vec3f_Yaw(&this->actor.initPosRot.pos, &actorToBlock->posRot.pos);
this->actor.posRot.pos.x = this->actor.initPosRot.pos.x;
this->actor.posRot.pos.x += 60.0f * Math_Sins(yaw);
this->actor.posRot.pos.x += 60.0f * Math_SinS(yaw);
this->actor.posRot.pos.z = this->actor.initPosRot.pos.z;
this->actor.posRot.pos.z += 60.0f * Math_Coss(yaw);
this->actor.posRot.pos.z += 60.0f * Math_CosS(yaw);
temp = fabsf((f32)this->actor.yawTowardsLink - yaw) * 0.001f * 3.0f;
this->skelAnime.animPlaybackSpeed = CLAMP(temp, 1.0f, 3.0f);
@ -791,8 +791,8 @@ s32 EnMd_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
}
if (((limbIndex == 9) || (limbIndex == 10)) || (limbIndex == 13)) {
rot->y += Math_Sins(this->unk_214[limbIndex]) * 200.0f;
rot->z += Math_Coss(this->unk_236[limbIndex]) * 200.0f;
rot->y += Math_SinS(this->unk_214[limbIndex]) * 200.0f;
rot->z += Math_CosS(this->unk_236[limbIndex]) * 200.0f;
}
return 0;