Feature: Support output to C-style string.

DeanEdisGG · DeanEdisGG · commit d55de207abc3 · 2022-03-05T15:56:50.000Z
diff --git a/ShaderShrinker/Shrinker.Parser/COutputFormatter.cs b/ShaderShrinker/Shrinker.Parser/COutputFormatter.cs
@@ -0,0 +1,68 @@
+﻿// -----------------------------------------------------------------------
+//  <copyright file="COutputFormatter.cs">
+//      Copyright (c) 2021 Dean Edis. All rights reserved.
+//  </copyright>
+//  <summary>
+//  This code is provided on an "as is" basis and without warranty of any kind.
+//  We do not warrant or make any representations regarding the use or
+//  results of use of this code.
+//  </summary>
+// -----------------------------------------------------------------------
+
+using System.Linq;
+using System.Text;
+using Shrinker.Lexer;
+
+namespace Shrinker.Parser
+{
+    public static class COutputFormatter
+    {
+        public static string ToCCode(this string glsl, int originalSize, int optimizedSize)
+        {
+            var output = new StringBuilder();
+            output.Append(string.Empty.WithAppMessage(originalSize, optimizedSize));
+            output.AppendLine("static const char* fragmentShader =");
+
+            foreach (var line in glsl.Split('\n'))
+            {
+                if (string.IsNullOrWhiteSpace(line))
+                {
+                    output.AppendLine();
+                    continue;
+                }
+
+                var whitespace = new string(line.TakeWhile(char.IsWhiteSpace).ToArray());
+                output.Append(whitespace);
+                output.Append('\"');
+                var s = line.Substring(whitespace.Length);
+
+                var leaveAlone = s.StartsWith("#") || s.StartsWith("//") || s.StartsWith("/*");
+
+                if (!leaveAlone)
+                {
+                    while (s.Contains('\t'))
+                        output.Replace('\t', ' ');
+                    while (s.Contains("  "))
+                        output.Replace("  ", " ");
+                    foreach (var toSquash in new[] { "!", "#", "=", "%", "^", "&", "*", "(", ")", "-", "+", "=", ";", "{", "[", "]", "}", ":", "~", ",", "<", ">", ".", "\\", "/", "|", "?" })
+                    {
+                        foreach (var toFind in new[] { $"{toSquash} ", $" {toSquash}"})
+                        {
+                            while (s.Contains(toFind))
+                                s = s.Replace(toFind, toSquash);
+                        }
+                    }
+                }
+
+                output.Append(s);
+
+                if (leaveAlone)
+                    output.Append("\\n");
+                output.AppendLine("\"");
+            }
+
+            output.AppendLine(";");
+            return output.ToString();
+        }
+    }
+}
diff --git a/ShaderShrinker/Shrinker.Parser/GlslOutputFormatter.cs b/ShaderShrinker/Shrinker.Parser/GlslOutputFormatter.cs
@@ -1,5 +1,5 @@
 ﻿// -----------------------------------------------------------------------
-//  <copyright file="OutputFormatter.cs">
+//  <copyright file="GlslOutputFormatter.cs">
 //      Copyright (c) 2021 Dean Edis. All rights reserved.
 //  </copyright>
 //  <summary>
@@ -20,7 +20,7 @@ namespace Shrinker.Parser
     /// <summary>
     /// Takes a syntax tree and converts it back into GLSL code for output.
     /// </summary>
