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

IBinaryStream migration.

Browse Source
This commit is contained in:
morkt
2016-10-16 09:22:53 +04:00
parent d0c1d5da01
commit bb18303eb4
251 changed files with 3277 additions and 3630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ArcFormats/Tmr-Hiro/ArcPAC.cs
View File

@@ -136,7 +136,7 @@ namespace GameRes.Formats.TmrHiro
++pos;
}
}
return new MemoryStream (data);
return new BinMemoryStream (data, entry.Name);
}
}
}

17
ArcFormats/Tmr-Hiro/AudioTmr.cs
View File

@@ -44,15 +44,15 @@ namespace GameRes.Formats.TmrHiro
Extensions = new string[] { "" };
}
public override SoundInput TryOpen (Stream file)
public override SoundInput TryOpen (IBinaryStream file)
{
if (file.ReadByte() != 0x44)
return null;
file.Position = 4;
if (file.ReadByte() != 0)
return null;
int length = ReadInt32 (file);
if (-1 == length || length != file.Length - 9)
int length = file.ReadInt32();
if (length != file.Length - 9)
return null;
var format = new WaveFormat
{
@@ -63,17 +63,8 @@ namespace GameRes.Formats.TmrHiro
BlockAlign = 4,
AverageBytesPerSecond = 44100*4,
};
var pcm = new StreamRegion (file, 9, length);
var pcm = new StreamRegion (file.AsStream, 9, length);
return new RawPcmInput (pcm, format);
}
private static int ReadInt32 (Stream file)
{
int dword = file.ReadByte();
dword |= file.ReadByte() << 8;
dword |= file.ReadByte() << 16;
dword |= file.ReadByte() << 24;
return dword;
}
}
}

34
ArcFormats/Tmr-Hiro/ImageGRD.cs
View File

@@ -52,45 +52,43 @@ namespace GameRes.Formats.TmrHiro
Extensions = new string[] { "grd", "" };
}
public override ImageMetaData ReadMetaData (Stream stream)
public override ImageMetaData ReadMetaData (IBinaryStream stream)
{
var header = new byte[0x20];
if (header.Length != stream.Read (header, 0, header.Length))
return null;
var header = stream.ReadHeader (0x20);
if (header[0] != 1 && header[0] != 2)
return null;
if (header[1] != 1 && header[1] != 0xA1 && header[1] != 0xA2)
return null;
int bpp = LittleEndian.ToUInt16 (header, 6);
int bpp = header.ToUInt16 (6);
if (bpp != 24 && bpp != 32)
return null;
int screen_width = LittleEndian.ToUInt16 (header, 2);
int screen_height = LittleEndian.ToUInt16 (header, 4);
int left = LittleEndian.ToUInt16 (header, 8);
int right = LittleEndian.ToUInt16 (header, 0xA);
int top = LittleEndian.ToUInt16 (header, 0xC);
int bottom = LittleEndian.ToUInt16 (header, 0xE);
int screen_width = header.ToUInt16 (2);
int screen_height = header.ToUInt16 (4);
int left = header.ToUInt16 (8);
int right = header.ToUInt16 (0xA);
int top = header.ToUInt16 (0xC);
int bottom = header.ToUInt16 (0xE);
var info = new GrdMetaData {
Format = LittleEndian.ToUInt16 (header, 0),
Format = header.ToUInt16 (0),
Width = (uint)(right-left),
Height = (uint)(bottom-top),
BPP = bpp,
OffsetX = left,
OffsetY = screen_height - bottom,
AlphaSize = LittleEndian.ToInt32 (header, 0x10),
RSize = LittleEndian.ToInt32 (header, 0x14),
GSize = LittleEndian.ToInt32 (header, 0x18),
BSize = LittleEndian.ToInt32 (header, 0x1C),
AlphaSize = header.ToInt32 (0x10),
RSize = header.ToInt32 (0x14),
GSize = header.ToInt32 (0x18),
BSize = header.ToInt32 (0x1C),
};
if (0x20 + info.AlphaSize + info.RSize + info.BSize + info.GSize != stream.Length)
return null;
return info;
}
public override ImageData Read (Stream stream, ImageMetaData info)
public override ImageData Read (IBinaryStream stream, ImageMetaData info)
{
var meta = (GrdMetaData)info;
var reader = new GrdReader (stream, meta);
var reader = new GrdReader (stream.AsStream, meta);
reader.Unpack();
return ImageData.Create (info, reader.Format, null, reader.Data);
}