lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

RGBX-RGBA7

Browse Source
This commit is contained in:
ManicSteiner
2025-01-18 22:45:40 +08:00
parent a935f1cee9
commit cb865b5977
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ArcFormats/DigitalWorks/ImageTM2.cs
View File

@@ -37,7 +37,7 @@ namespace GameRes.Formats.DigitalWorks
public int PaletteSize; public int PaletteSize;
public int HeaderSize; public int HeaderSize;
public int Colors; public int Colors;
public byte X_A; public byte Alpha;
} }
[Export(typeof(ImageFormat))] [Export(typeof(ImageFormat))]
@@ -87,7 +87,7 @@ namespace GameRes.Formats.DigitalWorks
PaletteSize = header.ToInt32 (0x14), PaletteSize = header.ToInt32 (0x14),
HeaderSize = header.ToUInt16 (0x1C), HeaderSize = header.ToUInt16 (0x1C),
Colors = header.ToUInt16 (0x1E), Colors = header.ToUInt16 (0x1E),
X_A = alpha, //header.ToUInt16(0x30) == 0?// not so sure, there will be omissions Alpha = alpha, //header.ToUInt16(0x30) == 0?// not so sure, there will be omissions
}; };
} }
@@ -132,9 +132,9 @@ namespace GameRes.Formats.DigitalWorks
int image_size = (int)m_info.Width * (int)m_info.Height * pixel_size; int image_size = (int)m_info.Width * (int)m_info.Height * pixel_size;
var output = m_input.ReadBytes (image_size); var output = m_input.ReadBytes (image_size);
if (pixel_size <= 8 && m_info.Colors > 0) if (pixel_size <= 8 && m_info.Colors > 0)
Palette = ReadPalette (m_info.Colors, m_info.X_A); Palette = ReadPalette (m_info.Colors, m_info.Alpha);
if (pixel_size == 3 || pixel_size == 4 && m_info.X_A == 8) if (pixel_size == 3 || pixel_size == 4 && m_info.Alpha == 8)
{ {
for (int i = 0; i < image_size; i += pixel_size) for (int i = 0; i < image_size; i += pixel_size)
{ {
@@ -143,7 +143,7 @@ namespace GameRes.Formats.DigitalWorks
output[i+2] = r; output[i+2] = r;
} }
} }
if (pixel_size == 4 && m_info.X_A == 7) if (pixel_size == 4 && m_info.Alpha == 7)
{ {
for (int i = 0; i < image_size; i += 4) for (int i = 0; i < image_size; i += 4)
{ {
@@ -156,7 +156,7 @@ namespace GameRes.Formats.DigitalWorks
output[i + 3] = (byte)(output[i + 3] << 1); output[i + 3] = (byte)(output[i + 3] << 1);
} }
} }
if (pixel_size == 4 && m_info.X_A == 0) if (pixel_size == 4 && m_info.Alpha == 0)
{ {
for (int i = 0; i < image_size; i += 4) for (int i = 0; i < image_size; i += 4)
{ {
@@ -172,7 +172,7 @@ namespace GameRes.Formats.DigitalWorks
BitmapPalette ReadPalette (int color_num, byte X_A = 8) BitmapPalette ReadPalette (int color_num, byte X_A = 8)
{ {
var source = ImageFormat.ReadColorMap (m_input.AsStream, var source = ImageFormat.ReadColorMap (m_input.AsStream,
color_num, X_A == 7 ? PaletteFormat.RgbX : X_A == 0 ? PaletteFormat.RgbX_Disposed : PaletteFormat.RgbA); color_num, X_A == 7 ? PaletteFormat.RgbA7 : X_A == 0 ? PaletteFormat.RgbX : PaletteFormat.RgbA);
var color_map = new Color[color_num]; var color_map = new Color[color_num];
int parts = color_num / 32; int parts = color_num / 32;

10
GameRes/Image.cs
View File

@@ -71,8 +71,8 @@ namespace GameRes
BgrX = 6, BgrX = 6,
RgbA = 9, RgbA = 9,
BgrA = 10, BgrA = 10,
RgbX_Disposed = 55, RgbA7 = 55,
BgrX_Disposed = 66, BgrA7 = 66,
} }
public class ImageData public class ImageData
@@ -215,15 +215,15 @@ namespace GameRes
int src = 0; int src = 0;
var color_map = new Color[colors]; var color_map = new Color[colors];
Func<int, Color> get_color; Func<int, Color> get_color;
if (PaletteFormat.Bgr == format || PaletteFormat.BgrX_Disposed == format) if (PaletteFormat.Bgr == format || PaletteFormat.BgrX == format)
get_color = x => Color.FromRgb (palette_data[x+2], palette_data[x+1], palette_data[x]); get_color = x => Color.FromRgb (palette_data[x+2], palette_data[x+1], palette_data[x]);
else if (PaletteFormat.BgrX == format) else if (PaletteFormat.BgrA7 == format)
get_color = x => Color.FromArgb(palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x+2], palette_data[x+1], palette_data[x]); get_color = x => Color.FromArgb(palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x+2], palette_data[x+1], palette_data[x]);
else if (PaletteFormat.BgrA == format) else if (PaletteFormat.BgrA == format)
get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x+2], palette_data[x+1], palette_data[x]); get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x+2], palette_data[x+1], palette_data[x]);
else if (PaletteFormat.RgbA == format) else if (PaletteFormat.RgbA == format)
get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x], palette_data[x+1], palette_data[x+2]); get_color = x => Color.FromArgb (palette_data[x+3], palette_data[x], palette_data[x+1], palette_data[x+2]);
else if (PaletteFormat.RgbX == format) else if (PaletteFormat.RgbA7 == format)
get_color = x => Color.FromArgb (palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x], palette_data[x+1], palette_data[x+2]); get_color = x => Color.FromArgb (palette_data[x+3] >= byte.MaxValue / 2 ? byte.MaxValue : (byte)(palette_data[x+3] << 1), palette_data[x], palette_data[x+1], palette_data[x+2]);
else else
get_color = x => Color.FromRgb (palette_data[x], palette_data[x+1], palette_data[x+2]); get_color = x => Color.FromRgb (palette_data[x], palette_data[x+1], palette_data[x+2]);