mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-07-29 07:33:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

code_80106550 / llcvt.c and code_80104450 / ortho.c OK (#163)

Browse Source 
* llcvt.c OK, added script from mm decomp to set mips3

* ortho.c OK

* added entries to functions.h

* named guNormalize.s
This commit is contained in:
Lucas Shaw
2020-05-27 00:48:07 -07:00
committed by GitHub
parent c68d752813
commit 02fc5287cc
14 changed files with 118 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_demo.c
+1 -1
View File
@@ -2063,4 +2063,4 @@ void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) {
} else {
globalCtx->csCtx.segment = (void*)segment;
}
}
}
src/code/z_fbdemo_triforce.c
+1 -1
View File
@@ -32,7 +32,7 @@ void TransitionTriforce_Start(TransitionTriforce* this) {
TransitionTriforce* TransitionTriforce_Init(TransitionTriforce* this) {
bzero(this, sizeof(*this));
func_801045A4(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f);
guOrtho(&this->projection, -160.0f, 160.0f, -120.0f, 120.0f, -1000.0f, 1000.0f, 1.0f);
this->transPos = 1.0f;
this->state = 2;
this->step = 0.015f;
src/code/z_view.c
+6 -6
View File
@@ -400,8 +400,8 @@ s32 func_800AB0A8(View* view) {
LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744);
view->projectionPtr = projection;
func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
view->projection = *projection;
@@ -438,8 +438,8 @@ s32 func_800AB2C4(View* view) {
LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791);
view->projectionPtr = projection;
func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
view->projection = *projection;
@@ -551,8 +551,8 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) {
LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921);
view->projectionPtr = projection;
func_801045A4(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f,
(f32)gScreenHeight * 0.5f, view->zNear, view->zFar, view->scale);
view->projection = *projection;
src/libultra_code/llcvt.c
+33
View File
@@ -0,0 +1,33 @@
#include <global.h>
s64 __d_to_ll(f64 d) {
return d;
}
s64 __f_to_ll(f32 f) {
return f;
}
u64 __d_to_ull(f64 d) {
return d;
}
u64 __f_to_ull(f32 f) {
return f;
}
f64 __ll_to_d(s64 l) {
return l;
}
f32 __ll_to_f(s64 l) {
return l;
}
f64 __ull_to_d(u64 l) {
return l;
}
f32 __ull_to_f(u64 l) {
return l;
}
src/libultra_code/ortho.c
+30
View File
@@ -0,0 +1,30 @@
#include <ultra64.h>
#include <global.h>
void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) {
s32 i, j;
guMtxIdentF(mf);
mf[0][0] = 2 / (right - left);
mf[1][1] = 2 / (top - bottom);
mf[2][2] = -2 / (far - near);
mf[3][0] = -(right + left) / (right - left);
mf[3][1] = -(top + bottom) / (top - bottom);
mf[3][2] = -(far + near) / (far - near);
mf[3][3] = 1;
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
mf[i][j] *= scale;
}
}
}
void guOrtho(Mtx* mtx, f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) {
MtxF_t mf;
guOrthoF(mf, left, right, bottom, top, near, far, scale);
guMtxF2L(mf, mtx);
}