diff --git a/AssetStudio/AssetStudio.csproj b/AssetStudio/AssetStudio.csproj
index 933ecf4..fd3a6ae 100644
--- a/AssetStudio/AssetStudio.csproj
+++ b/AssetStudio/AssetStudio.csproj
@@ -65,7 +65,6 @@
-
diff --git a/AssetStudioGUI/AssetStudioGUI.csproj b/AssetStudioGUI/AssetStudioGUI.csproj
index 83089fe..fdfafd1 100644
--- a/AssetStudioGUI/AssetStudioGUI.csproj
+++ b/AssetStudioGUI/AssetStudioGUI.csproj
@@ -116,6 +116,7 @@
+
ExportOptions.cs
diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs
index 70adf47..001fa0a 100644
--- a/AssetStudioGUI/AssetStudioGUIForm.cs
+++ b/AssetStudioGUI/AssetStudioGUIForm.cs
@@ -767,7 +767,8 @@ namespace AssetStudioGUI
Action handler = delegate { };
if (validChannel == 0)
{
- handler = (data, offset) => {
+ handler = (data, offset) =>
+ {
for (int i = 0; i < 4; i++)
data[i + offset] = (i == 3) ? (byte)255 : (byte)0;
};
@@ -781,14 +782,16 @@ namespace AssetStudioGUI
c = 1;
else if (textureChannels[2])
c = 2;
- handler = (data, offset) => {
+ handler = (data, offset) =>
+ {
for (int i = 0; i < 4; i++)
data[i + offset] = (i == 3) ? (byte)255 : data[c + offset];
};
}
else
{
- handler = (data, offset) => {
+ handler = (data, offset) =>
+ {
for (int i = 0; i < 4; i++)
data[i + offset] = textureChannels[i] ? data[i + offset] : (byte)(i == 3 ? 255 : 0);
};
diff --git a/AssetStudioGUI/ExportOptions.Designer.cs b/AssetStudioGUI/ExportOptions.Designer.cs
index 4be36a9..975c205 100644
--- a/AssetStudioGUI/ExportOptions.Designer.cs
+++ b/AssetStudioGUI/ExportOptions.Designer.cs
@@ -117,15 +117,15 @@
this.panel1.Controls.Add(this.tobmp);
this.panel1.Location = new System.Drawing.Point(30, 42);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(196, 30);
+ this.panel1.Size = new System.Drawing.Size(207, 30);
this.panel1.TabIndex = 5;
//
// totga
//
this.totga.AutoSize = true;
- this.totga.Location = new System.Drawing.Point(144, 6);
+ this.totga.Location = new System.Drawing.Point(150, 6);
this.totga.Name = "totga";
- this.totga.Size = new System.Drawing.Size(47, 16);
+ this.totga.Size = new System.Drawing.Size(41, 16);
this.totga.TabIndex = 2;
this.totga.Text = "TGA";
this.totga.UseVisualStyleBackColor = true;
diff --git a/AssetStudioGUI/Exporter.cs b/AssetStudioGUI/Exporter.cs
index 57216a2..ed3b15e 100644
--- a/AssetStudioGUI/Exporter.cs
+++ b/AssetStudioGUI/Exporter.cs
@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using AssetStudio;
+using TGASharpLib;
namespace AssetStudioGUI
{
@@ -41,7 +42,7 @@ namespace AssetStudioGUI
return false;
if (tga)
{
- TGASharpLib.TGA file = new TGASharpLib.TGA(bitmap);
+ var file = new TGA(bitmap);
file.Save(exportFullName);
}
else
diff --git a/AssetStudio/TGASharpLib/TGASharpLib.cs b/AssetStudioGUI/TGASharpLib.cs
similarity index 100%
rename from AssetStudio/TGASharpLib/TGASharpLib.cs
rename to AssetStudioGUI/TGASharpLib.cs