Add data size auto calculation.

TeamPBCN · Feb 27, 2019 · 5eb8eca · 5eb8eca
1 parent e6c1c72
commit 5eb8eca
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/src/texdump/CTR_Textures.cs b/src/texdump/CTR_Textures.cs
@@ -420,7 +420,7 @@ private static int GetPixelDataOffset(Size size, int x, int y, float bytesPerPix
             return (int)((((x / 8) + (y / 8) * ((size.Width % 8 == 0 ? size.Width : size.Width + 8 - (size.Width % 8)) / 8))) * 64.0 * bytesPerPixel);
         }
 
-        private static float GetBytesPerPixel(TextureFormat format)
+        public static float GetBytesPerPixel(TextureFormat format)
         {
             switch (format)
             {

diff --git a/src/texdump/Program.cs b/src/texdump/Program.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using CommandLine;
+using CommandLine;
 using CommandLine.Text;
-using System.Drawing;
 using CTR;
+using System;
+using System.Drawing;
+using System.IO;
 
 namespace texdump
 {
@@ -34,7 +29,15 @@ static void Main(string[] args)
             var fs = File.OpenRead(options.Input);
             BinaryReader reader = new BinaryReader(fs);
             fs.Position = options.Position;
-            texture.ImageData = reader.ReadBytes(options.Length);
+            if (options.Length > 0)
+            {
+                texture.ImageData = reader.ReadBytes(options.Length);
+            }
+            else
+            {
+                var length = (int)(options.Width * options.Height * TextureUtil.GetBytesPerPixel(options.Format));
+                texture.ImageData = reader.ReadBytes(length);
+            }
 
             Bitmap bmp = TextureUtil.DecodeTexture(texture);
 

diff --git a/src/texdumpcore/CTR_Textures.cs b/src/texdumpcore/CTR_Textures.cs
@@ -407,7 +407,7 @@ private static int GetPixelDataOffset(Size size, int x, int y, float bytesPerPix
             return (int)((((x / 8) + (y / 8) * ((size.Width % 8 == 0 ? size.Width : size.Width + 8 - (size.Width % 8)) / 8))) * 64.0 * bytesPerPixel);
         }
 
-        private static float GetBytesPerPixel(TextureFormat format)
+        public static float GetBytesPerPixel(TextureFormat format)
         {
             switch (format)
             {

diff --git a/src/texdumpcore/Program.cs b/src/texdumpcore/Program.cs
@@ -31,7 +31,15 @@ static void Main(string[] args)
             var fs = File.OpenRead(options.Input);
             BinaryReader reader = new BinaryReader(fs);
             fs.Position = options.Position;
-            texture.ImageData = reader.ReadBytes(options.Length);
+            if (options.Length > 0)
+            {
+                texture.ImageData = reader.ReadBytes(options.Length);
+            }
+            else
+            {
+                var length = (int)(options.Width * options.Height * TextureUtil.GetBytesPerPixel(options.Format));
+                texture.ImageData = reader.ReadBytes(length);
+            }
 
             var bmp = TextureUtil.DecodeTexture(texture);