6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-10 00:29:40 +00:00
Code Issues Projects Releases Wiki Activity

Improve invert and flash support.

Browse Source
This commit is contained in:
Thomas Harte 2025-01-02 23:04:35 -05:00
parent 5c31104d0e
commit 6ebf415a52
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -868,14 +868,24 @@ private:
const auto target = pixels_;
if(target) pixels_ += length;
// TODO: check character top bit for potential flash if characters_256_ is false.
const auto invert_char = [&]() -> bool {
if(characters_256_) return false;
const auto character = output_.attributes<1>();
return character & 0x80;
};
const auto flash_char = [&](uint8_t attributes) -> bool {
return (attributes & 0x80) && (flash_count_ & 0x10);
};
switch(mode) {
case VideoMode::Text: {
const auto attributes = output_.attributes<0>();
const uint16_t source_colours[] = {
colour(attributes), background_[0]
};
const uint16_t colours[] = {
background_[0],
colour(attributes)
invert_char() != flash_char(attributes) ? source_colours[0] : source_colours[1],
invert_char() ? source_colours[1] : source_colours[0],
};
draw_1bpp_segment<length>(target, colours);
} break;
@ -885,7 +895,7 @@ private:
const auto character = output_.attributes<1>();
const uint16_t colours[] = {
background_[character >> 6],
colour(attributes)
colour(attributes),
};
draw_1bpp_segment<length>(target, colours);
} break;
@ -897,13 +907,13 @@ private:
background_[0],
background_[1],
background_[2],
colour(attributes & ~0x08)
colour(attributes & ~0x08),
};
draw_2bpp_segment<length, is_leftovers>(target, colours);
} else {
const uint16_t colours[] = {
background_[0],
colour(attributes & ~0x08)
invert_char() ? colour(attributes & ~0x08) : background_[0],
invert_char() ? background_[0] : colour(attributes & ~0x08),
};
draw_1bpp_segment<length>(target, colours);
}