mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-10 11:35:19 -05:00
Code Issues Projects Releases Wiki Activity

Bump LUS for 2cyc color combiner fix (#4221)

Browse Source
This commit is contained in:
Archez 2024-07-15 22:24:38 -04:00 committed by GitHub
parent 839fcffe17
commit 73be4e5559
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -88,7 +88,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Set GBI version # Set GBI version
################################################################################ ################################################################################
add_compile_definitions(F3DEX_GBI_2) set(GBI_UCODE F3DEX_GBI_2)
################################################################################ ################################################################################
# Sub-projects # Sub-projects

2
libultraship

@ -1 +1 @@
Subproject commit 9907ebfd66ff5bf903ecb7327cca69014993772b Subproject commit 31e9b009f94e7074a847c7954926cba354cd7c72

16
soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
View File

@ -9,7 +9,6 @@ extern "C" {
#include "objects/object_gi_soldout/object_gi_soldout.h" #include "objects/object_gi_soldout/object_gi_soldout.h"
#include "objects/object_ik/object_ik.h" #include "objects/object_ik/object_ik.h"
#include "objects/object_link_child/object_link_child.h" #include "objects/object_link_child/object_link_child.h"
#include "objects/object_ru2/object_ru2.h"
uint32_t ResourceMgr_GameHasMasterQuest(); uint32_t ResourceMgr_GameHasMasterQuest();
uint32_t ResourceMgr_GameHasOriginal(); uint32_t ResourceMgr_GameHasOriginal();
@ -189,25 +188,10 @@ void PatchIronKnuckleTextureOverflow() {
} }
} }
void PatchPrincessRutoEaring() {
// FAST3D: This is a hack for the issue of both TEXEL0 and TEXEL1 using the same texture with different settings.
// Ruto's earring uses both TEXEL0 and TEXEL1 to render. The issue is that it never loads anything into TEXEL1, so
// it reuses whatever happens to be there, which is the water temple brick texture. It just so happens that the
// earring texture loads into the same place in TMEM as the brick texture, so when it comes to rendering, TEXEL1
// uses the earring texture with different clamp settings, and it displays without noticeable error. However, both
// texel samplers are not intended to be used for the same texture with different settings, so this misuse confuses
// our texture cache, and we load the wrong settings for the earrings texture. This patch is a hack that replaces
// TEXEL1 with TEXEL0, which is most likely the original intention, and all is well.
ResourceMgr_PatchGfxByName(gAdultRutoHeadDL, "RutoEaringTileFix", 162,
gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, ENVIRONMENT, 0, 0, 0, 0, COMBINED,
TEXEL0, 0, PRIM_LOD_FRAC, COMBINED));
}
void ApplyAuthenticGfxPatches() { void ApplyAuthenticGfxPatches() {
PatchDekuStickTextureOverflow(); PatchDekuStickTextureOverflow();
PatchFreezardTextureOverflow(); PatchFreezardTextureOverflow();
PatchIronKnuckleTextureOverflow(); PatchIronKnuckleTextureOverflow();
PatchPrincessRutoEaring();
} }
// Patches the Sold Out GI DL to render the texture in the mirror boundary // Patches the Sold Out GI DL to render the texture in the mirror boundary

3
soh/soh/SohGui.cpp
View File

@ -206,6 +206,9 @@ namespace SohGui {
} }
void Destroy() { void Destroy() {
auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
gui->RemoveAllGuiWindows();
mModalWindow = nullptr; mModalWindow = nullptr;
mAdvancedResolutionSettingsWindow = nullptr; mAdvancedResolutionSettingsWindow = nullptr;
mRandomizerSettingsWindow = nullptr; mRandomizerSettingsWindow = nullptr;