6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-24 17:32:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix shift timing.

Browse Source
This commit is contained in:
Thomas Harte 2025-01-02 15:52:20 -05:00
parent 3db0e30d12
commit 5ef26a25ee
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -870,8 +870,6 @@ private:
mode == VideoMode::ExtendedColourText
) {
const auto attributes = output_.attributes<0>();
output_.advance_pixels(length);
const auto colours = [&]() -> std::array<uint16_t, 2> {
if constexpr(mode == VideoMode::Text) {
return {
@ -895,19 +893,12 @@ private:
}
}();
draw_1bpp_segment<length>(target, colours.data());
output_.advance_pixels(length);
}
if constexpr (mode == VideoMode::BitmapMulticolour) {
const auto attributes = output_.attributes<0>();
const auto character = output_.attributes<1>();
constexpr int leftover = is_leftovers && (length & 1);
if(is_leftovers) {
output_.advance_pixels(length + leftover);
} else {
output_.advance_pixels(length & ~1);
}
const uint16_t colours[] = {
background_[0],
colour((character >> 4) & 0xf, (attributes >> 0) & 0x7),
@ -915,6 +906,13 @@ private:
background_[1],
};
draw_2bpp_segment<length, is_leftovers>(target, colours);
constexpr int leftover = is_leftovers && (length & 1);
if(is_leftovers) {
output_.advance_pixels(length + leftover);
} else {
output_.advance_pixels(length & ~1);
}
}
if constexpr (mode == VideoMode::Blank) {