-    public static class OutputFormatter
+    public static class GlslOutputFormatter
     {
         public static string ToCode(this SyntaxNode rootNode)
         {
diff --git a/ShaderShrinker/Shrinker.Parser/Shrinker.cs b/ShaderShrinker/Shrinker.Parser/Shrinker.cs
@@ -17,7 +17,7 @@ namespace Shrinker.Parser
     /// <summary>
     /// Takes a syntax tree produced by the Parser class, and optimizes it.
     /// </summary>
-    /// <remarks>The output from this stage can be passed to the OutputFormatter.</remarks>
+    /// <remarks>The output from this stage can be passed to the GlslOutputFormatter.</remarks>
     public static class Shrinker
     {
         public static SyntaxNode Simplify(this SyntaxNode rootNode, CustomOptions options = null)
diff --git a/ShaderShrinker/Shrinker.Parser/SyntaxNodes/PragmaIfSyntaxNode.cs b/ShaderShrinker/Shrinker.Parser/SyntaxNodes/PragmaIfSyntaxNode.cs
@@ -34,10 +34,10 @@ public PragmaIfSyntaxNode(SyntaxNode startNode, SyntaxNode elseNode, SyntaxNode
 
             // Read (and discard) '#if' arguments to get name.
             var ifName = new StringBuilder();
-            OutputFormatter.AppendCode(ifName, startNode);
+            GlslOutputFormatter.AppendCode(ifName, startNode);
 
             var ifArgs = startNode.TakeSiblingsWhile(o => o.Token is not LineEndToken).ToList();
-            ifArgs.ForEach(o => OutputFormatter.AppendCode(ifName, o));
+            ifArgs.ForEach(o => GlslOutputFormatter.AppendCode(ifName, o));
             ifArgs.ForEach(o => o.Remove());
 
             Name = ifName.ToString().Trim();
diff --git a/ShaderShrinker/Shrinker.Parser/SyntaxNodes/SyntaxNode.cs b/ShaderShrinker/Shrinker.Parser/SyntaxNodes/SyntaxNode.cs
@@ -251,7 +251,7 @@ protected List<SyntaxNode> TryGetMatchingChildren(int startIndex, params Type[]
                 .Take(types.Length)
                 .ToList();
             if (samples.Count == types.Length &&
-                samples.Where((o, i) => samples[i].GetType() == types[i] || samples[i].Token?.GetType() == types[i])
+                samples.Where((_, i) => samples[i].GetType() == types[i] || samples[i].Token?.GetType() == types[i])
                     .Count() == types.Length)
             {
                 return samples;
diff --git a/ShaderShrinker/Shrinker.Parser/SyntaxNodes/SyntaxNodeExtensions.cs b/ShaderShrinker/Shrinker.Parser/SyntaxNodes/SyntaxNodeExtensions.cs
@@ -46,7 +46,7 @@ public static IEnumerable<SyntaxNode> Ancestors(this SyntaxNode node)
 
         public static SyntaxNode FindLastChild(this SyntaxNode node, Func<SyntaxNode, bool> isMatchFunc) => node.FindLastChild<SyntaxNode>(isMatchFunc);
 
-        public static IEnumerable<SyntaxNode> TakeSiblings(this SyntaxNode node, int count) => node.TakeSiblingsWhile(o => true).Take(count);
+        public static IEnumerable<SyntaxNode> TakeSiblings(this SyntaxNode node, int count) => node.TakeSiblingsWhile(_ => true).Take(count);
 
         public static IEnumerable<SyntaxNode> TakeSiblingsWhile(this SyntaxNode node, Func<SyntaxNode, bool> isMatchFunc)
         {
diff --git a/ShaderShrinker/Shrinker.WpfApp/AppViewModel.cs b/ShaderShrinker/Shrinker.WpfApp/AppViewModel.cs
@@ -52,6 +52,7 @@ public class AppViewModel : ViewModelBase
         private CustomOptions m_customOptions = CustomOptions.All();
         private List<FileInfo> m_presets;
         private readonly FileInfo m_customPreset = new FileInfo("Custom");
+        private bool m_isOutputGlsl = true;
 
         public event EventHandler<(string originalCode, string newCode)> GlslLoaded;
 
@@ -184,6 +185,22 @@ public FileInfo SelectedPreset
                 LoadOptionsFromPreset();
             }
         }
+        public bool IsOutputGlsl
+        {
+            get => m_isOutputGlsl;
+            set
+            {
+                m_isOutputGlsl = value;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(IsOutputC));
+            }
+        }
+
+        public bool IsOutputC
+        {
+            get => !IsOutputGlsl;
+            set => IsOutputGlsl = !value;
+        }
 
         public AppViewModel()
         {
@@ -214,7 +231,7 @@ private void SaveGlslToClipboard(object obj)
             if (string.IsNullOrEmpty(glsl))
                 return;
 
-            Clipboard.SetText(glsl.WithAppMessage(OriginalSize, OptimizedSize));
+            Clipboard.SetText(GetShaderOutputText(glsl));
             MyMessageQueue.Enqueue("GLSL saved to clipboard");
         }
 
@@ -257,12 +274,12 @@ private void SaveGlslToFile(object obj)
             var dialog = new SaveFileDialog
             {
                 Title = "Save GLSL file",
-                Filter = "GLSL Files|*.txt;*.glsl|All Files|*.*"
+                Filter = "GLSL Files|*.txt;*.glsl;*.c;*.cpp;*.h;*.inl|All Files|*.*"
             };
             if (dialog.ShowDialog() != true)
                 return;
 
-            File.WriteAllText(dialog.FileName, OptimizedCode.WithAppMessage(OriginalSize, OptimizedSize));
+            File.WriteAllText(dialog.FileName, GetShaderOutputText(OptimizedCode));
             MyMessageQueue.Enqueue("GLSL saved to file");
         }
 
@@ -357,5 +374,8 @@ public void SaveCustomOptions()
             Settings.Default.CustomOptions = JsonConvert.SerializeObject(CustomOptions);
             Settings.Default.Save();
         }
+
+        private string GetShaderOutputText(string glsl) =>
+            IsOutputGlsl ? glsl.WithAppMessage(OriginalSize, OptimizedSize) : glsl.ToCCode(OriginalSize, OptimizedSize);
     }
 }
