Skip to content

Commit 76f850c

Browse files
authored
patterns/fas/was: Update FAS, WAS/WA3 pattern files and README.md (#425)
* Add .fas and .was pattern files (Oska DeskMates) * Update .was pattern file * Update .was/.wa3 pattern file * Update README.md * Update README.md * Update .fas & .was pattern files * Update README.md * Update fas_oskasoftware_old.hexpat * Added WAS test file * Update WAS test file * Update was_oskasoftware.hexpat * Update was_oskasoftware.hexpat * Update fas_oskasoftware_old.hexpat * Update fas_oskasoftware.hexpat * Update README.md Replacing backward slashes with forward ones in the `WAS` row. * Update fas_oskasoftware_old.hexpat * Update was_oskasoftware.hexpat
1 parent 74c06b7 commit 76f850c

File tree

4 files changed

+42
-43
lines changed

4 files changed

+42
-43
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ Everything will immediately show up in ImHex's Content Store and gets bundled wi
191191
| VHDX | | [`patterns/vhdx.hexpat`](patterns/vhdx.hexpat) | Microsoft Hyper-V Virtual Hard Disk format |
192192
| VOX | | [`patterns/vox.hexpat`](patterns/vox.hexpat) | MagicaVoxel scene description format |
193193
| WAV | `audio/x-wav` | [`patterns/wav.hexpat`](patterns/wav.hexpat) | RIFF header, WAVE header, PCM header |
194-
| WAS | | [`patterns\was_oskasoftware.hexpat`](patterns\was_oskasoftware.hexpat) | Oska Software DeskMates WAS/WA3 (WAVE/MP3 Set) file
194+
| WAS | | [`patterns/was_oskasoftware.hexpat`](patterns/was_oskasoftware.hexpat) | Oska Software DeskMates WAS/WA3 (WAVE/MP3 Set) file
195195
| WAD | | [`patterns/wad.hexpat`](patterns/wad.hexpat) | DOOM WAD Archive |
196196
| WebP | `image/webp` | [`patterns/webp.hexpat`](patterns/webp.hexpat) | Google WebP image |
197197
| XBEH | `audio/x-xbox-executable` | [`patterns/xbeh.hexpat`](patterns/xbeh.hexpat) | Xbox executable |

patterns/fas_oskasoftware.hexpat

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
#pragma author DmitriLeon2000
2-
#pragma description Oska Software DeskMates FAS (Frames and Sequences) file
2+
#pragma description Oska Software DeskMates FAS (Frames and Sequences)
33
#pragma endian little
44

55
enum Compression : u32 {
6-
BI_RGB,
7-
BI_RLE8,
8-
BI_RLE4,
9-
BI_BITFIELDS,
10-
BI_JPEG,
11-
BI_PNG,
12-
BI_ALPHABITFIELDS,
13-
BI_CMYK,
14-
BI_CMYKRLE8,
15-
BI_CMYKRLE4,
6+
BI_RGB,
7+
BI_RLE8,
8+
BI_RLE4,
9+
BI_BITFIELDS,
10+
BI_JPEG,
11+
BI_PNG,
12+
BI_ALPHABITFIELDS,
13+
BI_CMYK,
14+
BI_CMYKRLE8,
15+
BI_CMYKRLE4,
1616
};
1717

1818
struct Colors {
19-
u8 blue;
20-
u8 green;
21-
u8 red;
22-
u8 reserved;
19+
u8 blue;
20+
u8 green;
21+
u8 red;
22+
u8 reserved;
2323
};
2424

2525
struct FASHeader {
@@ -69,7 +69,7 @@ struct SeqHeader {
6969
};
7070

7171
struct Bitmap {
72-
u8 byte[fas.fasHeader.version >= 3 ? fas.fasHeader.frameSize + (fas.frameSizeHigh << 16) : fas.fasHeader.frameSize];
72+
u8 byte[parent.fasHeader.version >= 3 ? parent.fasHeader.frameSize + (parent.frameSizeHigh << 16) : parent.fasHeader.frameSize] [[sealed]];
7373
};
7474

7575
struct FramesHeader {
@@ -105,7 +105,7 @@ struct FAS {
105105
u8 filenameChecksum; // a checksum for a filename in ASCII
106106
AnimSequence sequences[seqHeader.count];
107107
FramesHeader framesHeader;
108+
Bitmap framesBitmap[framesHeader.count];
108109
};
109110

110111
FAS fas @ 0x00;
111-
Bitmap framesBitmap[fas.framesHeader.count] @ $;

patterns/fas_oskasoftware_old.hexpat

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
#pragma author DmitriLeon2000
2-
#pragma description Oska Software DeskMates FAS (Frames and Sequences) file (Oska DeskMate versions 1.3 and 2.06)
2+
#pragma description Oska Software DeskMates FAS (Frames and Sequences) (Oska DeskMate 1.03 and 2.06)
33
#pragma endian little
44

55
enum Compression : u32 {
6-
BI_RGB,
7-
BI_RLE8,
8-
BI_RLE4,
9-
BI_BITFIELDS,
10-
BI_JPEG,
11-
BI_PNG,
12-
BI_ALPHABITFIELDS,
13-
BI_CMYK,
14-
BI_CMYKRLE8,
15-
BI_CMYKRLE4,
6+
BI_RGB,
7+
BI_RLE8,
8+
BI_RLE4,
9+
BI_BITFIELDS,
10+
BI_JPEG,
11+
BI_PNG,
12+
BI_ALPHABITFIELDS,
13+
BI_CMYK,
14+
BI_CMYKRLE8,
15+
BI_CMYKRLE4,
1616
};
1717

1818
struct Colors {
19-
u8 blue;
20-
u8 green;
21-
u8 red;
22-
u8 reserved;
19+
u8 blue;
20+
u8 green;
21+
u8 red;
22+
u8 reserved;
2323
};
2424

2525
struct FASHeader {
@@ -59,14 +59,14 @@ struct AnimSequence {
5959
};
6060

6161
struct SeqHeader {
62-
le u32 size;
63-
le u32 count;
64-
le u32 strPointers[count*2];
62+
le u32 size;
63+
le u32 count;
64+
le u32 strPointers[count*2];
6565
};
6666

6767
struct Frame {
68-
u8 colorBitmap[fas.fasHeader.frameSizeColor];
69-
u8 maskBitmap[fas.fasHeader.frameSizeMask];
68+
u8 colorBitmap[parent.fasHeader.frameSizeColor] [[sealed]];
69+
u8 maskBitmap[parent.fasHeader.frameSizeMask] [[sealed]];
7070
};
7171

7272
struct FramesHeader {
@@ -80,8 +80,7 @@ struct FAS {
8080
SeqHeader seqHeader;
8181
AnimSequence sequences[seqHeader.count];
8282
FramesHeader framesHeader;
83+
Frame frames[framesHeader.count];
8384
};
8485

85-
8686
FAS fas @ 0x00;
87-
Frame frames[fas.framesHeader.count] @ $;

patterns/was_oskasoftware.hexpat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import type.size;
77
struct Sound {
88
char name[];
99
u32 length;
10-
u8 data[length];
11-
};
10+
u8 data[length] [[sealed]];
11+
} [[name(name), hex::visualize("sound", data, 1, 8000)]];
1212

1313
struct Header {
1414
type::Size<u32> size;
@@ -21,4 +21,4 @@ struct WAS {
2121
Sound sounds[header.count];
2222
};
2323

24-
WAS was @ 0x00;
24+
WAS was @ 0x00;

0 commit comments

Comments
 (0)