Merge c601e48c10 into 1e94568a57

Enhancements/SuperMario3DWorld_Anisotropic/rules.txt

@@ -1,30 +0,0 @@
-[Definition]
-titleIds = 0005000010145D00,0005000010145C00,0005000010106100
-name = Anisotropic Filtering
-path = "Super Mario 3D World/Enhancements/Anisotropic Filtering"
-description = Anisotropic Filtering for smoother mipmaps.
-version = 4
-
-[Preset]
-name = 1x (Default)
-$anisoLevel = 1
-
-[Preset]
-name = 2x
-$anisoLevel = 2
-
-[Preset]
-name = 4x
-$anisoLevel = 4
-
-[Preset]
-name = 8x
-$anisoLevel = 8
-
-[Preset]
-name = 16x
-$anisoLevel = 16
-
-[TextureRedefine]
-formats = 0x31,0x32,0x33,0x34,0x35,0x431,0x432,0x433,0x434,0x435
-overwriteAnisotropy = $anisoLevel

Enhancements/SuperMario3DWorld_Shadows/rules.txt

@@ -1,33 +0,0 @@
-[Definition]
-titleIds = 0005000010145D00,0005000010145C00,0005000010106100
-name = Shadow Resolution
-path = "Super Mario 3D World/Graphics/Shadow Resolution"
-description = Note: Increasing shadow resolution is known to increase VRAM usage directly. Lowering this might give you a good boost in performance if you're limited on VRAM but makes shadows blockier. Medium is the original resolution.
-version = 4
-
-[Preset]
-name = Medium (100%, Default)
-$shadowRes = 1
-
-[Preset]
-name = Low (50%)
-$shadowRes = 0.5
-
-[Preset]
-name = High (200%)
-$shadowRes = 2
-
-[Preset]
-name = Ultra (300%)
-$shadowRes = 3
-
-[Preset]
-name = Extreme (400%, Unstable)
-$shadowRes = 4
-
-[TextureRedefine] # Shadows
-width = 1024
-height = 1024
-formats = 0x005
-overwriteWidth = $shadowRes * 1024
-overwriteHeight = $shadowRes * 1024

src/SuperMario3DWorld/Enhancements/Contrasty/be99d80628d31127_00000000000003c9_ps.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Enhancements/Contrasty/rules.txt

@@ -2,11 +2,11 @@
 titleIds = 0005000010145D00,0005000010145C00,0005000010106100
 name = Contrasty
 path = "Super Mario 3D World/Enhancements/Contrasty"
-description = This pack tweaks the colors and contrast to whatever preset you set it as. You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs. Doesn't work if you also upscale or downscale the resolution. Made by getdls.
-version = 4
+description = This pack tweaks the colors and contrast to whatever preset you set it as. You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs. Doesn't work if you also upscale or downscale the resolution.|Made by getdls.
+#Credits: getdls
+version = 6
 
-[Preset]
-name = Default
+[Default]
 $redShadows = 1.0
 $greenShadows = 1.0
 $blueSadows = 1.0
@@ -27,6 +27,9 @@ $crushContrast = 0.0
 $bleach = 1.0
 $sharp_mix = 0.0
 
+[Preset]
+name = Default
+
 [Preset]
 name = debug
 $redShadows = 1.0

src/SuperMario3DWorld/Enhancements/LevelofDetail/rules.txt

@@ -2,16 +2,19 @@
 titleIds = 0005000010145D00,0005000010145C00,0005000010106100
 name = Negative texture LOD bias
 path = "Super Mario 3D World/Enhancements/Texture LOD"
-description = Texture LOD override, possible shimmer but sharper textures. Made by Ryce-Fast.
-version = 4
+description = Texture LOD override, possible shimmer but sharper textures.|Made by Ryce-Fast.
+#Credits: Ryce-Fast
+version = 6
 
-[Preset]
-name = Default LOD
+[Default]
 $0x431 = 0
 $0x432 = 0
 $0x433 = 0
 $0x434 = 0
 
+[Preset]
+name = Default LOD
+
 [Preset]
 name = Slightly higher LOD
 $0x431 = -.5

src/SuperMario3DWorld/Graphics/1f83c0d47b1c4c34_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)

src/SuperMario3DWorld/Graphics/280351fcf8e5949f_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/470eee1bb25ab50d_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/4c426260188ace42_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/5661793d88425685_0000000007fffff9_ps.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)

