mirror/AssetStudio
1
0
Fork 0
mirror of https://github.com/aelurum/AssetStudio.git synced 2025-05-27 22:00:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

support new TextureFormat

Browse Source
This commit is contained in:
Perfare 2018-01-15 08:16:55 +08:00
parent 8da4c4623f
commit 6969412385
2 changed files with 107 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
Unity Studio/Unity Classes/Texture2D.cs
View File

@ -221,15 +221,7 @@ namespace Unity_Studio
{ {
BGRA32[i * 4 + 3] = image_data[i]; BGRA32[i * 4 + 3] = image_data[i];
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
image_data_size = BGRA32.Length;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.ARGB4444: //test pass case TextureFormat.ARGB4444: //test pass
@ -258,15 +250,7 @@ namespace Unity_Studio
pixelNew[j] = (byte)((pixelNew[j] << 4) | pixelNew[j]); pixelNew[j] = (byte)((pixelNew[j] << 4) | pixelNew[j]);
pixelNew.CopyTo(BGRA32, i * 4); pixelNew.CopyTo(BGRA32, i * 4);
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
image_data_size = BGRA32.Length;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.RGB24: //test pass case TextureFormat.RGB24: //test pass
@ -287,15 +271,7 @@ namespace Unity_Studio
BGRA32[i * 4 + 2] = image_data[i * 3 + 0]; BGRA32[i * 4 + 2] = image_data[i * 3 + 0];
BGRA32[i * 4 + 3] = 255; BGRA32[i * 4 + 3] = 255;
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
image_data_size = BGRA32.Length;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.RGBA32: //test pass case TextureFormat.RGBA32: //test pass
@ -316,14 +292,7 @@ namespace Unity_Studio
BGRA32[i + 2] = image_data[i + 0]; BGRA32[i + 2] = image_data[i + 0];
BGRA32[i + 3] = image_data[i + 3]; BGRA32[i + 3] = image_data[i + 3];
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.ARGB32://test pass case TextureFormat.ARGB32://test pass
@ -344,14 +313,7 @@ namespace Unity_Studio
BGRA32[i + 2] = image_data[i + 1]; BGRA32[i + 2] = image_data[i + 1];
BGRA32[i + 3] = image_data[i + 0]; BGRA32[i + 3] = image_data[i + 0];
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.RGB565: //test pass case TextureFormat.RGB565: //test pass
@ -376,15 +338,7 @@ namespace Unity_Studio
BGRA32[i * 2 + 2] = (byte)Math.Ceiling(f * 255);//R BGRA32[i * 2 + 2] = (byte)Math.Ceiling(f * 255);//R
BGRA32[i * 2 + 3] = 255;//A BGRA32[i * 2 + 3] = 255;//A
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
image_data_size *= 2;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.DXT1: //test pass case TextureFormat.DXT1: //test pass
@ -445,15 +399,7 @@ namespace Unity_Studio
pixelNew[j] = (byte)((pixelNew[j] << 4) | pixelNew[j]); pixelNew[j] = (byte)((pixelNew[j] << 4) | pixelNew[j]);
pixelNew.CopyTo(BGRA32, i * 4); pixelNew.CopyTo(BGRA32, i * 4);
} }
image_data = BGRA32; SetBGRA32Info(BGRA32);
image_data_size = BGRA32.Length;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
break; break;
} }
case TextureFormat.BGRA32: //test pass case TextureFormat.BGRA32: //test pass
@ -513,28 +459,33 @@ namespace Unity_Studio
pvrPixelFormat = 17; pvrPixelFormat = 17;
break; break;
} }
case TextureFormat.BC4: case TextureFormat.RGB9e5Float:
{
q_format = QFORMAT.Q_FORMAT_RGB9_E5;
break;
}
case TextureFormat.BC4: //test pass
{ {
texturetype = texgenpack_texturetype.RGTC1; texturetype = texgenpack_texturetype.RGTC1;
glInternalFormat = KTXHeader.GL_COMPRESSED_RED_RGTC1; glInternalFormat = KTXHeader.GL_COMPRESSED_RED_RGTC1;
glBaseInternalFormat = KTXHeader.GL_RED; glBaseInternalFormat = KTXHeader.GL_RED;
break; break;
} }
case TextureFormat.BC5: case TextureFormat.BC5: //test pass
{ {
texturetype = texgenpack_texturetype.RGTC2; texturetype = texgenpack_texturetype.RGTC2;
glInternalFormat = KTXHeader.GL_COMPRESSED_RG_RGTC2; glInternalFormat = KTXHeader.GL_COMPRESSED_RG_RGTC2;
glBaseInternalFormat = KTXHeader.GL_RG; glBaseInternalFormat = KTXHeader.GL_RG;
break; break;
} }
case TextureFormat.BC6H: case TextureFormat.BC6H: //test pass
{ {
texturetype = texgenpack_texturetype.BPTC_FLOAT; texturetype = texgenpack_texturetype.BPTC_FLOAT;
glInternalFormat = KTXHeader.GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT; glInternalFormat = KTXHeader.GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT;
glBaseInternalFormat = KTXHeader.GL_RGB; glBaseInternalFormat = KTXHeader.GL_RGB;
break; break;
} }
case TextureFormat.BC7: case TextureFormat.BC7: //test pass
{ {
texturetype = texgenpack_texturetype.BPTC; texturetype = texgenpack_texturetype.BPTC;
glInternalFormat = KTXHeader.GL_COMPRESSED_RGBA_BPTC_UNORM; glInternalFormat = KTXHeader.GL_COMPRESSED_RGBA_BPTC_UNORM;
@ -569,6 +520,7 @@ namespace Unity_Studio
glBaseInternalFormat = KTXHeader.GL_RGBA; glBaseInternalFormat = KTXHeader.GL_RGBA;
break; break;
} }
case TextureFormat.ETC_RGB4Crunched:
case TextureFormat.ETC_RGB4_3DS: //test pass case TextureFormat.ETC_RGB4_3DS: //test pass
case TextureFormat.ETC_RGB4: //test pass case TextureFormat.ETC_RGB4: //test pass
{ {
@ -633,6 +585,7 @@ namespace Unity_Studio
glBaseInternalFormat = KTXHeader.GL_RGBA; glBaseInternalFormat = KTXHeader.GL_RGBA;
break; break;
} }
case TextureFormat.ETC2_RGBA8Crunched:
case TextureFormat.ETC_RGBA8_3DS: //test pass case TextureFormat.ETC_RGBA8_3DS: //test pass
case TextureFormat.ETC2_RGBA8: //test pass case TextureFormat.ETC2_RGBA8: //test pass
{ {
@ -677,6 +630,31 @@ namespace Unity_Studio
pvrPixelFormat = 40; pvrPixelFormat = 40;
break; break;
} }
case TextureFormat.RG16: //test pass
{
//转BGRA32
var BGRA32 = new byte[image_data_size * 2];
for (var i = 0; i < image_data_size; i += 2)
{
BGRA32[i * 2 + 1] = image_data[i + 1];//G
BGRA32[i * 2 + 2] = image_data[i];//R
BGRA32[i * 2 + 3] = 255;//A
}
SetBGRA32Info(BGRA32);
break;
}
case TextureFormat.R8: //test pass
{
//转BGRA32
var BGRA32 = new byte[image_data_size * 4];
for (var i = 0; i < image_data_size; i++)
{
BGRA32[i * 4 + 2] = image_data[i];//R
BGRA32[i * 4 + 3] = 255;//A
}
SetBGRA32Info(BGRA32);
break;
}
} }
} }
else else
@ -699,9 +677,13 @@ namespace Unity_Studio
case TextureFormat.DXT5: case TextureFormat.DXT5:
case TextureFormat.RGBA4444: case TextureFormat.RGBA4444:
case TextureFormat.BGRA32: case TextureFormat.BGRA32:
case TextureFormat.RG16:
case TextureFormat.R8:
preloadData.extension = ".dds"; break; preloadData.extension = ".dds"; break;
case TextureFormat.DXT1Crunched: case TextureFormat.DXT1Crunched:
case TextureFormat.DXT5Crunched: case TextureFormat.DXT5Crunched:
case TextureFormat.ETC_RGB4Crunched:
case TextureFormat.ETC2_RGBA8Crunched:
preloadData.extension = ".crn"; break; preloadData.extension = ".crn"; break;
case TextureFormat.YUY2: case TextureFormat.YUY2:
case TextureFormat.PVRTC_RGB2: case TextureFormat.PVRTC_RGB2:
@ -745,7 +727,7 @@ namespace Unity_Studio
case TextureFormat.EAC_RG_SIGNED: case TextureFormat.EAC_RG_SIGNED:
preloadData.extension = ".ktx"; break; preloadData.extension = ".ktx"; break;
default: default:
preloadData.extension = ".dat"; break; preloadData.extension = ".tex"; break;
} }
switch (m_FilterMode) switch (m_FilterMode)
@ -774,7 +756,7 @@ namespace Unity_Studio
{ {
if (platform == 11) //swap bytes for Xbox confirmed, PS3 not encountered if (platform == 11) //swap bytes for Xbox confirmed, PS3 not encountered
{ {
for (var i = 0; i < (image_data_size / 2); i++) for (var i = 0; i < image_data_size / 2; i++)
{ {
var b0 = image_data[i * 2]; var b0 = image_data[i * 2];
image_data[i * 2] = image_data[i * 2 + 1]; image_data[i * 2] = image_data[i * 2 + 1];
@ -783,6 +765,18 @@ namespace Unity_Studio
} }
} }
private void SetBGRA32Info(byte[] BGRA32)
{
image_data = BGRA32;
image_data_size = BGRA32.Length;
dwFlags2 = 0x41;
dwRGBBitCount = 0x20;
dwRBitMask = 0xFF0000;
dwGBitMask = 0xFF00;
dwBBitMask = 0xFF;
dwABitMask = -16777216;
}
public byte[] ConvertToContainer() public byte[] ConvertToContainer()
{ {
if (image_data == null || image_data.Length == 0) if (image_data == null || image_data.Length == 0)
@ -800,6 +794,8 @@ namespace Unity_Studio
case TextureFormat.DXT5: case TextureFormat.DXT5:
case TextureFormat.RGBA4444: case TextureFormat.RGBA4444:
case TextureFormat.BGRA32: case TextureFormat.BGRA32:
case TextureFormat.RG16:
case TextureFormat.R8:
return ConvertToDDS(); return ConvertToDDS();
case TextureFormat.YUY2: case TextureFormat.YUY2:
case TextureFormat.PVRTC_RGB2: case TextureFormat.PVRTC_RGB2:
@ -921,7 +917,7 @@ namespace Unity_Studio
{ {
if (image_data == null || image_data.Length == 0) if (image_data == null || image_data.Length == 0)
return null; return null;
Bitmap bitmap = null; Bitmap bitmap;
switch (m_TextureFormat) switch (m_TextureFormat)
{ {
case TextureFormat.Alpha8: case TextureFormat.Alpha8:
@ -932,6 +928,8 @@ namespace Unity_Studio
case TextureFormat.R16: case TextureFormat.R16:
case TextureFormat.RGBA4444: case TextureFormat.RGBA4444:
case TextureFormat.BGRA32: case TextureFormat.BGRA32:
case TextureFormat.RG16:
case TextureFormat.R8:
bitmap = BGRA32ToBitmap(); bitmap = BGRA32ToBitmap();
break; break;
case TextureFormat.RGB565: case TextureFormat.RGB565:
@ -970,6 +968,7 @@ namespace Unity_Studio
case TextureFormat.RFloat: case TextureFormat.RFloat:
case TextureFormat.RGFloat: case TextureFormat.RGFloat:
case TextureFormat.RGBAFloat: case TextureFormat.RGBAFloat:
case TextureFormat.RGB9e5Float:
case TextureFormat.ATC_RGB4: case TextureFormat.ATC_RGB4:
case TextureFormat.ATC_RGBA8: case TextureFormat.ATC_RGBA8:
case TextureFormat.EAC_R: case TextureFormat.EAC_R:
@ -986,8 +985,16 @@ namespace Unity_Studio
break; break;
case TextureFormat.DXT1Crunched: case TextureFormat.DXT1Crunched:
case TextureFormat.DXT5Crunched: case TextureFormat.DXT5Crunched:
bitmap = CRNToBitmap(); DecompressCRN();
bitmap = TextureConverter();
break; break;
case TextureFormat.ETC_RGB4Crunched:
case TextureFormat.ETC2_RGBA8Crunched:
DecompressCRN();
bitmap = PVRToBitmap(ConvertToPVR());
break;
default:
return null;
} }
if (bitmap != null && flip) if (bitmap != null && flip)
bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY); bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);
@ -1062,20 +1069,16 @@ namespace Unity_Studio
return bitmap; return bitmap;
} }
private Bitmap CRNToBitmap() private void DecompressCRN()
{ {
IntPtr dxtdata; if (DecompressCRN(image_data, image_data_size, out IntPtr dxtdata, out int dxtsize))
int dxtsize;
if (DecompressCRN(image_data, image_data_size, out dxtdata, out dxtsize))
{ {
var dxtbytes = new byte[dxtsize]; var dxtbytes = new byte[dxtsize];
Marshal.Copy(dxtdata, dxtbytes, 0, dxtsize); Marshal.Copy(dxtdata, dxtbytes, 0, dxtsize);
Marshal.FreeHGlobal(dxtdata); Marshal.FreeHGlobal(dxtdata);
image_data = dxtbytes; image_data = dxtbytes;
image_data_size = dxtsize; image_data_size = dxtsize;
return TextureConverter();
} }
return null;
} }
private Bitmap Texgenpack() private Bitmap Texgenpack()
@ -1147,7 +1150,9 @@ public enum TextureFormat
ETC_RGB4_3DS, ETC_RGB4_3DS,
ETC_RGBA8_3DS, ETC_RGBA8_3DS,
RG16, RG16,
R8 R8,
ETC_RGB4Crunched,
ETC2_RGBA8Crunched,
} }
public static class KTXHeader public static class KTXHeader

