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

Rename MtxF members to use the common convention (#923)

Browse source 
* Rename MtxF members like xy -> now_21

* Revert comments I didn't mean to commit

* Rename c*/r* temps in `SkinMatrix_MtxFMtxFMult`

* Rename MtxF members like now_21 -> yx
This commit is contained in:
Dragorn421 2021-08-31 20:19:41 +02:00 • committed by GitHub
parent 7728f75d2a
commit 430a172183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 683 additions and 683 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/overlays/actors/ovl_En_Sw/z_en_sw.c
View file

@ -90,20 +90,20 @@ s32 func_80B0BE20(EnSw* this, CollisionPoly* poly) {
this->unk_37C.z = this->unk_37C.z * (1.0f / temp_f0);
this->unk_364 = sp44;
this->unk_3D8.xx = this->unk_370.x;
this->unk_3D8.xy = this->unk_370.y;
this->unk_3D8.xz = this->unk_370.z;
this->unk_3D8.xw = 0.0f;
this->unk_3D8.yx = this->unk_364.x;
this->unk_3D8.yy = this->unk_364.y;
this->unk_3D8.yz = this->unk_364.z;
this->unk_3D8.yw = 0.0f;
this->unk_3D8.zx = this->unk_37C.x;
this->unk_3D8.zy = this->unk_37C.y;
this->unk_3D8.zz = this->unk_37C.z;
this->unk_3D8.zw = 0.0f;
this->unk_3D8.yx = this->unk_370.y;
this->unk_3D8.zx = this->unk_370.z;
this->unk_3D8.wx = 0.0f;
this->unk_3D8.xy = this->unk_364.x;
this->unk_3D8.yy = this->unk_364.y;
this->unk_3D8.zy = this->unk_364.z;
this->unk_3D8.wy = 0.0f;
this->unk_3D8.xz = this->unk_37C.x;
this->unk_3D8.yz = this->unk_37C.y;
this->unk_3D8.zz = this->unk_37C.z;
this->unk_3D8.wz = 0.0f;
this->unk_3D8.xw = 0.0f;
this->unk_3D8.yw = 0.0f;
this->unk_3D8.zw = 0.0f;
this->unk_3D8.ww = 1.0f;
Matrix_MtxFToYXZRotS(&this->unk_3D8, &this->actor.world.rot, 0);
//! @bug: Does not return.
@ -405,20 +405,20 @@ s32 func_80B0CCF4(EnSw* this, f32* arg1) {
this->unk_37C.y *= temp_f0;
this->unk_37C.z *= temp_f0;
sp2C.xx = this->unk_370.x;
sp2C.xy = this->unk_370.y;
sp2C.xz = this->unk_370.z;
sp2C.xw = 0.0f;
sp2C.yx = this->unk_364.x;
sp2C.yy = this->unk_364.y;
sp2C.yz = this->unk_364.z;
sp2C.yw = 0.0f;
sp2C.zx = this->unk_37C.x;
sp2C.zy = this->unk_37C.y;
sp2C.zz = this->unk_37C.z;
sp2C.zw = 0.0f;
sp2C.yx = this->unk_370.y;
sp2C.zx = this->unk_370.z;
sp2C.wx = 0.0f;
sp2C.xy = this->unk_364.x;
sp2C.yy = this->unk_364.y;
sp2C.zy = this->unk_364.z;
sp2C.wy = 0.0f;
sp2C.xz = this->unk_37C.x;
sp2C.yz = this->unk_37C.y;
sp2C.zz = this->unk_37C.z;
sp2C.wz = 0.0f;
sp2C.xw = 0.0f;
sp2C.yw = 0.0f;
sp2C.zw = 0.0f;
sp2C.ww = 1.0f;
Matrix_MtxFToYXZRotS(&sp2C, &this->actor.world.rot, 0);
return true;