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

Hacks in double text.

Browse Source 
Actually, only one error: it should start half a column earlier. All 'double' output should. TODO.
This commit is contained in:
Thomas Harte 2020-11-18 19:47:22 -05:00
parent 98347cb1c3
commit 8f4597f742
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Machines/Apple/AppleIIgs/Video.cpp
View File

@ -225,10 +225,20 @@ void VideoBase::output_row(int row, int start, int end) {
if(new_video_ & 0x80) { if(new_video_ & 0x80) {
next_pixel_ = output_super_high_res(next_pixel_, window_start, window_end, row); next_pixel_ = output_super_high_res(next_pixel_, window_start, window_end, row);
} else { } else {
next_pixel_ = output_text(next_pixel_, window_start, window_end, row); switch(graphics_mode(row)) {
case Apple::II::GraphicsMode::Text:
next_pixel_ = output_text(next_pixel_, window_start, window_end, row);
break;
case Apple::II::GraphicsMode::DoubleText:
next_pixel_ = output_double_text(next_pixel_, window_start, window_end, row);
break;
default:
assert(false);
}
// TODO: support modes other than 40-column text. // TODO: support modes other than 40-column text.
if(graphics_mode(row) != Apple::II::GraphicsMode::Text) printf("Outputting incorrect graphics mode!\n"); // if(graphics_mode(row) != Apple::II::GraphicsMode::Text) printf("Outputting incorrect graphics mode!\n");
} }
} }
@ -335,24 +345,37 @@ bool VideoBase::get_composite_is_colour() {
// MARK: - Outputters. // MARK: - Outputters.
forceinline uint16_t *VideoBase::output_char(uint16_t *target, uint8_t source, int row) const {
const int character = source & character_zones_[source >> 6].address_mask;
const uint8_t xor_mask = character_zones_[source >> 6].xor_mask;
const std::size_t character_address = size_t(character << 3) + (row & 7);
const uint8_t character_pattern = character_rom_[character_address] ^ xor_mask;
const uint16_t colours[2] = {background_colour_, text_colour_};
target[0] = colours[(character_pattern & 0x40) >> 6];
target[1] = colours[(character_pattern & 0x20) >> 5];
target[2] = colours[(character_pattern & 0x10) >> 4];
target[3] = colours[(character_pattern & 0x08) >> 3];
target[4] = colours[(character_pattern & 0x04) >> 2];
target[5] = colours[(character_pattern & 0x02) >> 1];
target[6] = colours[(character_pattern & 0x01) >> 0];
return target + 7;
}
uint16_t *VideoBase::output_text(uint16_t *target, int start, int end, int row) const { uint16_t *VideoBase::output_text(uint16_t *target, int start, int end, int row) const {
const uint16_t row_address = get_row_address(row); const uint16_t row_address = get_row_address(row);
for(int c = start; c < end; c++) { for(int c = start; c < end; c++) {
const uint8_t source = ram_[row_address + c]; target = output_char(target, ram_[row_address + c], row);
const int character = source & character_zones_[source >> 6].address_mask; }
const uint8_t xor_mask = character_zones_[source >> 6].xor_mask;
const std::size_t character_address = size_t(character << 3) + (row & 7);
const uint8_t character_pattern = character_rom_[character_address] ^ xor_mask;
const uint16_t colours[2] = {background_colour_, text_colour_};
target[0] = colours[(character_pattern & 0x40) >> 6]; return target;
target[1] = colours[(character_pattern & 0x20) >> 5]; }
target[2] = colours[(character_pattern & 0x10) >> 4];
target[3] = colours[(character_pattern & 0x08) >> 3]; uint16_t *VideoBase::output_double_text(uint16_t *target, int start, int end, int row) const {
target[4] = colours[(character_pattern & 0x04) >> 2]; const uint16_t row_address = get_row_address(row);
target[5] = colours[(character_pattern & 0x02) >> 1]; for(int c = start; c < end; c++) {
target[6] = colours[(character_pattern & 0x01) >> 0]; target = output_char(target, ram_[0x10000 + row_address + c], row);
target += 7; target = output_char(target, ram_[row_address + c], row);
} }
return target; return target;

3
Machines/Apple/AppleIIgs/Video.hpp
View File

@ -82,7 +82,10 @@ class VideoBase: public Apple::II::VideoSwitches<Cycles> {
void output_row(int row, int start, int end); void output_row(int row, int start, int end);
uint16_t *output_super_high_res(uint16_t *target, int start, int end, int row) const; uint16_t *output_super_high_res(uint16_t *target, int start, int end, int row) const;
uint16_t *output_text(uint16_t *target, int start, int end, int row) const; uint16_t *output_text(uint16_t *target, int start, int end, int row) const;
uint16_t *output_double_text(uint16_t *target, int start, int end, int row) const;
forceinline uint16_t *output_char(uint16_t *target, uint8_t source, int row) const;
// Super high-res per-line state. // Super high-res per-line state.
uint8_t line_control_; uint8_t line_control_;