Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-25 20:34:13 +08:00
Code Issues Projects Releases Wiki Activity

(TLG): take blending method from tags (#205)

Browse Source
This commit is contained in:
morkt 2018-07-27 19:58:17 +04:00
parent 217dc445ca
commit df064990b9
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ArcFormats/KiriKiri/ImageTLG.cs
View File

@ -154,6 +154,9 @@ namespace GameRes.Formats.KiriKiri
meta.OffsetY = tags.GetInt (3) & 0xFFFF; meta.OffsetY = tags.GetInt (3) & 0xFFFF;
if (string.IsNullOrEmpty (base_name)) if (string.IsNullOrEmpty (base_name))
return null; return null;
int method = 1;
if (tags.HasKey (4))
method = tags.GetInt (4);
base_name = VFS.CombinePath (VFS.GetDirectoryName (meta.FileName), base_name); base_name = VFS.CombinePath (VFS.GetDirectoryName (meta.FileName), base_name);
if (base_name == meta.FileName) if (base_name == meta.FileName)
@ -169,12 +172,12 @@ namespace GameRes.Formats.KiriKiri
base_info.FileName = base_name; base_info.FileName = base_name;
base_image = ReadTlg (base_file, base_info); base_image = ReadTlg (base_file, base_info);
} }
var pixels = BlendImage (base_image, base_info, image, meta); var pixels = BlendImage (base_image, base_info, image, meta, method);
PixelFormat format = 32 == base_info.BPP ? PixelFormats.Bgra32 : PixelFormats.Bgr32; PixelFormat format = 32 == base_info.BPP ? PixelFormats.Bgra32 : PixelFormats.Bgr32;
return ImageData.Create (base_info, format, null, pixels, (int)base_info.Width*4); return ImageData.Create (base_info, format, null, pixels, (int)base_info.Width*4);
} }
byte[] BlendImage (byte[] base_image, ImageMetaData base_info, byte[] overlay, ImageMetaData overlay_info) byte[] BlendImage (byte[] base_image, ImageMetaData base_info, byte[] overlay, ImageMetaData overlay_info, int method)
{ {
int dst_stride = (int)base_info.Width * 4; int dst_stride = (int)base_info.Width * 4;
int src_stride = (int)overlay_info.Width * 4; int src_stride = (int)overlay_info.Width * 4;
@ -186,7 +189,14 @@ namespace GameRes.Formats.KiriKiri
for (uint x = 0; x < overlay_info.Width; ++x) for (uint x = 0; x < overlay_info.Width; ++x)
{ {
byte src_alpha = overlay[src+3]; byte src_alpha = overlay[src+3];
if (src_alpha != 0) if (2 == method)
{
base_image[dst] ^= overlay[src];
base_image[dst+1] ^= overlay[src+1];
base_image[dst+2] ^= overlay[src+2];
base_image[dst+3] ^= src_alpha;
}
else if (src_alpha != 0)
{ {
if (0xFF == src_alpha || 0 == base_image[dst+3]) if (0xFF == src_alpha || 0 == base_image[dst+3])
{ {
@ -1129,6 +1139,11 @@ namespace GameRes.Formats.KiriKiri
return Int32.Parse (len_str); return Int32.Parse (len_str);
} }
public bool HasKey (int key)
{
return m_map.ContainsKey (key);
}
public int GetInt (int key) public int GetInt (int key)
{ {
var val = m_map[key]; var val = m_map[key];