Feature: Floats less than zero can now be simplied using the 'e' format.

E.g. 0.00001 to 1e-5

Author: DeanEdisGG

ShaderShrinker/Shrinker.Lexer/FloatToken.cs

@@ -60,10 +60,30 @@ public IToken Simplify()
 
                 Content = Content.TrimEnd('0');
 
+                // Any decimal places?
                 if (!Content.EndsWith("."))
                 {
-                    // Remove leading zeroes.
+                    // Yes - Remove leading zeroes.
                     Content = Content.TrimStart('0');
+
+                    // Can we simplify using the 'e' format?
+                    if (Content.StartsWith("."))
+                    {
+                        var eFormat = Content.Substring(1);
+                        var zeros = 0;
+                        while (eFormat.Length > 0 && eFormat[0] == '0')
+                        {
+                            zeros++;
+                            eFormat = eFormat.Substring(1);
+                        }
+
+                        if (eFormat.Length > 0 && zeros > 0)
+                        {
+                            eFormat = $"{eFormat}e-{zeros + 1}";
+                            if (eFormat.Length < Content.Length)
+                                Content = eFormat;
+                        }
+                    }
                 }
                 else
                 {

ShaderShrinker/UnitTests/ShrinkerTests.cs

@@ -383,8 +383,8 @@ public void CheckDeclarationIsNotJoinedWithDefinitionIfDeepWithinIfPragma()
 
         [Test, Sequential]
         public void CheckSimplifyingFloats(
-            [Values("10.0", "1.1", "0.10", "0.0000", "-0.09", "100.0", "100.1", "1100000.", "1.23f", "-0.1f", ".0f", "0.f", "10.00F", "102.", "001.1", "3.141592653589793238462643383279502884197", "-3.141592653589793238462643383279502884197", "1.541182543454656e-4", "1e10", "0011.0", "-0011.0", "00.0")] string code,
-            [Values("10.", "1.1", ".1", "0.", "-.09", "1e2", "100.1", "11e5", "1.23", "-.1", "0.", "0.", "10.", "102.", "1.1", "3.1415926", "-3.1415926", "1.5411e-4", "1e10", "11.", "-11.", "0.")] string expectedOutput)
+            [Values("10.0", "1.1", "0.10", "0.0000", "-0.09", "100.0", "100.1", "1100000.", "1.23f", "-0.1f", ".0f", "0.f", "10.00F", "102.", "001.1", "3.141592653589793238462643383279502884197", "-3.141592653589793238462643383279502884197", "1.541182543454656e-4", "1e10", "0011.0", "-0011.0", "00.0", "0.00001")] string code,
+            [Values("10.", "1.1", ".1", "0.", "-.09", "1e2", "100.1", "11e5", "1.23", "-.1", "0.", "0.", "10.", "102.", "1.1", "3.1415926", "-3.1415926", "1.5411e-4", "1e10", "11.", "-11.", "0.", "1e-5")] string expectedOutput)
         {
             var lexer = new Lexer();
             lexer.Load(code);

ShaderShrinker/UnitTests/TestFiles/SimplifiedReference/PowerStone.glsl

@@ -1,4 +1,4 @@
-// Processed by 'GLSL Shader Shrinker' (Shrunk by 10 characters)
+// Processed by 'GLSL Shader Shrinker' (Shrunk by 13 characters)
 // (https://github.com/deanthecoder/GLSLShaderShrinker)
 
 #define Z0	min(iTime, 0.)
@@ -97,13 +97,13 @@ Hit map(vec3 p) {
 		d2 = min(d2, sdOcta(p, .3) - .005);
 	}
 
-	g += .00008 / (.001 + d2 * d2);
+	g += 8e-5 / (.001 + d2 * d2);
 	minH(Hit(d2, 4));
 	p = op;
 	p.x = abs(p.x);
 	p.y += cos(p.x + t) * .05;
 	d2 = length(p.yz) - .01;
-	g += .0005 / (.001 + d2 * d2);
+	g += 5e-4 / (.001 + d2 * d2);
 	minH(Hit(min(d, d2), 2));
 	return h;
 }