src/SuperMario3DWorld/Graphics/6d9067fd20086bc0_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/842a19b509f8b91a_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)

src/SuperMario3DWorld/Graphics/8d68a0e3561ff525_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)

src/SuperMario3DWorld/Graphics/b727c08e3b534992_0000000007fffffd_ps.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #ifdef VULKAN
 #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location)

src/SuperMario3DWorld/Graphics/be99d80628d31127_00000000000003c9_ps.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN
@@ -18,11 +18,6 @@
 #endif
 // This shader was automatically converted to be cross-compatible with Vulkan and OpenGL.
 
-// shader be99d80628d31127 //AA PS
-// Used for: Another vertical blur
-const float resXScale =  float($width)/float($gameWidth);
-const float resYScale = float($height)/float($gameHeight); 
-
 #ifdef VULKAN
 layout(set = 1, binding = 2) uniform ufBlock
 {
@@ -33,6 +28,14 @@ uniform vec4 uf_fragCoordScale;
 uniform ivec4 uf_remappedPS[4];
 uniform vec2 uf_fragCoordScale;
 #endif
+
+// shader be99d80628d31127 //AA PS
+// Used for: Another vertical blur
+const float resXScale =  float($width)/float($gameWidth);
+const float resYScale = float($height)/float($gameHeight);
+#define AAENABLE $AAEnable
+
+#if (AAENABLE == 1)
 TEXTURE_LAYOUT(0, 1, 0) uniform sampler2D textureUnitPS0;
 TEXTURE_LAYOUT(1, 1, 1) uniform sampler2D textureUnitPS1;
 layout(location = 0) in vec4 passParameterSem2;
@@ -216,3 +219,4 @@ activeMaskStackC[1] = activeMaskStack[0] == true && activeMaskStackC[0] == true;
 // export
 passPixelColor0 = vec4(R4f.x, R4f.y, R4f.z, R4f.w);
 }
+#endif

src/SuperMario3DWorld/Graphics/c27612e2f7126ebf_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/c4eaec09897d525e_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/d9c81460d6984bb2_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/e4e4a60266119f75_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/fa47a4b5f1304f51_0000000000000000_vs.txt

@@ -1,4 +1,4 @@
-#version 420
+#version 430
 #extension GL_ARB_texture_gather : enable
 #extension GL_ARB_separate_shader_objects : enable
 #ifdef VULKAN

src/SuperMario3DWorld/Graphics/patch_resolution.asm

@@ -1,14 +1,14 @@
-[RedCarpetAspectUW]
-moduleMatches = 0xBBAF1908, 0xD2308838, 0xEB70C731
-# rodata constants
+[SuperMario3DWorld_AspectRatio]
+moduleMatches = 0xD2308838, 0xBBAF1908, 0xEB70C731 ; (EU), (NA), (JP)
+; rodata constants
 0x10363ED4 = .float $width/$height
 0x1036A688 = .float $width/$height
 _aspectAddr = 0x10363ED4
 
-# Aspect calculation
+; Aspect calculation
 0x0241D9B4 = lis r8, _aspectAddr@ha
 0x0241D9B8 = lfs f0, _aspectAddr@l(r8)
 
-# touch position fix
+; touch position fix
 0x0241D9D4 = lis r8, _aspectAddr@ha
 0x0241D9D8 = lfs f0, _aspectAddr@l(r8)

src/SuperMario3DWorld/Graphics/rules.txt

@@ -1,99 +1,179 @@
 [Definition]
 titleIds = 0005000010145D00,0005000010145C00,0005000010106100
-name = Resolution
-path = "Super Mario 3D World/Graphics/Resolution"
-description = Changes the resolution of the game. Made by Crementif and getdls.
-version = 4
+name = Graphics Settings
+path = "Super Mario 3D World/Graphics"
+description = Changes the resolution of the game and the quality of shadows.|Made by Crementif and getdls.
+#Credits: Crementif, getdls, Ryce-Fast
+version = 6
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
 $gameWidth = 1280
 $gameHeight = 720
+$shadowRes = 1
+$anisoLevel = 1
+$AAEnable:int = 1
 
 # Performance
 
 [Preset]
+category = Resolution
 name = 640x360
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 960x540
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
+
+[Preset]
+category = Resolution
+name = 1280x720 (Default)
+default = 1
 
 # Common HD Resolutions
 
 [Preset]
