Actually fix preview and save functions as tga files

zzm634 · Oct 30, 2021 · 244b123 · 244b123
1 parent 152b989
commit 244b123
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/UVTextureReverser/ISBitmap.cs b/UVTextureReverser/ISBitmap.cs
@@ -1,4 +1,5 @@
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Tga;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors;
@@ -109,7 +110,21 @@ public ISBitmap(int width, int height, Color fill)
 
         public void toFile(String path)
         {
-            this.bitmap.Save(path);
+            if (path.ToLower().EndsWith("tga"))
+            {
+                TgaEncoder enc = new TgaEncoder();
+                enc.BitsPerPixel = TgaBitsPerPixel.Pixel32;
+                enc.Compression = TgaCompression.None;
+                using (FileStream fs = new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None))
+                {
+                    fs.SetLength(0); // discard contents of file
+                    enc.Encode(this.bitmap, fs);
+                }
+            }
+            else
+            {
+                this.bitmap.Save(path);
+            }
         }
 
         public static ISBitmap fromFile(String path)

diff --git a/UVTextureReverser/ISTextureScan.cs b/UVTextureReverser/ISTextureScan.cs
@@ -421,6 +421,12 @@ public ISBitmap getProjectionMap() {
 
             var map = (new ISBitmap(this.blackScan.width, this.blackScan.height, Color.Transparent)).getRawImage();
 
+            // draw the base black image over top at 50% opacity. so that it may more easily be used as a reference
+            map.Mutate(x =>
+            {
+                x.DrawImage(this.blackScan.getRawImage(), 0.5f);
+            });
+
             /*
             map.Mutate(x => {
                 x.Opacity(254.0f / 255.0f)

diff --git a/UVTextureReverser/ProjectionWindow.xaml.cs b/UVTextureReverser/ProjectionWindow.xaml.cs
@@ -117,7 +117,8 @@ private void ButtonSave_Click(object sender, RoutedEventArgs e) {
                 int outputResolution = (1 << Int32.Parse((String)this.TextureResolutionCombo.SelectedValue));
                 try
                 {
-                this.texture.scale(outputResolution, outputResolution).toFile(sfd.FileName);
+                                    this.texture.scale(outputResolution, outputResolution).toFile(sfd.FileName);
+
 
                 }
                 catch (Exception ex)