diff --git a/ShaderShrinker/Shrinker.WpfApp/MainWindow.xaml b/ShaderShrinker/Shrinker.WpfApp/MainWindow.xaml
@@ -93,7 +93,7 @@
                             </Button>
                         </StackPanel>
 
-                        <TextBlock Grid.Column="1" Text="GLSL Import" VerticalAlignment="Center">
+                        <TextBlock Grid.Column="1" Text="Shader Import" VerticalAlignment="Center">
                             <TextBlock.LayoutTransform>
                                 <RotateTransform Angle="-90"/>
                             </TextBlock.LayoutTransform>
@@ -147,6 +147,11 @@
                         <StackPanel Grid.Column="0">
                             <TextBlock Text="Step 3" FontSize="10" Margin="0,-16,0,0"/>
 
+                            <StackPanel Margin="8,8,8,0">
+                                <RadioButton Content="GLSL" IsChecked="{Binding IsOutputGlsl}"/>
+                                <RadioButton Content="C-Style" IsChecked="{Binding IsOutputC}"/>
+                            </StackPanel>
+
                             <Button ToolTip="To Clipboard (CTRL+C)" Command="{Binding OnSaveToClipboardCommand}">
                                 <materialDesign:PackIcon Kind="ClipboardArrowRight"/>
                             </Button>
@@ -161,7 +166,7 @@
                             </materialDesign:Badged>
                         </StackPanel>
 
-                        <TextBlock Grid.Column="1" Text="GLSL Export" VerticalAlignment="Center">
+                        <TextBlock Grid.Column="1" Text="Shader Export" VerticalAlignment="Center">
                             <TextBlock.LayoutTransform>
                                 <RotateTransform Angle="-90"/>
                             </TextBlock.LayoutTransform>
diff --git a/ShaderShrinker/Shrinker.WpfApp/MainWindow.xaml.cs b/ShaderShrinker/Shrinker.WpfApp/MainWindow.xaml.cs
@@ -11,6 +11,7 @@
 
 using System.Diagnostics;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Navigation;
 
 namespace Shrinker.WpfApp
