diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/libultra_code_O2/guPerspectiveF.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Diffstat (limited to 'src/libultra_code_O2/guPerspectiveF.c')
| -rw-r--r-- | src/libultra_code_O2/guPerspectiveF.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/libultra_code_O2/guPerspectiveF.c b/src/libultra_code_O2/guPerspectiveF.c index df69888cf..4418a6122 100644 --- a/src/libultra_code_O2/guPerspectiveF.c +++ b/src/libultra_code_O2/guPerspectiveF.c @@ -4,7 +4,9 @@ void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near f32 yscale; s32 row; s32 col; + guMtxIdentF(mf); + fovy *= GU_PI / 180.0; yscale = cosf(fovy / 2) / sinf(fovy / 2); mf[0][0] = yscale / aspect; @@ -13,11 +15,13 @@ void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near mf[2][3] = -1; mf[3][2] = 2 * near * far / (near - far); mf[3][3] = 0.0f; + for (row = 0; row < 4; row++) { for (col = 0; col < 4; col++) { mf[row][col] *= scale; } } + if (perspNorm != NULL) { if (near + far <= 2.0) { *perspNorm = 65535; @@ -30,7 +34,8 @@ void guPerspectiveF(f32 mf[4][4], u16* perspNorm, f32 fovy, f32 aspect, f32 near } } void guPerspective(Mtx* m, u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 far, f32 scale) { - f32 mat[4][4]; - guPerspectiveF(mat, perspNorm, fovy, aspect, near, far, scale); - guMtxF2L(mat, m); + f32 mf[4][4]; + + guPerspectiveF(mf, perspNorm, fovy, aspect, near, far, scale); + guMtxF2L((MtxF*)mf, m); } |