+category = Resolution
 name = 1600x900
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 1920x1080
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 2560x1440
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 3200x1800
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 3840x2160
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 5120x2880
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 7680x4320
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
 
 # Common Ultrawide Resolutions
 
 [Preset]
+category = Resolution
 name = 2560x1080 (Ultrawide)
 $width = 2560
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
+category = Resolution
 name = 3440x1440 (Ultrawide)
 $width = 3440
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
+
+
+
+[Preset]
+category = Shadows
+name = Low (50%)
+$shadowRes = 0.5
+
+[Preset]
+category = Shadows
+name = Medium (100%, Default)
+default = 1
+
+[Preset]
+category = Shadows
+name = High (200%)
+$shadowRes = 2
+
+[Preset]
+category = Shadows
+name = Ultra (300%)
+$shadowRes = 3
+
+[Preset]
+category = Shadows
+name = Extreme (400%, Unstable)
+$shadowRes = 4
+
+[Preset]
+category = Anisotropic Filtering
+name = 1x (Default)
+
+[Preset]
+category = Anisotropic Filtering
+name = 2x
+$anisoLevel = 2
+
+[Preset]
+category = Anisotropic Filtering
+name = 4x
+$anisoLevel = 4
+
+[Preset]
+category = Anisotropic Filtering
+name = 8x
+$anisoLevel = 8
+
+[Preset]
+category = Anisotropic Filtering
+name = 16x (Recommended)
+$anisoLevel = 16
+
+[Preset]
+category = Anisotropic Filtering
+name = 32x (Overkill)
+$anisoLevel = 32
+
+[Preset]
+category = Anti-Aliasing
+name = Enable
+$AAEnable:int = 1
+
+[Preset]
+category = Anti-Aliasing
+name = Disable
+$AAEnable:int = 0
+
+#ansio
+
+[TextureRedefine]
+formats = 0x31,0x32,0x33,0x34,0x35,0x431,0x432,0x433,0x434,0x435
+overwriteAnisotropy = $anisoLevel
+
+#Shadows
+
+[TextureRedefine]
+width = 1024
+height = 1024
+formats = 0x005
+overwriteWidth = $shadowRes * 1024
+overwriteHeight = $shadowRes * 1024
+
+#Resolution
 
 [TextureRedefine]
 width = 1280

src/SuperMario3DWorld/Mods/DrawDistance/patch_DrawDistance.asm

@@ -0,0 +1,9 @@
+[SuperMario3DWorld_DrawDistance]
+moduleMatches = 0xD2308838, 0xBBAF1908, 0xEB70C731 ; (EU), (NA), (JP)
+; patch object clip
+0x103693D8 = .float 700000.0  ; Distant clip (coins, boxes, enemies)
+0x103693DC = .float 4000.0    ; Lev obj draw
+0x10290DA4 = .float 200000.0  ; Passive movement patterns
+;0x103852B8 = .float 10000.0  ; map dist mtx??  ;trace
+;0x10368418 = .float 1500.0   ; plussy levels, glitches camera, glitches overworld  ;trace
+0x1036886C =  .float 1000000.0 ; World draw, check reasonable includes unintended areas.

src/SuperMario3DWorld/Mods/DrawDistance/rules.txt

@@ -0,0 +1,7 @@
+[Definition]
+titleIds = 0005000010145D00,0005000010145C00,0005000010106100
+name = Draw Distance
+path = "Super Mario 3D World/Mods/Draw Distance"
+description = Increases the draw distance of the game.|Has no effect on Plussy levels.|May load undesired objects in Bowser car fight levels.
+#Credits: getdls
+version = 6

src/SuperMario3DWorld/Mods/NoHUD/rules.txt

@@ -1,6 +1,7 @@
 [Definition]
-titleIds = 5000010145d00,5000010145c00
+titleIds = 0005000010145D00,0005000010145C00,0005000010106100
 name = Remove All HUD Elements
 path = "Super Mario 3D World/Mods/No HUD (breaks menus)"
-description = Disable most of the UI while playing.|Use it only for screenshots as it breaks some menus.||Made by @etra0.
+description = Disable most of the UI while playing.|Use it only for screenshots as it breaks some menus.|Made by @etra0.
+#Credits: @etra0
 version = 6