From 009a900b6cf0a0af96fc30a6fea021600b781da0 Mon Sep 17 00:00:00 2001
From: Blatko1 <kings.of.funny.gemplays@gmail.com>
Date: Wed, 20 Dec 2023 15:00:11 +0100
Subject: [PATCH] remastered twoOutlines.frag

---
 msdfShowcase.sprj        |  6 +++---
 shaders/softness.frag    |  4 +++-
 shaders/twoOutlines.frag | 37 ++++++++++++++++++++++++-------------
 3 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/msdfShowcase.sprj b/msdfShowcase.sprj
index 5641bca..4f6054e 100644
--- a/msdfShowcase.sprj
+++ b/msdfShowcase.sprj
@@ -521,10 +521,10 @@
 	</objects>
 	<cameras />
 	<settings>
-		<entry type="property" name="minifiedGammaCorr" item="pipe" />
-		<entry type="file" name="basic" shader="vs" />
+		<entry type="property" name="twoOutlines" item="pipe" />
+		<entry type="file" name="softness" shader="ps" />
+		<entry type="file" name="twoOutlines" shader="ps" />
 		<entry type="file" name="basic" shader="ps" />
-		<entry type="file" name="minifiedGammaCorr" shader="ps" />
 		<entry type="camera" fp="false">
 			<distance>6</distance>
 			<pitch>5</pitch>
diff --git a/shaders/softness.frag b/shaders/softness.frag
index e4b31a3..d95782c 100644
--- a/shaders/softness.frag
+++ b/shaders/softness.frag
@@ -36,7 +36,9 @@ void main() {
 		discard;
 	}
 	float pxRange = screenPxRange();
-	dist -= 0.5 - thickness;
+	dist -= 0.5;
+	
+	dist += thickness;
 
   	float bodyPxDist = pxRange * dist;
   	softness *= pxRange;
diff --git a/shaders/twoOutlines.frag b/shaders/twoOutlines.frag
index a7d778f..0611bbf 100644
--- a/shaders/twoOutlines.frag
+++ b/shaders/twoOutlines.frag
@@ -22,8 +22,9 @@ const vec4 fgColor = vec4(0.41797, 0.480469, 0.54688, 1.0);
 const vec4 outline1Color = vec4(0.230469, 0.300781, 0.378906, 1.0);
 const vec4 outline2Color = vec4(0.972656, 0.816406, 0.05859, 1.0);
 
-float thickness = -0.3;
-float maxThickness = 0.4 - thickness;
+float bodyThickness = -0.3;
+float outline1Thickness = 0.35;
+float outline2Thickness = 0.25;
 
 void main() {
 	vec4 texel = texture(tex, uvCoord);
@@ -32,25 +33,35 @@ void main() {
 		discard;
 	}
 	float pxRange = screenPxRange();
-	dist -= 0.5 - thickness;
+	dist -= 0.5;
 	
+	// Distance to the body (no outline) edge
+	dist += bodyThickness;
+	
+	// Get that distance in pixels and the opacity
   	float bodyPxDist = pxRange * dist;
 	float bodyOpacity = smoothstep(-0.5, 0.5, bodyPxDist);
 	
-	float outline1Thickness = maxThickness * abs(cos(time*TIME1_SPEED));
+	float t1 = outline1Thickness * abs(cos(time*TIME1_SPEED));
 	
-	float char1PxDist = pxRange * (dist + outline1Thickness);
-	float char1Opacity = smoothstep(-0.5, 0.5, char1PxDist);
+	// Distance (in pixels) to the body with first outline edge and opacity
+	dist += t1;
+	float outline1PxDist = pxRange * dist;
+	float bodyWithOutline1Opacity = smoothstep(-0.5, 0.5, outline1PxDist);
 	
-	float outline2Thickness = (maxThickness-outline1Thickness) * abs(cos(time*TIME2_SPEED));
+	float t2 = outline2Thickness * abs(cos(time*TIME2_SPEED));
 	
-	float char2PxDist = pxRange * (dist + outline1Thickness + outline2Thickness);
-	float char2Opacity = smoothstep(-0.5, 0.5, char2PxDist);
+	// Distance (in pixels) to the body with second outline edge and opacity
+	dist += t2;
+	float outline2PxDist = pxRange * dist;
+	float bodyWithOutline2Opacity = smoothstep(-0.5, 0.5, outline2PxDist);
 
-	float outline1Opacity = char1Opacity - bodyOpacity;
-	float outline2Opacity = char2Opacity - char1Opacity;
-	
-	vec3 color = mix(outline2Color.rgb, mix(outline1Color.rgb, fgColor.rgb, bodyOpacity),char1Opacity);
+	// Get the first and second outline opacity
+	float outline1Opacity = bodyWithOutline1Opacity - bodyOpacity;
+	float outline2Opacity = bodyWithOutline2Opacity - bodyWithOutline1Opacity;
+
+	// Calculate the output color
+	vec3 color = mix(mix(outline2Color.rgb, outline1Color.rgb, outline1Opacity), fgColor.rgb, bodyOpacity);
 	float alpha = bodyOpacity * fgColor.a + outline1Opacity * outline1Color.a + outline2Opacity * outline2Color.a;
 	
 	gl_FragColor = vec4(color, alpha);