Added DDS compression and mipmap options

n00mkrad · Sep 21, 2020 · 5f1c94f · 5f1c94f
1 parent c8fdbf7
commit 5f1c94f
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 47 deletions.
diff --git a/Code/Forms/SettingsForm.Designer.cs b/Code/Forms/SettingsForm.Designer.cs
diff --git a/Code/Forms/SettingsForm.cs b/Code/Forms/SettingsForm.cs
@@ -43,6 +43,8 @@ void LoadSettings ()
 
             Config.LoadGuiElement(jpegQ);
             Config.LoadGuiElement(webpQ);
+            Config.LoadGuiElement(ddsUseDxt);
+            Config.LoadGuiElement(ddsMipsAmount);
         }
 
         private void SettingsForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -61,6 +63,8 @@ void SaveSettings()
 
             Config.SaveGuiElement(jpegQ);
             Config.SaveGuiElement(webpQ);
+            Config.SaveGuiElement(ddsUseDxt);
+            Config.SaveGuiElement(ddsMipsAmount);
         }
 
         private void confAlphaBgColorBtn_Click(object sender, EventArgs e)

diff --git a/Code/IO/Config.cs b/Code/IO/Config.cs
@@ -80,6 +80,8 @@ private static string WriteDefaultValIfExists(string key)
 				"useCpu" => WriteDefault("useCpu", "False"),
 				"jpegQ" => WriteDefault("jpegQ", "95"),
 				"webpQ" => WriteDefault("webpQ", "95"),
+				"ddsUseDxt" => WriteDefault("ddsUseDxt", "True"),
+				"ddsMipsAmount" => WriteDefault("ddsMipsAmount", "0"),
 				_ => null, 
 			};
 		}

diff --git a/Code/ImageUtils/ImageProcessing.cs b/Code/ImageUtils/ImageProcessing.cs
@@ -5,6 +5,8 @@
 using System.Windows.Forms;
 using Cupscale.IO;
 using ImageMagick;
+using ImageMagick.Formats.Bmp;
+using ImageMagick.Formats.Dds;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Png;
 using Paths = Cupscale.IO.Paths;
@@ -147,6 +149,11 @@ public static async Task ConvertImage(string path, Format format, bool fillAlpha
 			{
 				img.Format = MagickFormat.Dds;
 				ext = "dds";
+				DdsCompression comp = DdsCompression.None;
+				if(Config.GetBool("ddsUseDxt"))
+					comp = DdsCompression.Dxt1;
+				DdsWriteDefines ddsDefines = new DdsWriteDefines { Compression = comp, Mipmaps = Config.GetInt("ddsMipsAmount") };
+				img.Settings.SetDefines(ddsDefines);
 			}
             if (fillAlpha)
             {