From 2f42cc9fb6fff673bcb41bb5926f9fc40ff335a3 Mon Sep 17 00:00:00 2001 From: LAX1DUDE Date: Fri, 30 Dec 2022 00:04:21 -0800 Subject: [PATCH] Update #7 - FXAA Improvements aye look at those eagler patch file changes, you can finally see what I actually did --- buildtools/BuildTools.jar | Bin 222220 -> 222392 bytes client_version | 2 +- .../client/renderer/EntityRenderer.edit.java | 10 +++--- .../client/settings/GameSettings.edit.java | 32 ++++++++++++------ .../assets/minecraft/lang/en_US.edit.lang | 5 +-- .../eaglercraft/v1_8/EaglercraftVersion.java | 4 +-- .../assets/eagler/glsl/post_fxaa.fsh | 20 ++++++----- 7 files changed, 44 insertions(+), 29 deletions(-) diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index 9ab1a21c18a7870b38ba4cc88a51c0f36002364d..b035cc994902ef04bc95339d619541570e169c0c 100644 GIT binary patch delta 19710 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 z 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 al`5o(N>jYEI4%=^H@I>5A7yy@a{mL8gITQr diff --git a/client_version b/client_version index 3dfbff8..f0cf776 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u6 \ No newline at end of file +u7 \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java index 832fc53..123879f 100644 --- a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.edit.java @@ -147,17 +147,19 @@ ~ EaglercraftGPU.glLineWidth(1.0F); -> INSERT 26 : 31 @ 26 +> INSERT 26 : 33 @ 26 + -+ if (this.mc.gameSettings.fxaa) { ++ boolean fxaa = (this.mc.gameSettings.fxaa == 0 && this.mc.gameSettings.fancyGraphics) ++ || this.mc.gameSettings.fxaa == 1; ++ if (fxaa) { + EffectPipelineFXAA.begin(this.mc.displayWidth, this.mc.displayHeight); + } + -> INSERT 21 : 25 @ 16 +> INSERT 23 : 27 @ 16 -+ if (this.mc.gameSettings.fxaa) { ++ if (fxaa) { + EffectPipelineFXAA.end(); + } + diff --git a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java index 5eb29d3..c0b5619 100644 --- a/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java +++ b/patches/minecraft/net/minecraft/client/settings/GameSettings.edit.java @@ -83,7 +83,7 @@ + public boolean hud24h = false; + public boolean chunkFix = true; + public boolean fog = true; -+ public boolean fxaa = true; ++ public int fxaa = 0; > CHANGE 10 : 11 @ 1 : 2 @@ -159,13 +159,13 @@ + } + + if (parOptions == GameSettings.Options.FXAA) { -+ this.fxaa = !this.fxaa; ++ this.fxaa = (this.fxaa + parInt1) % 3; + } + > DELETE 90 @ 54 : 60 -> INSERT 12 : 30 @ 18 +> INSERT 12 : 28 @ 18 + case HUD_COORDS: + return this.hudCoords; @@ -183,10 +183,8 @@ + return this.chunkFix; + case FOG: + return this.fog; -+ case FXAA: -+ return this.fxaa; -> CHANGE 61 : 64 @ 43 : 47 +> CHANGE 59 : 62 @ 43 : 47 ~ : (parOptions == GameSettings.Options.CHAT_SCALE ~ ? s + (int) (f * 90.0F + 10.0F) + "%" @@ -222,7 +220,18 @@ ~ + "%") ~ : "yee")))))))))))); -> CHANGE 54 : 56 @ 69 : 70 +> INSERT 47 : 55 @ 62 + ++ } else if (parOptions == GameSettings.Options.FXAA) { ++ if (this.fxaa == 0) { ++ return s + I18n.format("options.fxaa.auto"); ++ } else if (this.fxaa == 1) { ++ return s + I18n.format("options.on"); ++ } else { ++ return s + I18n.format("options.off"); ++ } + +> CHANGE 15 : 17 @ 7 : 8 ~ byte[] options = EagRuntime.getStorage("g"); ~ if (options == null) { @@ -254,7 +263,7 @@ > DELETE 4 @ 8 : 12 -> INSERT 116 : 152 @ 120 +> INSERT 116 : 153 @ 120 + if (astring[0].equals("hudFps")) { + this.hudFps = astring[1].equals("true"); @@ -289,11 +298,12 @@ + } + + if (astring[0].equals("fxaa")) { -+ this.fxaa = astring[1].equals("true"); ++ this.fxaa = (astring[1].equals("true") || astring[1].equals("false")) ? 0 ++ : Integer.parseInt(astring[1]); + } + -> INSERT 42 : 44 @ 6 +> INSERT 43 : 45 @ 6 + Keyboard.setFunctionKeyModifier(keyBindFunction.getKeyCode()); + @@ -366,6 +376,6 @@ ~ HUD_COORDS("options.hud.coords", false, true), HUD_STATS("options.hud.stats", false, true), ~ HUD_WORLD("options.hud.world", false, true), HUD_PLAYER("options.hud.player", false, true), ~ HUD_24H("options.hud.24h", false, true), CHUNK_FIX("options.chunkFix", false, true), -~ FOG("options.fog", false, true), FXAA("options.fxaa", false, true); +~ FOG("options.fog", false, true), FXAA("options.fxaa", false, false); > EOF diff --git a/patches/resources/assets/minecraft/lang/en_US.edit.lang b/patches/resources/assets/minecraft/lang/en_US.edit.lang index c042a37..36efd61 100644 --- a/patches/resources/assets/minecraft/lang/en_US.edit.lang +++ b/patches/resources/assets/minecraft/lang/en_US.edit.lang @@ -12,7 +12,7 @@ ~ eaglercraft.recording.start=Record Screen... ~ eaglercraft.soundCategory.voice=Voice -> INSERT 5 : 71 @ 8 +> INSERT 5 : 72 @ 8 + eaglercraft.resourcePack.prompt.title=What do you want to do with '%s'? + eaglercraft.resourcePack.prompt.text=Tip: Hold Shift to skip this screen when selecting a resource pack! @@ -70,6 +70,7 @@ + eaglercraft.options.chunkFix=Chunk Lag Fix + eaglercraft.options.fog=Fog + eaglercraft.options.fxaa=FXAA Antialiasing ++ eaglercraft.options.fxaa.auto=Auto + + eaglercraft.key.function=Function + eaglercraft.key.zoomCamera=Zoom Camera @@ -81,7 +82,7 @@ + eaglercraft.auth.continue=Join Server + -> CHANGE 534 : 535 @ 468 : 469 +> CHANGE 535 : 536 @ 468 : 469 ~ resourcePack.openFolder=Open resource pack diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index c5af5d7..78f7952 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -8,7 +8,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u6"; + public static final String projectForkVersion = "u7"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; @@ -23,7 +23,7 @@ public class EaglercraftVersion { public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u6"; + public static final String projectOriginVersion = "u7"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; diff --git a/sources/resources/assets/eagler/glsl/post_fxaa.fsh b/sources/resources/assets/eagler/glsl/post_fxaa.fsh index 5a61d8a..1103f4f 100644 --- a/sources/resources/assets/eagler/glsl/post_fxaa.fsh +++ b/sources/resources/assets/eagler/glsl/post_fxaa.fsh @@ -110,7 +110,7 @@ uniform vec2 u_screenSize2f; GREEN AS LUMA OPTION SUPPORT FUNCTION ============================================================================*/ #if (FXAA_GREEN_AS_LUMA == 0) - FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return dot(rgba.xyz, vec3(0.299, 0.587, 0.114)); } + FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return dot(rgba.xyz * rgba.xyz, vec3(0.299, 0.587, 0.114)); } #else FxaaFloat FxaaLuma(FxaaFloat4 rgba) { return rgba.y; } #endif @@ -277,22 +277,24 @@ FxaaFloat4 FxaaPixelShader( } /*==========================================================================*/ -#define edgeSharpness 4.0 -#define edgeThreshold 0.125 +#define edgeSharpness 3.0 +#define edgeThreshold 0.15 #define edgeThresholdMin 0.05 void main(){ + vec2 screenSize05 = 0.5 * u_screenSize2f; + vec4 posPos; - posPos.xy = v_position2f - (0.5 * u_screenSize2f); - posPos.zw = v_position2f + (0.5 * u_screenSize2f); + posPos.xy = v_position2f - screenSize05; + posPos.zw = v_position2f + screenSize05; vec4 rcpFrameOpt; - rcpFrameOpt.xy = vec2(-0.50, -0.50) * u_screenSize2f; - rcpFrameOpt.zw = vec2( 0.50, 0.50) * u_screenSize2f; + rcpFrameOpt.xy = -screenSize05; + rcpFrameOpt.zw = screenSize05; vec4 rcpFrameOpt2; rcpFrameOpt2.xy = vec2(-2.0, -2.0) * u_screenSize2f; - rcpFrameOpt2.zw = vec2( 2.0, 2.0) * u_screenSize2f; + rcpFrameOpt2.zw = -rcpFrameOpt2.xy; - output4f = vec4(FxaaPixelShader(v_position2f, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt2, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0); + output4f = vec4(FxaaPixelShader(v_position2f + screenSize05, posPos, u_screenTexture, rcpFrameOpt, rcpFrameOpt2, edgeSharpness, edgeThreshold, edgeThresholdMin).rgb, 1.0); }