6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-22 11:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Support extended colour text mode.

Browse Source
This commit is contained in:
Thomas Harte 2025-01-02 15:32:44 -05:00
parent 2e8d9018ef
commit a666cabae9
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Machines/Commodore/Plus4/Video.hpp
View File

@ -863,32 +863,37 @@ private:
const auto target = pixels_;
pixels_ += length;
if constexpr (mode == VideoMode::Text) {
if constexpr (
mode == VideoMode::BitmapHighRes ||
mode == VideoMode::Text ||
mode == VideoMode::ExtendedColourText
) {
const auto attributes = output_.attributes<0>();
const auto pixels = output_.pixels();
output_.advance_pixels(length);
const uint16_t colours[] = { background_[0], colour(attributes) };
if constexpr (length >= 1) target[0] = (pixels & 0x80) ? colours[1] : colours[0];
if constexpr (length >= 2) target[1] = (pixels & 0x40) ? colours[1] : colours[0];
if constexpr (length >= 3) target[2] = (pixels & 0x20) ? colours[1] : colours[0];
if constexpr (length >= 4) target[3] = (pixels & 0x10) ? colours[1] : colours[0];
if constexpr (length >= 5) target[4] = (pixels & 0x08) ? colours[1] : colours[0];
if constexpr (length >= 6) target[5] = (pixels & 0x04) ? colours[1] : colours[0];
if constexpr (length >= 7) target[6] = (pixels & 0x02) ? colours[1] : colours[0];
if constexpr (length >= 8) target[7] = (pixels & 0x01) ? colours[1] : colours[0];
}
const auto colours = [&]() -> std::array<uint16_t, 2> {
if constexpr(mode == VideoMode::Text) {
return {
background_[0],
colour(attributes)
};
}
if constexpr (mode == VideoMode::BitmapHighRes) {
const auto attributes = output_.attributes<0>();
const auto character = output_.attributes<1>();
const auto pixels = output_.pixels();
output_.advance_pixels(length);
const uint16_t colours[] = {
colour((character >> 0) & 0xf, (attributes >> 4) & 0x7),
colour((character >> 4) & 0xf, (attributes >> 0) & 0x7),
};
const auto character = output_.attributes<1>();
if constexpr(mode == VideoMode::BitmapHighRes) {
return {
colour((character >> 0) & 0xf, (attributes >> 4) & 0x7),
colour((character >> 4) & 0xf, (attributes >> 0) & 0x7),
};
} else {
// i.e. VideoMode::ExtendedColourText.
return {
background_[character >> 6],
colour(attributes)
};
}
}();
if constexpr (length >= 1) target[0] = (pixels & 0x80) ? colours[1] : colours[0];
if constexpr (length >= 2) target[1] = (pixels & 0x40) ? colours[1] : colours[0];