From 5a80cd028c5fa36936b83e4918f54be8c996b03e Mon Sep 17 00:00:00 2001 From: Reonu Date: Sat, 25 May 2024 17:42:28 +0100 Subject: [PATCH 1/4] WIP HD texture support --- lib/rt64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rt64 b/lib/rt64 index e106c18..ca347e1 160000 --- a/lib/rt64 +++ b/lib/rt64 @@ -1 +1 @@ -Subproject commit e106c18965a89b26197bde972d9a83dd2dea1691 +Subproject commit ca347e15bda28cca904923247217dc4853d9907d From 1978a726905686553b6bc643b91d2c3987cc1761 Mon Sep 17 00:00:00 2001 From: Wiseguy <68165316+Mr-Wiseguy@users.noreply.github.com> Date: Sat, 25 May 2024 12:58:47 -0400 Subject: [PATCH 2/4] Remove STB implementation as it's already defined in RT64 --- src/main/main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/main.cpp b/src/main/main.cpp index d3961a2..3e2a919 100644 --- a/src/main/main.cpp +++ b/src/main/main.cpp @@ -38,7 +38,6 @@ #include "SDL_syswm.h" #endif -#define STB_IMAGE_IMPLEMENTATION #include "../../lib/rt64/src/contrib/stb/stb_image.h" template From b9b567e024ad4326b5352a7f193a424f54c9cfd2 Mon Sep 17 00:00:00 2001 From: Mr-Wiseguy Date: Fri, 31 May 2024 18:46:36 -0400 Subject: [PATCH 3/4] Fix texcoords for seamless pause background patch --- patches/fixes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/fixes.c b/patches/fixes.c index f46bb86..f99920b 100644 --- a/patches/fixes.c +++ b/patches/fixes.c @@ -58,13 +58,13 @@ s16 KaleidoScope_SetPageVertices(PlayState* play, Vtx* vtx, s16 vtxPage, s16 num #define PIXEL_OFFSET ((1 << 4)) vtx[4 * row + 0].v.tc[0] = PIXEL_OFFSET; - vtx[4 * row + 0].v.tc[1] = (1 << 5) + PIXEL_OFFSET; + vtx[4 * row + 0].v.tc[1] = PIXEL_OFFSET; vtx[4 * row + 1].v.tc[0] = PAGE_BG_WIDTH * (1 << 5) + PIXEL_OFFSET; - vtx[4 * row + 1].v.tc[1] = (1 << 5) + PIXEL_OFFSET; + vtx[4 * row + 1].v.tc[1] = PIXEL_OFFSET; vtx[4 * row + 2].v.tc[0] = PIXEL_OFFSET; - vtx[4 * row + 2].v.tc[1] = (cur_y - next_y + 1) * (1 << 5) + PIXEL_OFFSET; + vtx[4 * row + 2].v.tc[1] = (cur_y - next_y) * (1 << 5) + PIXEL_OFFSET; vtx[4 * row + 3].v.tc[0] = PAGE_BG_WIDTH * (1 << 5) + PIXEL_OFFSET; - vtx[4 * row + 3].v.tc[1] = (cur_y - next_y + 1) * (1 << 5) + PIXEL_OFFSET; + vtx[4 * row + 3].v.tc[1] = (cur_y - next_y) * (1 << 5) + PIXEL_OFFSET; vtx[4 * row + 0].v.cn[0] = vtx[4 * row + 1].v.cn[0] = vtx[4 * row + 2].v.cn[0] = vtx[4 * row + 3].v.cn[0] = 0; vtx[4 * row + 0].v.cn[1] = vtx[4 * row + 1].v.cn[1] = vtx[4 * row + 2].v.cn[1] = vtx[4 * row + 3].v.cn[1] = 0; @@ -245,7 +245,7 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, TexturePtr* textures G_IM_FMT_IA, G_IM_SIZ_8b, // fmt, siz PAGE_BG_WIDTH + 2, PAGE_BG_HEIGHT + 2, // width, height 0, (bg_row + 0) * RECOMP_PAGE_ROW_HEIGHT, // uls, ult - PAGE_BG_WIDTH + 2, (bg_row + 1) * RECOMP_PAGE_ROW_HEIGHT + 2, // lrs, lrt + PAGE_BG_WIDTH + 2 - 1, (bg_row + 1) * RECOMP_PAGE_ROW_HEIGHT + 2 - 1, // lrs, lrt 0, // pal G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, @@ -253,8 +253,8 @@ Gfx* KaleidoScope_DrawPageSections(Gfx* gfx, Vtx* vertices, TexturePtr* textures gDPSetTileSize(gfx++, G_TX_RENDERTILE, 0 << G_TEXTURE_IMAGE_FRAC, 0 << G_TEXTURE_IMAGE_FRAC, - (PAGE_BG_WIDTH + 2) < Date: Wed, 19 Jun 2024 23:06:36 -0400 Subject: [PATCH 4/4] Update RT64 to fix HD texture max mipmap selection issue --- lib/rt64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rt64 b/lib/rt64 index ca347e1..55ffc5e 160000 --- a/lib/rt64 +++ b/lib/rt64 @@ -1 +1 @@ -Subproject commit ca347e15bda28cca904923247217dc4853d9907d +Subproject commit 55ffc5e786b47e9139cf175c3cc3af62d56d5d31