Separate code

Delete some useless code
This commit is contained in:
Perfare
2018-04-11 23:45:39 +08:00
parent 500f7788d4
commit e3a0ab4e4a
12 changed files with 1210 additions and 1220 deletions
+3 -4
View File
@@ -13,7 +13,7 @@ namespace AssetStudio
{
public static bool ExportTexture2D(AssetPreloadData asset, string exportPathName, bool flip)
{
var m_Texture2D = new Texture2D(asset, true);
var m_Texture2D = new Texture2DConverter(new Texture2D(asset, true));
if (m_Texture2D.image_data == null)
return false;
var convert = (bool)Properties.Settings.Default["convertTexture"];
@@ -41,15 +41,14 @@ namespace AssetStudio
bitmap.Dispose();
return true;
}
if (!convert)
else
{
var exportFullName = exportPathName + asset.Text + asset.extension;
var exportFullName = exportPathName + asset.Text + m_Texture2D.GetExtensionName();
if (ExportFileExists(exportFullName))
return false;
File.WriteAllBytes(exportFullName, m_Texture2D.ConvertToContainer());
return true;
}
return false;
}
public static bool ExportAudioClip(AssetPreloadData asset, string exportPath)
+1 -1
View File
@@ -568,7 +568,7 @@ namespace AssetStudio
using (var memStream = new MemoryStream())
{
var bitmap = tex2D.ConvertToBitmap(true);
var bitmap = new Texture2DConverter(tex2D).ConvertToBitmap(true);
if (bitmap != null)
{
bitmap.Save(memStream, ImageFormat.Png);
+2 -2
View File
@@ -40,7 +40,7 @@ namespace AssetStudio
private static Bitmap CutImage(AssetPreloadData asset, AssetPreloadData texture2DAsset, RectangleF textureRect)
{
var texture2D = new Texture2D(texture2DAsset, true);
var texture2D = new Texture2DConverter(new Texture2D(texture2DAsset, true));
using (var originalImage = texture2D.ConvertToBitmap(false))
{
if (originalImage != null)
@@ -61,7 +61,7 @@ namespace AssetStudio
private static Bitmap CutImage(AssetPreloadData asset, AssetPreloadData texture2DAsset, RectangleF textureRect, Sprite sprite)
{
var texture2D = new Texture2D(texture2DAsset, true);
var texture2D = new Texture2DConverter(new Texture2D(texture2DAsset, true));
using (var originalImage = texture2D.ConvertToBitmap(false))
{
if (originalImage != null)
File diff suppressed because it is too large Load Diff