v0.3.5

Author: dtiefling

drunkshaders/changelog.txt

@@ -1,3 +1,7 @@
+(0.3.5)
+Slightly improved formula for interpixel outline curve approximation.
+Added macOS build of glslopt.
+
 (0.3.4)
 MAJOR readme update.
 Fixed default outlines when no component is chosen.

drunkshaders/drunkshaders.tp2

@@ -1,7 +1,7 @@
 BACKUP ~drunkshaders/backup~
 
 AUTHOR ~drunktiefling~
-VERSION ~0.3.4~
+VERSION ~0.3.5~
 README ~drunkshaders/readme.txt~
 
 
@@ -380,27 +380,23 @@ END
 BEGIN ~Process shaders with GLSL Optimizer [WARINIG: manual editing won't be possible after this step]~ DESIGNATED 9005
 SUBCOMPONENT ~GLSL Optimization~
 REQUIRE_COMPONENT ~drunkshaders.tp2~ 1000 ~This requires the main component.~
-ACTION_IF NOT (~%WEIDU_OS%~ STRING_EQUAL_CASE ~osx~) BEGIN
-	LAF ~GET_TOOL_BINARY~ STR_VAR tool_name = ~glslopt~ RET tool_binary END
-	ACTION_FOR_EACH shader IN ~override/fpfont.glsl~ ~override/fpdraw.glsl~ ~override/fptone.glsl~ ~override/fpseam.glsl~ ~override/fpsprite.glsl~ ~override/fpselect.glsl~ ~override/fpyuv.glsl~ ~override/fpyuvgry.glsl~ BEGIN
-		DELETE ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~
-		COPY_EXISTING ~%shader%~ ~%shader%~
-			WRITE_ASCII 0 ~#version 130 /* ~
-		BUT_ONLY_IF_IT_CHANGES
-		LAF EXECUTE_TOOL
-			STR_VAR
-				tool_binary = EVAL ~%tool_binary%~
-				arg_0       = EVAL ~-1~
-				arg_1       = EVAL ~-f~
-				arg_2       = EVAL ~%shader%~
-				arg_3       = EVAL ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~
-		END
-		COPY_EXISTING ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~ ~%shader%~
-			REPLACE_TEXTUALLY ~#version 130~ ~~
-			REPLACE_TEXTUALLY ~ / 0.1)~ ~ * 10.0)~
-			REPLACE_TEXTUALLY ~ / 0.002)~ ~ * 500.0)~
-		BUT_ONLY_IF_IT_CHANGES
+LAF ~GET_TOOL_BINARY~ STR_VAR tool_name = ~glslopt~ RET tool_binary END
+ACTION_FOR_EACH shader IN ~override/fpfont.glsl~ ~override/fpdraw.glsl~ ~override/fptone.glsl~ ~override/fpseam.glsl~ ~override/fpsprite.glsl~ ~override/fpselect.glsl~ ~override/fpyuv.glsl~ ~override/fpyuvgry.glsl~ BEGIN
+	DELETE ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~
+	COPY_EXISTING ~%shader%~ ~%shader%~
+		WRITE_ASCII 0 ~#version 130 /* ~
+	BUT_ONLY_IF_IT_CHANGES
+	LAF EXECUTE_TOOL
+		STR_VAR
+			tool_binary = EVAL ~%tool_binary%~
+			arg_0       = EVAL ~-1~
+			arg_1       = EVAL ~-f~
+			arg_2       = EVAL ~%shader%~
+			arg_3       = EVAL ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~
 	END
-END ELSE BEGIN
-	PRINT ~Platform not supported. Doing nothing.~
+	COPY_EXISTING ~%MOD_FOLDER%/weidu_external/workspace/glslopt_out/%shader%~ ~%shader%~
+		REPLACE_TEXTUALLY ~#version 130~ ~~
+		REPLACE_TEXTUALLY ~ / 0.1)~ ~ * 10.0)~
+		REPLACE_TEXTUALLY ~ / 0.002)~ ~ * 500.0)~
+	BUT_ONLY_IF_IT_CHANGES
 END

drunkshaders/glsl-parts/functions-game.glsl

@@ -326,7 +326,7 @@ mediump vec2 uhOutlineData(in int radius, in ivec2 uhPosUb, in mediump vec2 uhPo
 			{
 				continue;
 			}
-			mediump float lineA0 = a00 - 0.0625;
+			mediump float lineA0 = (a00 * 3 + a01 + a10 - a11) * 0.25 - 0.0625;
 			mediump float lineAX = (a01 + a11 - a00 - a10) * 0.5;
 			mediump float lineBX = (a10 + a11 - a00 - a01) * 0.5;
 			mediump vec2 segEnds[2];

drunkshaders/readme.txt

@@ -1,6 +1,7 @@
+
 # drunktiefling's shaders
 
-Readme last updated at version: *0.3.4*.
+Readme last updated at version: *0.3.5*.
 
 This mod aims to use more consistent color operations, sharpening
 and alternative scaling filters via shader files introduced in BG(2)EE.
@@ -108,7 +109,7 @@ Then extract it in the game installation directory.
 
 Current versions are shipped with WeiDU for all supported platforms.
 For example, on Windows you would have to execute `setup-drunkshaders.exe`
-file and answer a few questions. Proper steps for Linux and Mac OS X are
+file and answer a few questions. Proper steps for Linux and macOS are
 analogous, taken that files you might want to run don't have `.exe`
 at the end of the name.
 
@@ -358,8 +359,9 @@ of conditional statements from the code of all shaders without outlines (some
 gometry code related to them is an exception from that rule), which is already
 an indication that they sould run faster.
 
-At the moment, there is no Mac OS X build, so this component works only
-on Windows and Linux (either x86 or x86_64 for either platform).
+At the moment, the included macOS build is based on the
+[original branch](https://github.com/aras-p/glsl-optimizer) of GLSL optimizer,
+because of missing symbols from the more recent code.
 
  1. Process shaders with GLSL Optimizer
     [WARINIG: manual editing won't be possible after this step]