Skip to content

機能実装: ExHibit 差分画像とベース画像の重ね合わせ機能 #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kyororay wants to merge 1 commit into from
Closed

機能実装: ExHibit 差分画像とベース画像の重ね合わせ機能 #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 68 additions & 6 deletions ArcFormats/ExHibit/ImageGYU.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@
//

using System;
using System.ComponentModel.Composition;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.IO;
using System.Linq;
using System.Windows.Media.Imaging;
using System.Windows;
using System.Windows.Media;
using GameRes.Utility;
using System.Windows.Media.Imaging;
using GameRes.Compression;
using GameRes.Cryptography;
using GameRes.Formats.Strings;
using System.Collections;
using GameRes.Utility;

@crskycode crskycode Nov 6, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不要な修正はできるだけ控えてください。

@kyororay kyororay Nov 7, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ご指摘いただき、ありがとうございます。
Visual Studioのコードクリーンアップ機能により、usingが自動で並び替えられてしまったようです。
該当箇所のusingを並び替えないようにソースコードを修正し直します。


namespace GameRes.Formats.ExHibit
{
Expand All @@ -46,6 +47,8 @@ internal class GyuMetaData : ImageMetaData
public int DataSize;
public int AlphaSize;
public int PaletteSize;
public string BaseFileName; //Full path of the base image

}

[Serializable]
Expand Down Expand Up @@ -81,7 +84,7 @@ public override ResourceScheme Scheme
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
stream.Position = 4;
return new GyuMetaData
var info = new GyuMetaData
{
Flags = stream.ReadUInt16(),
CompressionMode = stream.ReadUInt16(),
Expand All @@ -93,6 +96,20 @@ public override ImageMetaData ReadMetaData (IBinaryStream stream)
AlphaSize = stream.ReadInt32(),
PaletteSize = stream.ReadInt32(),
};

if (info.Flags == 0x80 && stream.Length > 1044) //Diff image
{
stream.Position = stream.Length - 1008;
var meta_ary = stream.ReadCString(14).Split(',');
if (meta_ary.Length == 3)
{
info.BaseFileName = Path.GetDirectoryName(stream.Name) + "\\" + meta_ary[0].PadLeft(4, '0') + ".gyu";
info.OffsetX = int.Parse(meta_ary[1]);
info.OffsetY = int.Parse(meta_ary[2]);
}
}

return info;
}

IDictionary CurrentMap = null;
Expand Down Expand Up @@ -123,7 +140,52 @@ public override ImageData Read (IBinaryStream stream, ImageMetaData info)
}
var reader = new GyuReader (stream.AsStream, meta);
reader.Unpack();
return ImageData.CreateFlipped (meta, reader.Format, reader.Palette, reader.Data, reader.Stride);
var image = ImageData.CreateFlipped (meta, reader.Format, reader.Palette, reader.Data, reader.Stride);

if (meta.Flags == 0x80) //Diff image
image = CompositeImage(image, meta);

return image;
}

private ImageData CompositeImage(ImageData image, GyuMetaData meta)
{
int byte_depth = 4;
int stride;
int offset;
byte[] pixels;

if (!string.IsNullOrEmpty(meta.BaseFileName) && VFS.FileExists(meta.BaseFileName))
{
using (var input = VFS.OpenBinaryStream(meta.BaseFileName))
{
var base_meta = (GyuMetaData)ReadMetaData(input);
base_meta.FileName = meta.BaseFileName;
var base_image = Read(input, base_meta);
stride = (int)base_image.Width * byte_depth;
offset = meta.OffsetY * stride + meta.OffsetX * byte_depth;
pixels = new byte[stride * base_image.Height];

var formated_base_source = new FormatConvertedBitmap(base_image.Bitmap, PixelFormats.Bgra32, null, 100); //24bit -> 32bit with alpha
formated_base_source.CopyPixels(Int32Rect.Empty, pixels, stride, 0);

var formated_source = new FormatConvertedBitmap(image.Bitmap, PixelFormats.Bgra32, null, 100); //24bit -> 32bit with alpha
formated_source.CopyPixels(Int32Rect.Empty, pixels, stride, offset);

image = new ImageData(BitmapImage.Create(
(int)base_image.Width,
(int)base_image.Height,
ImageData.DefaultDpiX,
ImageData.DefaultDpiY,
PixelFormats.Bgra32,
null,
pixels,
stride
));
}
}

return image;
}

public override void Write (Stream file, ImageData image)
Expand Down
Loading