6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-26 09:29:45 +00:00
Code Issues Projects Releases Wiki Activity

Attempts fully to revive text mode.

Browse Source
This commit is contained in:
Thomas Harte 2018-10-02 22:05:58 -04:00
parent 23c3fa6993
commit be52b31b5c
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Components/9918/9918.cpp
View File

@ -330,32 +330,6 @@ void TMS9918::run_for(const HalfCycles cycles) {
} }
break; break;
case LineMode::Text: {
if(pixel_target_) {
const uint32_t colours[2] = { palette[background_colour_], palette[text_colour_] };
const int shift = (output_column_ - first_pixel_column_) % 6;
int byte_column = (output_column_ - first_pixel_column_) / 6;
int pattern = reverse_table.map[pattern_buffer_[byte_column]] >> shift;
int pixels_left = pixels_end - output_column_;
int length = std::min(pixels_left, 6 - shift);
while(true) {
pixels_left -= length;
for(int c = 0; c < length; ++c) {
pixel_target_[c] = colours[pattern&0x01];
pattern >>= 1;
}
pixel_target_ += length;
if(!pixels_left) break;
length = std::min(6, pixels_left);
byte_column++;
pattern = reverse_table.map[pattern_buffer_[byte_column]];
}
}
output_column_ = pixels_end;
} break;
case LineMode::Character: { case LineMode::Character: {
// If this is the start of the visible area, seed sprite shifter positions. // If this is the start of the visible area, seed sprite shifter positions.
SpriteSet &sprite_set = sprite_sets_[active_sprite_set_ ^ 1]; SpriteSet &sprite_set = sprite_sets_[active_sprite_set_ ^ 1];
@ -686,8 +660,25 @@ void Base::draw_tms_character(int start, int end) {
} }
void Base::draw_tms_text(int start, int end) { void Base::draw_tms_text(int start, int end) {
for(int c = start; c < end; ++c) { const uint32_t colours[2] = { palette[background_colour_], palette[text_colour_] };
pixel_target_[c] = static_cast<uint32_t>(c * 0x01010101);
const int shift = start % 6;
int byte_column = start / 6;
int pattern = reverse_table.map[pattern_buffer_[byte_column]] >> shift;
int pixels_left = end - start;
int length = std::min(pixels_left, 6 - shift);
while(true) {
pixels_left -= length;
for(int c = 0; c < length; ++c) {
pixel_target_[c] = colours[pattern&0x01];
pattern >>= 1;
}
pixel_target_ += length;
if(!pixels_left) break;
length = std::min(6, pixels_left);
byte_column++;
pattern = reverse_table.map[pattern_buffer_[byte_column]];
} }
} }