R16 support for Dune 2000 #21170
R16 support for Dune 2000 #21170
Conversation
There was a problem hiding this comment.
Proposal to change the name to Rx or Raster.
File format check is not very robust. It couldn't by conincidence now conflict with the other format i..e shp?
Type byte field that is read from the stream. I would make a byte enum for this to indicate the 1 = 8bpp and also check if otherwise 2?==24rgb? I.e. in all cases where it currently is not 1 you do not expect a pallette. So you use both type and bpp to determine the format.
Perhaps add support to to check if it is either a 8bbp or 24 rgb type.
Constructor of frame searches the first non zero byte. Doesn't seem very robust.
| { | ||
| var color16 = s.ReadUInt16(); | ||
|
|
||
| Data[i++] = (byte)(((color16 >> 7) & 0xf8) | ((color16 >> 12) & 0x07)); |
There was a problem hiding this comment.
Optional. Add some comment explaining the magic. May help future developers.
0xf8=11111000.
File format is bgr and you store rgb?
|
Can we go with |
|
Tbh I heavily dislike file format detection anyway. The more formats you have, the more performance is wasted. It even sometimes misses a format. It's okay imo for formats with a header signature. But all those "try if you can parse it"-stuff is pretty bad. IMO it might make more sense to map extensions to loaders in mod.yaml. or better a path they to a format. But that's not for this PR to discuss. I'll address the class name and flip the RGB to bgr. |
|
There are actually only a handful of true 16-bit sprites (the rest are 8 bit sprites with frame-specific palettes), and this parses them wrong! (so does my branch, FWIW). See frames 4300 - 4309 in the 1.06 patch's DATA.R16, which are supposed to be sidebar icons (cross-reference against DATA.R8). I suspect this is going to be related to the I'm looking into this as part of resurrecting my https://github.com/pchote/OpenRA/tree/d2k-r16 branch with the goal of making d2k use the improved colour sprites by default. I'd like to propose that I take over this feature to avoid rebase conflicts. |
|
On closer inspection, all of the frames that DATA.R16 has as 16bit appear to be duplicates of other frames that have the same data in 8bit! This suggests that the original game may not have used those frames at all and they just contain garbage. The tileset R16 files do indeed contain valid 16bit data. |
|
Superseded by #21240! |
While the Tileset R16 files include 16bpp sprites only, Data.R16 and Mouse.R16 include 8bpp files too. So viewing them in the asset browser still requires the right palette to be selected.