diff --git a/ArcFormats/ArcFormats.csproj b/ArcFormats/ArcFormats.csproj
index f757161c..8c5bac66 100644
--- a/ArcFormats/ArcFormats.csproj
+++ b/ArcFormats/ArcFormats.csproj
@@ -108,6 +108,7 @@
+
diff --git a/ArcFormats/Kaguya/ArcAN21.cs b/ArcFormats/Kaguya/ArcAN21.cs
new file mode 100644
index 00000000..a6613310
--- /dev/null
+++ b/ArcFormats/Kaguya/ArcAN21.cs
@@ -0,0 +1,251 @@
+//! \file ArcAN21.cs
+//! \date Sun Apr 30 21:04:25 2017
+//! \brief KaGuYa script engine animation resource.
+//
+// Copyright (C) 2017 by morkt
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.IO;
+using System.Linq;
+using System.Windows.Media;
+
+namespace GameRes.Formats.Kaguya
+{
+ class An21Entry : PackedEntry
+ {
+ public int FrameIndex;
+ public int RleStep;
+ }
+
+ [Export(typeof(ArchiveFormat))]
+ public class An21Opener : ArchiveFormat
+ {
+ public override string Tag { get { return "AN21/KAGUYA"; } }
+ public override string Description { get { return "KaGuYa script engine animation resource"; } }
+ public override uint Signature { get { return 0x31324E41; } } // 'AN21'
+ public override bool IsHierarchic { get { return false; } }
+ public override bool CanWrite { get { return false; } }
+
+ public An21Opener ()
+ {
+ Extensions = new string[] { "anm" };
+ }
+
+ public override ArcFile TryOpen (ArcView file)
+ {
+ int table_count = file.View.ReadUInt16 (4);
+ uint current_offset = 8;
+ for (int i = 0; i < table_count; ++i)
+ {
+ switch (file.View.ReadByte (current_offset++))
+ {
+ case 0: break;
+ case 1: current_offset += 8; break;
+ case 2:
+ case 3:
+ case 4:
+ case 5: current_offset += 4; break;
+ default: return null;
+ }
+ }
+ current_offset += 2 + file.View.ReadUInt16 (current_offset) * 8u;
+ if (!file.View.AsciiEqual (current_offset, "[PIC]10"))
+ return null;
+ current_offset += 7;
+ int frame_count = file.View.ReadInt16 (current_offset);
+ if (!IsSaneCount (frame_count))
+ return null;
+ current_offset += 0x12;
+ string base_name = Path.GetFileNameWithoutExtension (file.Name);
+ var dir = new List (frame_count);
+ var info = new ImageMetaData
+ {
+ OffsetX = file.View.ReadInt32 (current_offset),
+ OffsetY = file.View.ReadInt32 (current_offset+4),
+ Width = file.View.ReadUInt32 (current_offset+8),
+ Height = file.View.ReadUInt32 (current_offset+12),
+ };
+ int channels = file.View.ReadInt32 (current_offset+0x10);
+ info.BPP = channels * 8;
+ current_offset += 0x14;
+ var entry = new An21Entry
+ {
+ FrameIndex = 0,
+ Name = string.Format ("{0}#{1:D2}", base_name, 0),
+ Type = "image",
+ Offset = current_offset,
+ Size = (uint)channels * info.Width * info.Height,
+ IsPacked = false,
+ };
+ dir.Add (entry);
+ current_offset += entry.Size;
+ for (int i = 1; i < frame_count; ++i)
+ {
+ int step = file.View.ReadByte (current_offset++);
+ if (0 == step)
+ return null;
+ uint packed_size = file.View.ReadUInt32 (current_offset);
+ uint unpacked_size = (uint)(channels * (info.OffsetX + (int)info.Width)
+ * (info.OffsetY + (int)info.Height));
+ current_offset += 4;
+ entry = new An21Entry
+ {
+ FrameIndex = i,
+ Name = string.Format ("{0}#{1:D2}", base_name, i),
+ Type = "image",
+ Offset = current_offset,
+ Size = packed_size,
+ UnpackedSize = unpacked_size,
+ IsPacked = true,
+ RleStep = step,
+ };
+ dir.Add (entry);
+ current_offset += packed_size;
+ }
+ return new An21Archive (file, this, dir, info);
+ }
+
+ public override Stream OpenEntry (ArcFile arc, Entry entry)
+ {
+ var anent = entry as An21Entry;
+ var input = arc.File.CreateStream (entry.Offset, entry.Size);
+ if (null == anent || !anent.IsPacked)
+ return input;
+ using (input)
+ {
+ var data = DecompressRLE (input, anent.UnpackedSize, anent.RleStep);
+ return new BinMemoryStream (data);
+ }
+ }
+
+ public override IImageDecoder OpenImage (ArcFile arc, Entry entry)
+ {
+ var anarc = (An21Archive)arc;
+ var anent = (An21Entry)entry;
+ var pixels = anarc.GetFrame (anent.FrameIndex);
+ return new BitmapDecoder (pixels, anarc.ImageInfo);
+ }
+
+ internal static byte[] DecompressRLE (IBinaryStream input, uint unpacked_size, int rle_step)
+ {
+ var output = new byte[unpacked_size];
+ for (int i = 0; i < rle_step; ++i)
+ {
+ byte v1 = input.ReadUInt8();
+ output[i] = v1;
+ int dst = i + rle_step;
+ while (dst < output.Length)
+ {
+ byte v2 = input.ReadUInt8();
+ output[dst] = v2;
+ dst += rle_step;
+ if (v2 == v1)
+ {
+ int count = input.ReadUInt8();
+ if (0 != (count & 0x80))
+ count = input.ReadUInt8() + ((count & 0x7F) << 8) + 128;
+ while (count --> 0 && dst < output.Length)
+ {
+ output[dst] = v2;
+ dst += rle_step;
+ }
+ if (dst < output.Length)
+ {
+ v2 = input.ReadUInt8();
+ output[dst] = v2;
+ dst += rle_step;
+ }
+ }
+ v1 = v2;
+ }
+ }
+ return output;
+ }
+ }
+
+ class An21Archive : AnmArchive
+ {
+ byte[][] Frames;
+
+ public An21Archive (ArcView arc, ArchiveFormat impl, ICollection dir, ImageMetaData base_info)
+ : base (arc, impl, dir, base_info)
+ {
+ Frames = new byte[dir.Count][];
+ }
+
+ public byte[] GetFrame (int index)
+ {
+ if (index >= Frames.Length)
+ throw new ArgumentException ("index");
+ if (null != Frames[index])
+ return Frames[index];
+
+ var entry = Dir.ElementAt (index);
+ byte[] pixels;
+ using (var stream = OpenEntry (entry))
+ {
+ pixels = new byte[stream.Length];
+ stream.Read (pixels, 0, pixels.Length);
+ }
+ if (index > 0)
+ {
+ var prev_frame = GetFrame (index-1);
+ for (int i = 0; i < pixels.Length; ++i)
+ pixels[i] += prev_frame[i];
+ }
+ Frames[index] = pixels;
+ return pixels;
+ }
+ }
+
+ class BitmapDecoder : IImageDecoder
+ {
+ public Stream Source { get { return null; } }
+ public ImageFormat SourceFormat { get { return null; } }
+ public ImageMetaData Info { get; private set; }
+ public ImageData Image { get; private set; }
+
+ public BitmapDecoder (byte[] pixels, ImageMetaData info)
+ {
+ Info = info;
+ int stride = (int)info.Width * info.BPP / 8;
+ Image = ImageData.CreateFlipped (info, GetFormat(), null, pixels, stride);
+ }
+
+ PixelFormat GetFormat ()
+ {
+ switch (Info.BPP)
+ {
+ case 8: return PixelFormats.Gray8;
+ case 24: return PixelFormats.Bgr24;
+ case 32: return PixelFormats.Bgra32;
+ default: throw new InvalidFormatException();
+ }
+ }
+
+ public void Dispose ()
+ {
+ }
+ }
+}
diff --git a/ArcFormats/Kaguya/ArcLINK.cs b/ArcFormats/Kaguya/ArcLINK.cs
index 81f44046..6a9a52a0 100644
--- a/ArcFormats/Kaguya/ArcLINK.cs
+++ b/ArcFormats/Kaguya/ArcLINK.cs
@@ -2,7 +2,7 @@
//! \date Fri Jan 22 18:44:56 2016
//! \brief KaGuYa archive format.
//
-// Copyright (C) 2016 by morkt
+// Copyright (C) 2016-2017 by morkt
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
@@ -436,13 +436,14 @@ namespace GameRes.Formats.Kaguya
public static ParamsDeserializer Create (IBinaryStream input)
{
var header = input.ReadHeader (0x11);
- if (!header.AsciiEqual ("[SCR-PARAMS]"))
- return null;
- if (header.AsciiEqual (12, "v02"))
- return new ParamsV2Deserializer (input);
- else if (header.AsciiEqual (12, "v05.6"))
- return new ParamsV5Deserializer (input);
- return null;
+ if (header.AsciiEqual ("[SCR-PARAMS]"))
+ {
+ if (header.AsciiEqual (12, "v02"))
+ return new ParamsV2Deserializer (input);
+ else if (header.AsciiEqual (12, "v05.5") || header.AsciiEqual (12, "v05.6"))
+ return new ParamsV5Deserializer (input);
+ }
+ throw new UnknownEncryptionScheme();
}
public virtual LinkEncryption GetEncryption ()
@@ -642,7 +643,10 @@ namespace GameRes.Formats.Kaguya
new Tuple ("AP", (a, e) => DecryptImage (a, e, 0xC)),
};
if (anm_encrypted)
+ {
table.Add (new Tuple ("AN00", (a, e) => DecryptAn00 (a, e)));
+ table.Add (new Tuple ("AN21", (a, e) => DecryptAn21 (a, e)));
+ }
m_type_table = table.ToArray();
}
@@ -683,6 +687,34 @@ namespace GameRes.Formats.Kaguya
return new BinMemoryStream (data, entry.Name);
}
+ Stream DecryptAn21 (LinkArchive arc, LinkEntry entry)
+ {
+ var data = arc.File.View.ReadBytes (entry.Offset, entry.Size);
+ int count = data.ToUInt16 (4);
+ int offset = 8;
+ for (int i = 0; i < count; ++i)
+ {
+ switch (data[offset++])
+ {
+ case 0: break;
+ case 1: offset += 8; break;
+ case 2:
+ case 3:
+ case 4:
+ case 5: offset += 4; break;
+ default: return new BinMemoryStream (data, entry.Name);
+ }
+ }
+ count = data.ToUInt16 (offset);
+ offset += 2 + count * 8 + 0x21;
+ int w = data.ToInt32 (offset);
+ int h = data.ToInt32 (offset+4);
+ int channels = data.ToInt32 (offset+8);
+ offset += 12;
+ DecryptData (data, offset, channels * w * h);
+ return new BinMemoryStream (data, entry.Name);
+ }
+
void DecryptData (byte[] data, int index, int length)
{
while (length > 0)