mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

Improve Matches: Part 3 (#1544)

Browse source 
* improve matchings

* spacing
This commit is contained in:
engineer124 2023-09-21 02:41:47 +10:00 • committed by GitHub
parent 72334df180
commit d7f6961918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 234 additions and 221 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -872,28 +872,29 @@ void EnViewer_UpdateGanondorfCape(PlayState* play, EnViewer* this) {
Vec3f forearmModelOffset;
Vec3f forearmWorldOffset;
if ((this->actor.params >> 8) == ENVIEWER_TYPE_5_GANONDORF) {
if (1) {}
sGanondorfCape->backPush = BREG(54) / 10.0f;
sGanondorfCape->backSwayMagnitude = (BREG(60) + 25) / 100.0f;
sGanondorfCape->sideSwayMagnitude = (BREG(55) - 45) / 10.0f;
sGanondorfCape->minY = -10000.0f;
sGanondorfCape->minDist = 0.0f;
sGanondorfCape->gravity = (BREG(67) - 10) / 10.0f;
forearmModelOffset.x = KREG(16) - 13.0f;
forearmModelOffset.y = KREG(17) + 3.0f + Math_SinS(yOscillationPhase) * KREG(20);
forearmModelOffset.z = KREG(18) - 10.0f;
yOscillationPhase += KREG(19) * 0x1000 + 0x2000;
Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW);
Matrix_MultVec3f(&forearmModelOffset, &forearmWorldOffset);
sGanondorfCape->rightForearmPos.x = sGanondorfNeckWorldPos.x + forearmWorldOffset.x;
sGanondorfCape->rightForearmPos.y = sGanondorfNeckWorldPos.y + forearmWorldOffset.y;
sGanondorfCape->rightForearmPos.z = sGanondorfNeckWorldPos.z + forearmWorldOffset.z;
forearmModelOffset.x = -(KREG(16) - 13.0f);
Matrix_MultVec3f(&forearmModelOffset, &forearmWorldOffset);
sGanondorfCape->leftForearmPos.x = sGanondorfNeckWorldPos.x + forearmWorldOffset.x;
sGanondorfCape->leftForearmPos.y = sGanondorfNeckWorldPos.y + forearmWorldOffset.y;
sGanondorfCape->leftForearmPos.z = sGanondorfNeckWorldPos.z + forearmWorldOffset.z;
if ((this->actor.params >> 8) != ENVIEWER_TYPE_5_GANONDORF) {
return;
}
sGanondorfCape->backPush = BREG(54) / 10.0f;
sGanondorfCape->backSwayMagnitude = (BREG(60) + 25) / 100.0f;
sGanondorfCape->sideSwayMagnitude = (BREG(55) - 45) / 10.0f;
sGanondorfCape->minY = -10000.0f;
sGanondorfCape->minDist = 0.0f;
sGanondorfCape->gravity = (BREG(67) - 10) / 10.0f;
forearmModelOffset.x = KREG(16) - 13.0f;
forearmModelOffset.y = KREG(17) + 3.0f + Math_SinS(yOscillationPhase) * KREG(20);
forearmModelOffset.z = KREG(18) - 10.0f;
yOscillationPhase += KREG(19) * 0x1000 + 0x2000;
Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y), MTXMODE_NEW);
Matrix_MultVec3f(&forearmModelOffset, &forearmWorldOffset);
sGanondorfCape->rightForearmPos.x = sGanondorfNeckWorldPos.x + forearmWorldOffset.x;
sGanondorfCape->rightForearmPos.y = sGanondorfNeckWorldPos.y + forearmWorldOffset.y;
sGanondorfCape->rightForearmPos.z = sGanondorfNeckWorldPos.z + forearmWorldOffset.z;
forearmModelOffset.x = -(KREG(16) - 13.0f);
Matrix_MultVec3f(&forearmModelOffset, &forearmWorldOffset);
sGanondorfCape->leftForearmPos.x = sGanondorfNeckWorldPos.x + forearmWorldOffset.x;
sGanondorfCape->leftForearmPos.y = sGanondorfNeckWorldPos.y + forearmWorldOffset.y;
sGanondorfCape->leftForearmPos.z = sGanondorfNeckWorldPos.z + forearmWorldOffset.z;
}