@@ -20,12 +21,13 @@ public partial class MainWindow
         public MainWindow()
         {
             InitializeComponent();
+            ToolTipService.ShowOnDisabledProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(true));
 
             var appViewModel = new AppViewModel();
             DataContext = appViewModel;
 
-            Closing += (sender, args) => appViewModel.SaveCustomOptions();
-            appViewModel.GlslLoaded += (sender, args) =>
+            Closing += (_, _) => appViewModel.SaveCustomOptions();
+            appViewModel.GlslLoaded += (_, args) =>
             {
                 using (new BusyCursor())
                 {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Shrinker.Parser`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// Takes a syntax tree produced by the Parser class, and optimizes it.`
`19`	`19`	`/// </summary>`
`20`		`- /// <remarks>The output from this stage can be passed to the OutputFormatter.</remarks>`
	`20`	`+ /// <remarks>The output from this stage can be passed to the GlslOutputFormatter.</remarks>`
`21`	`21`	`public static class Shrinker`
`22`	`22`	`{`
`23`	`23`	`public static SyntaxNode Simplify(this SyntaxNode rootNode, CustomOptions options = null)`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ protected List<SyntaxNode> TryGetMatchingChildren(int startIndex, params Type[]`
`251`	`251`	`.Take(types.Length)`
`252`	`252`	`.ToList();`
`253`	`253`	`if (samples.Count == types.Length &&`
`254`		`- samples.Where((o, i) => samples[i].GetType() == types[i] \|\| samples[i].Token?.GetType() == types[i])`
	`254`	`+ samples.Where((_, i) => samples[i].GetType() == types[i] \|\| samples[i].Token?.GetType() == types[i])`
`255`	`255`	`.Count() == types.Length)`
`256`	`256`	`{`
`257`	`257`	`return samples;`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public static IEnumerable<SyntaxNode> Ancestors(this SyntaxNode node)`
`46`	`46`
`47`	`47`	`public static SyntaxNode FindLastChild(this SyntaxNode node, Func<SyntaxNode, bool> isMatchFunc) => node.FindLastChild<SyntaxNode>(isMatchFunc);`
`48`	`48`
`49`		`- public static IEnumerable<SyntaxNode> TakeSiblings(this SyntaxNode node, int count) => node.TakeSiblingsWhile(o => true).Take(count);`
	`49`	`+ public static IEnumerable<SyntaxNode> TakeSiblings(this SyntaxNode node, int count) => node.TakeSiblingsWhile(_ => true).Take(count);`
`50`	`50`
`51`	`51`	`public static IEnumerable<SyntaxNode> TakeSiblingsWhile(this SyntaxNode node, Func<SyntaxNode, bool> isMatchFunc)`
`52`	`52`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`using System.Diagnostics;`
`13`	`13`	`using System.Windows;`
	`14`	`+using System.Windows.Controls;`
`14`	`15`	`using System.Windows.Navigation;`
`15`	`16`
`16`	`17`	`namespace Shrinker.WpfApp`
`@@ -20,12 +21,13 @@ public partial class MainWindow`
`20`	`21`	`public MainWindow()`
`21`	`22`	`{`
`22`	`23`	`InitializeComponent();`
	`24`	`+ ToolTipService.ShowOnDisabledProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(true));`
`23`	`25`
`24`	`26`	`var appViewModel = new AppViewModel();`
`25`	`27`	`DataContext = appViewModel;`
`26`	`28`
`27`		`- Closing += (sender, args) => appViewModel.SaveCustomOptions();`
`28`		`- appViewModel.GlslLoaded += (sender, args) =>`
	`29`	`+ Closing += (_, _) => appViewModel.SaveCustomOptions();`
	`30`	`+ appViewModel.GlslLoaded += (_, args) =>`
`29`	`31`	`{`
`30`	`32`	`using (new BusyCursor())`
`31`	`33`	`{`