mirror of
https://github.com/KrisKennaway/ii-vision.git
synced 2024-06-29 03:29:42 +00:00
666272a8fc
- naive version of NTSC artifacting, it uses a sliding 4-bit window to assign a nominal (D)HGR colour to each dot position. A more sophisticated/correct implementation would model the YIQ signal directly. - Switch DHGRBitmap implementation to use a 34-bit representation of the 4-byte tuple, comprised of a 3-bit header and footer, plus 4*7=28-bit body. The headers/footers account for the influence on neighbouring tuples from the 4-bit NTSC window. - With this model each screen byte influences 13 pixels, so we need to precompute 2^26 edit distances for all possible (source, target) 13-bit sequences. - Checkpointing not-yet-working HGR implementation. - Add new unit tests but not yet all passing due to refactoring
82 lines
2.3 KiB
Python
82 lines
2.3 KiB
Python
import enum
|
|
from typing import Dict, Type
|
|
|
|
import colormath.color_objects
|
|
|
|
from colours import HGRColours
|
|
|
|
# Type annotation
|
|
RGB = colormath.color_objects.sRGBColor
|
|
|
|
|
|
def rgb(r, g, b):
|
|
return RGB(r, g, b, is_upscaled=True)
|
|
|
|
|
|
class Palette(enum.Enum):
|
|
"""BMP2DHR palette numbers"""
|
|
UNKNOWN = -1
|
|
IIGS = 0
|
|
NTSC = 5
|
|
|
|
|
|
class BasePalette:
|
|
ID = Palette.UNKNOWN # type: Palette
|
|
|
|
# Palette RGB map
|
|
RGB = {} # type: Dict[HGRColours: RGB]
|
|
|
|
|
|
class NTSCPalette(BasePalette):
|
|
ID = Palette.NTSC
|
|
|
|
# Palette RGB values taken from BMP2DHGR's default NTSC palette
|
|
RGB = {
|
|
HGRColours.BLACK: rgb(0, 0, 0),
|
|
HGRColours.MAGENTA: rgb(148, 12, 125),
|
|
HGRColours.BROWN: rgb(99, 77, 0),
|
|
HGRColours.ORANGE: rgb(249, 86, 29),
|
|
HGRColours.DARK_GREEN: rgb(51, 111, 0),
|
|
HGRColours.GREY1: rgb(126, 126, 126),
|
|
HGRColours.GREEN: rgb(67, 200, 0),
|
|
HGRColours.YELLOW: rgb(221, 206, 23),
|
|
HGRColours.DARK_BLUE: rgb(32, 54, 212),
|
|
HGRColours.VIOLET: rgb(188, 55, 255),
|
|
HGRColours.GREY2: rgb(126, 126, 126),
|
|
HGRColours.PINK: rgb(255, 129, 236),
|
|
HGRColours.MED_BLUE: rgb(7, 168, 225),
|
|
HGRColours.LIGHT_BLUE: rgb(158, 172, 255),
|
|
HGRColours.AQUA: rgb(93, 248, 133),
|
|
HGRColours.WHITE: rgb(255, 255, 255)
|
|
}
|
|
|
|
|
|
class IIGSPalette(BasePalette):
|
|
ID = Palette.IIGS
|
|
|
|
# Palette RGB values taken from BMP2DHGR's KEGS32 palette
|
|
RGB = {
|
|
HGRColours.BLACK: rgb(0, 0, 0),
|
|
HGRColours.MAGENTA: rgb(221, 0, 51),
|
|
HGRColours.BROWN: rgb(136, 85, 34),
|
|
HGRColours.ORANGE: rgb(255, 102, 0),
|
|
HGRColours.DARK_GREEN: rgb(0, 119, 0),
|
|
HGRColours.GREY1: rgb(85, 85, 85),
|
|
HGRColours.GREEN: rgb(0, 221, 0),
|
|
HGRColours.YELLOW: rgb(255, 255, 0),
|
|
HGRColours.DARK_BLUE: rgb(0, 0, 153),
|
|
HGRColours.VIOLET: rgb(221, 0, 221),
|
|
HGRColours.GREY2: rgb(170, 170, 170),
|
|
HGRColours.PINK: rgb(255, 153, 136),
|
|
HGRColours.MED_BLUE: rgb(34, 34, 255),
|
|
HGRColours.LIGHT_BLUE: rgb(102, 170, 255),
|
|
HGRColours.AQUA: rgb(0, 255, 153),
|
|
HGRColours.WHITE: rgb(255, 255, 255)
|
|
}
|
|
|
|
|
|
PALETTES = {
|
|
Palette.IIGS: IIGSPalette,
|
|
Palette.NTSC: NTSCPalette
|
|
} # type: Dict[Palette, Type[BasePalette]]
|