From d302808d24c85864f3a7469177dfb8588ab5627f Mon Sep 17 00:00:00 2001
From: KillzXGaming <millernathan35@gmail.com>
Date: Mon, 19 Nov 2018 13:08:41 -0500
Subject: [PATCH] Add mip maps to importer

---
 .gitignore                                    |   1 +
 .vs/Switch_Toolbox/v15/.suo                   | Bin 300032 -> 297472 bytes
 .../FileFormats/Texture/FTEX.cs               |   4 +--
 .../GUI/TextureUI/BNTXEditor.cs               |   1 -
 .../BinaryTextureImporterList.Designer.cs     |   4 ++-
 .../TextureUI/BinaryTextureImporterList.cs    |  26 ++++++++++++++++--
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59a3d509..9358f7bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ Release/
 .vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm
 .vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
 .vs/Switch_Toolbox/v15/.suo
+.vs/Switch_Toolbox/v15/.suo
diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 5dec7181f66f761d3694c0da5229560f5bb47d44..d2cf4e1e7855a48ad3562df4195af88a44b5ff70 100644
GIT binary patch
delta 1537
zcmb7@Z)jUp6u@)tyX{_Tvc9EV`o~(g*ws#BlD@UWNd;N68fr~Ksi?J7*R4`Y8Btz`
z;Dk8#VXHybcf~7gj2K7g2Rqulk_W>LMoa0Z{#$geAEs_HQ2bCaplsTBZj+$>P{a$r
zch0-_+;h)4_nzp4Bl?Nsyzd!HaVQpxj5<L!a=DzC24r4HRH{%u!f%{`is{IoU|s(3
zUYi=tz)fSc^drz|^`I3EmXH!;2ZBCwe<78qdl3gRgH#}RmSq=WM|LCEkfQxg)T@z4
zkviltB#qdRn#};lBW@@!gyI98jFhZTTF07=cS<=}%g{_5yD@&WYWH6J5q?DsLW<$p
z+{wbSOno@b`s60Rv#?3TxgU7~*@rYD!r7Ar*?{tC#Epm|m7{D%L=}w%`O6YR3&bGh
zREVJ*{!y|W#A;p?&T%9HgwLG;g(>QcQ*1tfi!I1BE{gv{gsrJ6VBo){Y6)Sab6yq^
z;!=*SR5TdbMjPl|0Un5hn|urWWE{GA@GQ7lwku=@5wHlfXwS5lL##dgrs3Li2lPrm
z_2A;B{TEsgAj3vO7YwE6S&&8A|Ll4tmKY$q;<t&+TDL59FWD`JaHeI;?5<eiDVlJS
z^vBQwts<2rd@#$%3bKmaL^8<N$Sm%?g;K@TZ=+m8s@V@62gW1E(-V*dBm1h2Bo3D8
z4efTz5wxz|a$4^)t-*<W;@TTAp7{W(jq1Y-6#VGMYd?aHJCGL<EapAEb7A{BGOa62
z#kKxtA<Lite>K@saYGAUgl&rLA^J|mPzLIV;eI;<#TtYqD%zl!=aL=775%#whUSPt
z;w_@TFlz_VQlhnr_h@AMZIB4(-<+WwUx(8}$sr)RBOnXEMLVWBLTt9Q*~mI<zy|(k
z<d=RSHd7se#l7Q4<FLp+_j#@2QpLDYXh6B96|0+{%YW+&KEGl1X7B!$!r$WsIf3$4
zK^OM73;G%xY`(x&&z<F-*FiO}o`;U|?bAsoKy+4k9g;~Pi6P2dmwTD-r#Z8J67CY#
zJv?j-k9-Qr6cFYZRry>gK8?;3=}?klL%B}(8GY9;vvi!0_w*}n9)1nV%t!<H2!AdJ
zcg&8Lq^pGKV<{fo2bD(K0~?5i2j*0pbXPI2JS07J+wCi5?+&|7cTmazTRnkV4{FJ<
zM3}18nN#19&wxkzB$@k;Nln~01a-+?sWNY>N&Oxk8I(@(hzq+p`n$~gT`-?qmTJ>6
zY0PPkElMYk@s(etY5qN-CH(qBX@`03XX$;FPgc=We5Q(aCF^M!cX_GG<L$7=?2ghY
c$s|p5!<vrL`_#N2qv;Z!^3n<JKS#g%8$@>{1^@s6

delta 2187
zcma)+e{54#6vunsy{&K1j?$Gepp31QF|cE$+lVM)*$ON=yJk$H2smJvkr7hNE71_c
zGC&P9vh@-!K?2(Xl|PVdd$=bi5Pl4@n8^4s<;Nce2r)4+N@7U>m3dC-eqj8=mwev6
z@7#OOx$k?<y-j-^O~)K9z9Pkxe(WYw9(L*b>EPfXSs9Xz%tic&Tb|niSzVF8AfxTi
zu7={K0k|ci$}*J};hI5l^*xVBDq#`K^a+iHt$+jkxk2Vxe-aH2gu=X#9yDX?M8+ds
zh>A=@29PXd95MkpjZmb&(~yrTXmcS`ksic~*wR~#KwQ~qu3Po4$ER<$NXVFugS7Z*
z>zauZ=HLhR2PrbO^c1C5im<8*&h4T>bp^+y*W_bcjQEg3#EW>40%Qg<8+j3-P0hrX
zHa!cWczU0D+zeAhG_%@Dx>^tlN0RBuOe@3-gH|$>jT#VIVYR5poGX%rX-#Lv;;Spw
zNu%cI+Ugj@-9hVoG*YI9yb8@7w$4KXrEb`mbl0k-qYQ9cM5l)+h-E99V;23%xNL<}
zK7`XzDk2UJPO-+3Wu~B$spq7`<RPSo8=?QzV-5|ZyP2QS&rA-2Q0f=ifTEV*gyHB~
zeXUCB4H@)gy%iE}u5{!n-F6Mkl%8Yaqw$}{S60f<XW$iDAZ*P+>*P_(<k>@vi${Sf
z(X03%M?@Fxj=OrTlmpU##JdZ1tqY3Y={{Yni$TY1-ch5pM%v)2Z2ugJGqC7Wv(KfH
z-WpLS4M|Hr=*dmbxFv0Spm^4e^k+u8?Z@_dx=+)uru)a_`aST4s9#nm>T>F{{dhu3
zkWz%ynul$sN!-ryn}cL(UGsawgDT7$6JLA5W}<CT)ssgm5Xcn|*M`IeWiCt<(RJH0
z=qOOpn&j1wVTztp-p66FxVxmdHNtI6(Bo31l01w2rFV5D^C`q#ed<uXKRc(cT6MIj
zLYq3El7vH1h4y-w1QyBMYFnz%si;Rrr&ZIAaMUiiJHY8=q*A79p@X2?>mOiESJ+ZD
z`LCkxw*gh_=sFbItXQ|F5}qp$q0NYO`zyc(RBBWkL(z5Zohyt7he8T%RlhAYNTo6|
ziH^p9392X8TA`y(>8|xEy8ZnJ&>FGp-sJ<(+>mGhrQ4Z=vGY;BgLM7jNm%n}rabhs
zVm165;c|YruN2BIgUQs7TtO(M*RZ{g3?M%sKO#4fo5%(9aU0vRXDMn(w17RHt0_5(
z*pgeLJ|`=RojUT`v}!ZZ&63j8Od(9h<93*+2)pMc(WiJ}yoh?Lt#k{GPOO<O+$!<d
z^G51Ep|lJM0xl7qu{)8#KlCR7rs@w%wgF^`XxVPzKC(jie(5!Gzk+*8yg&no9xVu=
z^mMBgjdC)UG@<($A7ii!K<Q`zC>OAyB6Z&{esf9fO?6y`ghrSv19(#Pog21>5?oO_
zzB$lyKv6yvdv|rp&<t?u3!Yd(z8r!lMyG|{vl}NKDmCsz2v4{F<Qy4(8^#zB5A=b!
zw#jRFYuNzE@|pM>onKecvY*8AQ{M`|<}x~ODf>Z2Rx(xk*0DnAYXDbb1#?RGItUx#
zD%NQhKE)zt_ZAr5O>8wf_ws<KyOeF*Dd2gq?+^=$;D!Y<;O04Wzc}d?816Zx^Dy%Y
zx8jtw*s*~L^NG)^C`EzX{3R<%>24BT&9BI_hgnR<+E}S9Kg=BRS{s|g@BB76D0w?u
zu&*6`*S0gS5ol*cAUiCOWi)lLet;b^e1x5bUYU86U6g+uWp5b`3ATT1&nIkGwz2Cn
z+p@0bK0D=<53;yb6f3In{Ug@sk!m9>koHC>9e#Pl`J#o!!d!lyNp~^#%eD&0GioCI
z1nVi_-<jn}FMkU6W&Q{JqHOVUkJ0@RFU^qWxAR|RcM-oNk8kJM=?NmzXBW#~%QWIU
e`4}cGjj(Vy&`8LUo?FzMZ82J!xz+MNCjSEnr2b|A

diff --git a/Switch_FileFormatsMain/FileFormats/Texture/FTEX.cs b/Switch_FileFormatsMain/FileFormats/Texture/FTEX.cs
index b2fffade..3b95ff49 100644
--- a/Switch_FileFormatsMain/FileFormats/Texture/FTEX.cs
+++ b/Switch_FileFormatsMain/FileFormats/Texture/FTEX.cs
@@ -470,9 +470,9 @@ namespace FirstPlugin
                 case ((int)GTX.GX2SurfaceFormat.GX2_SURFACE_FORMAT_T_BC5_SNORM):
                     decomp = DDSCompressor.DecompressBC5(data, (int)Width, (int)Height, true); break;
                 case ((int)GTX.GX2SurfaceFormat.GX2_SURFACE_FORMAT_TC_R8_G8_B8_A8_SNORM):
-                    break;
+                    decomp = DDS_PixelDecode.DecodeR8G8B8A8(data, (int)Width, (int)Height); break;
                 case ((int)GTX.GX2SurfaceFormat.GX2_SURFACE_FORMAT_TC_R8_G8_B8_A8_UINT):
-                    break;
+                    decomp = DDS_PixelDecode.DecodeR8G8B8A8(data, (int)Width, (int)Height); break;
                 default:
                     decomp = Properties.Resources.TextureError;
                     Console.WriteLine($"Format {Format} not supported!");
diff --git a/Switch_FileFormatsMain/GUI/TextureUI/BNTXEditor.cs b/Switch_FileFormatsMain/GUI/TextureUI/BNTXEditor.cs
index 43231e0c..3843b969 100644
--- a/Switch_FileFormatsMain/GUI/TextureUI/BNTXEditor.cs
+++ b/Switch_FileFormatsMain/GUI/TextureUI/BNTXEditor.cs
@@ -53,7 +53,6 @@ namespace FirstPlugin
             mipLevelCounterLabel.Text = $"{CurMipDisplayLevel} / {textureData.mipmaps[CurArrayDisplayLevel].Count - 1}";
             arrayLevelCounterLabel.Text = $"{CurArrayDisplayLevel} / {textureData.mipmaps.Count - 1}";
 
-
             if (Thread != null && Thread.IsAlive)
                 Thread.Abort();
 
diff --git a/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.Designer.cs b/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.Designer.cs
index 7f364583..b285d4be 100644
--- a/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.Designer.cs
+++ b/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.Designer.cs
@@ -184,6 +184,7 @@
             this.MipmapNum.Name = "MipmapNum";
             this.MipmapNum.Size = new System.Drawing.Size(130, 16);
             this.MipmapNum.TabIndex = 20;
+            this.MipmapNum.ValueChanged += new System.EventHandler(this.MipmapNum_ValueChanged);
             // 
             // WidthLabel
             // 
@@ -248,7 +249,8 @@
             this.Controls.Add(this.button2);
             this.Controls.Add(this.button1);
             this.ForeColor = System.Drawing.Color.White;
-            this.Text = "BinaryTextureImporterList";
+            this.Text = "Texture Importer";
+            this.Load += new System.EventHandler(this.BinaryTextureImporterList_Load);
             ((System.ComponentModel.ISupportInitialize)(this.SwizzleNum)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.MipmapNum)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
diff --git a/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.cs b/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.cs
index 73597579..6ff38e40 100644
--- a/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.cs
+++ b/Switch_FileFormatsMain/GUI/TextureUI/BinaryTextureImporterList.cs
@@ -137,8 +137,8 @@ namespace FirstPlugin
             }));
             Thread.Start();
 
-          //  WidthLabel.Text = $"Width {pictureBox1.Image.Width}";
-      //      HeightLabel.Text = $"Height {pictureBox1.Image.Height}";
+            //  WidthLabel.Text = $"Width {pictureBox1.Image.Width}";
+            //      HeightLabel.Text = $"Height {pictureBox1.Image.Height}";
         }
 
         private void button1_Click(object sender, EventArgs e)
@@ -162,7 +162,29 @@ namespace FirstPlugin
                 formatComboBox.SelectedItem = SelectedTexSettings.Format;
 
                 SetupSettings();
+
+                MipmapNum.Value = 0;
+
+                uint num = Math.Max(SelectedTexSettings.TexHeight, SelectedTexSettings.TexWidth);
+                while (true)
+                {
+                    num >>= 1;
+                    if (num > 0)
+                        ++MipmapNum.Value;
+                    else
+                        break;
+                }
+                MipmapNum.Maximum = MipmapNum.Value;
             }
         }
+
+        private void BinaryTextureImporterList_Load(object sender, EventArgs e)
+        {
+        }
+
+        private void MipmapNum_ValueChanged(object sender, EventArgs e)
+        {
+            SelectedTexSettings.MipCount = (uint)MipmapNum.Value;
+        }
     }
 }