46
Unity Studio/Unity Studio Classes/UnityStudio.cs
View File

@ -1595,33 +1595,39 @@ namespace Unity_Studio
if (m_Texture2D.image_data == null) if (m_Texture2D.image_data == null)
return false; return false;
var convert = (bool)Properties.Settings.Default["convertTexture"]; var convert = (bool)Properties.Settings.Default["convertTexture"];
if (convert && asset.extension != ".dat") var bitmap = m_Texture2D.ConvertToBitmap(flip);
if (convert && bitmap != null)
{ {
ImageFormat format = null; ImageFormat format = null;
var ext = (string)Properties.Settings.Default["convertType"]; var ext = (string)Properties.Settings.Default["convertType"];
if (ext == "BMP") switch (ext)
format = ImageFormat.Bmp; {
else if (ext == "PNG") case "BMP":
format = ImageFormat.Png; format = ImageFormat.Bmp;
else if (ext == "JPEG") break;
format = ImageFormat.Jpeg; case "PNG":
format = ImageFormat.Png;
break;
case "JPEG":
format = ImageFormat.Jpeg;
break;
}
var exportFullName = exportPathName + asset.Text + "." + ext.ToLower(); var exportFullName = exportPathName + asset.Text + "." + ext.ToLower();
if (ExportFileExists(exportFullName)) if (ExportFileExists(exportFullName))
return false; return false;
var bitmap = m_Texture2D.ConvertToBitmap(flip); bitmap.Save(exportFullName, format);
if (bitmap != null) bitmap.Dispose();
{ return true;
bitmap.Save(exportFullName, format);
bitmap.Dispose();
return true;
}
return false;
} }
var exportFullName2 = exportPathName + asset.Text + asset.extension; if (!convert)
if (ExportFileExists(exportFullName2)) {
return false; var exportFullName = exportPathName + asset.Text + asset.extension;
File.WriteAllBytes(exportFullName2, m_Texture2D.ConvertToContainer()); if (ExportFileExists(exportFullName))
return true; return false;
File.WriteAllBytes(exportFullName, m_Texture2D.ConvertToContainer());
return true;
}
return false;
} }
public static bool ExportAudioClip(AssetPreloadData asset, string exportPath) public static bool ExportAudioClip(AssetPreloadData asset, string exportPath)