The-Homebrew-Cloud/Zelda64Recomp
2
0
Fork 0
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git synced 2024-11-07 15:15:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed telescope effect breaking when the scale is 0

Browse Source
This commit is contained in:
Mr-Wiseguy 2024-04-01 14:42:33 -04:00
parent 85936fcfa6
commit 9763cae32b
2 changed files with 55 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
patches/effect_patches.c
View File

@ -144,8 +144,9 @@ void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr texture, s32 fmt,
s32 height = 1 << maskt; s32 height = 1 << maskt;
f32 s; f32 s;
f32 t; f32 t;
s32 dtdy; // @recomp Use floats for dtdy and dsdx.
s32 dsdx; f32 dtdy;
f32 dsdx;
gDPLoadTextureBlock_4b(gfx++, texture, fmt, width, height, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, gDPLoadTextureBlock_4b(gfx++, texture, fmt, width, height, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP,
masks, maskt, G_TX_NOLOD, G_TX_NOLOD); masks, maskt, G_TX_NOLOD, G_TX_NOLOD);
@ -154,22 +155,23 @@ void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr texture, s32 fmt,
s = ((1.0f - (1.0f / arg6)) * (SCREEN_WIDTH / 2)) + 70.0f; s = ((1.0f - (1.0f / arg6)) * (SCREEN_WIDTH / 2)) + 70.0f;
t = ((1.0f - (1.0f / arg6)) * (SCREEN_HEIGHT / 2)) + 50.0f; t = ((1.0f - (1.0f / arg6)) * (SCREEN_HEIGHT / 2)) + 50.0f;
if (s < -1023.0f) { // @recomp Uncap the s and t calculations as they go into a matrix now instead of being used as texture coordinates.
s = -1023.0f; // if (s < -1023.0f) {
} // s = -1023.0f;
if (t < -1023.0f) { // }
t = -1023.0f; // if (t < -1023.0f) {
} // t = -1023.0f;
// }
if ((s <= -1023.0f) || (t <= -1023.0f)) { // if ((s <= -1023.0f) || (t <= -1023.0f)) {
dsdx = 0; // dsdx = 0;
dtdy = 0; // dtdy = 0;
} else { // } else {
dsdx = ((SCREEN_WIDTH - (2.0f * s)) / gScreenWidth) * (1 << 10); dsdx = ((SCREEN_WIDTH - (2.0f * s)) / gScreenWidth) * (1 << 10);
dtdy = ((SCREEN_HEIGHT - (2.0f * t)) / gScreenHeight) * (1 << 10); dtdy = ((SCREEN_HEIGHT - (2.0f * t)) / gScreenHeight) * (1 << 10);
} // }
// Push the old RDP/RSP params. // @recomp Push the old RDP/RSP params.
gEXPushProjectionMatrix(gfx++); gEXPushProjectionMatrix(gfx++);
gEXPushGeometryMode(gfx++); gEXPushGeometryMode(gfx++);
gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_PROJECTION_ID, G_EX_PUSH, G_MTX_PROJECTION, gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_PROJECTION_ID, G_EX_PUSH, G_MTX_PROJECTION,
@ -177,64 +179,68 @@ void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr texture, s32 fmt,
gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW, gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE); G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
// Allocate a matrix and vertices in the displaylist because there's no handle to the GfxContext here. // @recomp Allocate a matrix and vertices in the displaylist because there's no handle to the GfxContext here.
Mtx* ortho_matrix = (Mtx*)(gfx + 1); Mtx* ortho_matrix = (Mtx*)(gfx + 1);
Mtx* model_matrix = ortho_matrix + 1; Mtx* model_matrix = ortho_matrix + 1;
Gfx* after_matrix = (Gfx*)(model_matrix + 4); Gfx* after_matrix = (Gfx*)(model_matrix + 4);
gSPBranchList(gfx++, after_matrix); gSPBranchList(gfx++, after_matrix);
gfx = after_matrix; gfx = after_matrix;
// Set up an ortho projection matrix. // @recomp Set up an ortho projection matrix.
guOrtho(ortho_matrix, -SCREEN_WIDTH / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, -SCREEN_HEIGHT / 2, -1.0f, 1.0f, 1.0f); guOrtho(ortho_matrix, -SCREEN_WIDTH / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, -SCREEN_HEIGHT / 2, -1.0f, 1.0f, 1.0f);
gSPMatrix(gfx++, ortho_matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gfx++, ortho_matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
// Set up a scale model matrix, using the original texcoord scaling to calculate the matrix's scale. // @recomp Set up a scale model matrix, using the original texcoord scaling to calculate the matrix's scale.
guScale(model_matrix, 1024.0f / dsdx, 1024.0f / dtdy, 1.0f); float scale_x = 1024.0f / MAX((float)dsdx, 0.1f);
gSPMatrix(gfx++, model_matrix, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); float scale_y = 1024.0f / MAX((float)dtdy, 0.1f);
// Enable texturing and set geometry mode. if (arg6 == 0) {
scale_x = 0.0f;
scale_y = 0.0f;
}
guScale(model_matrix, scale_x, scale_y, 1.0f);
// @recomp Enable texturing and set geometry mode.
gSPTexture(gfx++, 0x8000 * width / 64, 0x8000 * height / 64, 0, G_TX_RENDERTILE, G_ON); gSPTexture(gfx++, 0x8000 * width / 64, 0x8000 * height / 64, 0, G_TX_RENDERTILE, G_ON);
gSPLoadGeometryMode(gfx++, 0); gSPLoadGeometryMode(gfx++, 0);
// @recomp Static variable to hold the lens overlay vertices.
static Vtx overlay_verts[] = { static Vtx overlay_verts[] = {
// The quad that holds the lens itself. // The quad that holds the lens itself.
{{{ -64, -64, 0}, 0, { 0, 0}, {0, 0, 0, 255}}}, {{{ -64, -64, 0}, 0, { 0, 0}, {0, 0, 0, 255}}},
{{{ 64, -64, 0}, 0, {512 << 5, 0}, {0, 0, 0, 255}}}, {{{ 64, -64, 0}, 0, {512 << 5, 0}, {0, 0, 0, 255}}},
{{{ -64, 64, 0}, 0, { 0, 512 << 5}, {0, 0, 0, 255}}}, {{{ -64, 64, 0}, 0, { 0, 512 << 5}, {0, 0, 0, 255}}},
{{{ 64, 64, 0}, 0, {512 << 5, 512 << 5}, {0, 0, 0, 255}}}, {{{ 64, 64, 0}, 0, {512 << 5, 512 << 5}, {0, 0, 0, 255}}},
// The top verts of the quad above the lens. // The verts of the quad around the lens overlay to fill in the rest of the screen.
{{{ -64, -1000, 0}, 0, { 0, 0}, {0, 0, 0, 255}}}, {{{-32000, -8000, 0}, 0, { 0, 0}, {0, 0, 0, 255}}},
{{{ 64, -1000, 0}, 0, {512 << 5, 0}, {0, 0, 0, 255}}}, {{{ 32000, -8000, 0}, 0, {512 << 5, 0}, {0, 0, 0, 255}}},
// The bottom verts of the quad below the lens. {{{-32000, 8000, 0}, 0, { 0, 512 << 5}, {0, 0, 0, 255}}},
{{{ -64, 1000, 0}, 0, { 0, 512 << 5}, {0, 0, 0, 255}}}, {{{ 32000, 8000, 0}, 0, {512 << 5, 512 << 5}, {0, 0, 0, 255}}},
{{{ 64, 1000, 0}, 0, {512 << 5, 512 << 5}, {0, 0, 0, 255}}},
// The left verts of the quad to the left of the lens.
{{{-4000, -1000, 0}, 0, { 0, 0}, {0, 0, 0, 255}}},
{{{-4000, 1000, 0}, 0, { 0, 512 << 5}, {0, 0, 0, 255}}},
// The right verts of the quad to the right of the lens.
{{{ 4000, -1000, 0}, 0, {512 << 5, 0}, {0, 0, 0, 255}}},
{{{ 4000, 1000, 0}, 0, {512 << 5, 512 << 5}, {0, 0, 0, 255}}},
}; };
// 8 4 5 10 // 4 5
// 0 1 // 0 1
// 2 3 // 2 3
// 9 6 7 11 // 6 7
// Load the verts. // @recomp Load the verts.
gSPVertex(gfx++, overlay_verts, ARRAY_COUNT(overlay_verts), 0); gSPMatrix(gfx++, model_matrix, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
// Draw the quad containing the lens overlay. gSPVertex(gfx++, &overlay_verts[0], 4, 0);
gSPMatrix(gfx++, &gIdentityMtx, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(gfx++, &overlay_verts[4], 4, 4);
// @recomp Draw the quad containing the lens overlay.
gSP2Triangles(gfx++, 0, 1, 3, 0x0, 0, 3, 2, 0x0); gSP2Triangles(gfx++, 0, 1, 3, 0x0, 0, 3, 2, 0x0);
// Draw the quad above the lens overlay. // @recomp Draw the quad above the lens overlay.
gSP2Triangles(gfx++, 4, 5, 1, 0x0, 4, 1, 0, 0x0); gSP2Triangles(gfx++, 4, 5, 1, 0x0, 4, 1, 0, 0x0);
// Draw the quad below the lens overlay. // @recomp Draw the quad below the lens overlay.
gSP2Triangles(gfx++, 2, 3, 7, 0x0, 2, 7, 6, 0x0); gSP2Triangles(gfx++, 2, 3, 7, 0x0, 2, 7, 6, 0x0);
// Draw the quad to the left of the lens overlay. // @recomp Draw the quad to the left of the lens overlay.
gSP2Triangles(gfx++, 8, 4, 6, 0x0, 8, 6, 9, 0x0); gSP2Triangles(gfx++, 4, 0, 2, 0x0, 4, 2, 6, 0x0);
// Draw the quad to the right of the lens overlay. // @recomp Draw the quad to the right of the lens overlay.
gSP2Triangles(gfx++, 5, 10, 11, 0x0, 5, 11, 7, 0x0); gSP2Triangles(gfx++, 1, 5, 7, 0x0, 1, 7, 3, 0x0);
// Restore the old RDP/RSP params. // @recomp Restore the old RDP/RSP params.
gEXPopProjectionMatrix(gfx++); gEXPopProjectionMatrix(gfx++);
gEXPopGeometryMode(gfx++); gEXPopGeometryMode(gfx++);
gSPPopMatrix(gfx++, G_MTX_MODELVIEW); gSPPopMatrix(gfx++, G_MTX_MODELVIEW);

2
patches/effect_transform_tagging.c
View File

@ -482,12 +482,10 @@ void EffStk_Draw(Actor* thisx, PlayState* play) {
Matrix_Translate(0.0f, 0.0f, this->unk148, MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, this->unk148, MTXMODE_APPLY);
Mtx* mtx = Matrix_NewMtx(play->state.gfxCtx); Mtx* mtx = Matrix_NewMtx(play->state.gfxCtx);
recomp_printf("EffStk_Draw matrix: %08X\n", (u32)mtx);
// @recomp Tag the transform. Do not allow edits as this will get edited by the billboard detection and we'll want to skip position during a camera cut too. // @recomp Tag the transform. Do not allow edits as this will get edited by the billboard detection and we'll want to skip position during a camera cut too.
if (camera_was_skipped()) { if (camera_was_skipped()) {
gEXMatrixGroupDecomposedSkipPosRot(POLY_XLU_DISP++, actor_transform_id(thisx), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); gEXMatrixGroupDecomposedSkipPosRot(POLY_XLU_DISP++, actor_transform_id(thisx), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);
recomp_printf(" Skipped EffStk_Draw matrix\n");
} }
else { else {
gEXMatrixGroupDecomposedNormal(POLY_XLU_DISP++, actor_transform_id(thisx), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE); gEXMatrixGroupDecomposedNormal(POLY_XLU_DISP++, actor_transform_id(thisx), G_EX_PUSH, G_MTX_MODELVIEW, G_EX_EDIT_NONE);