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

Added support for _invertedCells. Treading water a little before making real changes.

Browse Source
This commit is contained in:
Thomas Harte 2016-06-14 21:06:29 -04:00
parent 926f819e3b
commit ce7488dd30
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Components/6560/6560.cpp
View File

@ -107,7 +107,7 @@ void MOS6560::set_register(int address, uint8_t value)
output_border(_cycles_in_state * 4); output_border(_cycles_in_state * 4);
_cycles_in_state = 0; _cycles_in_state = 0;
} }
_invertedCells = !!((value >> 3)&1); _invertedCells = !((value >> 3)&1);
_borderColour = _colours[value & 0x07]; _borderColour = _colours[value & 0x07];
_backgroundColour = _colours[value >> 4]; _backgroundColour = _colours[value >> 4];
break; break;
@ -142,10 +142,14 @@ uint16_t MOS6560::get_address()
// keep track of the amount of time since the speaker was updated; lazy updates are applied // keep track of the amount of time since the speaker was updated; lazy updates are applied
_cycles_since_speaker_update++; _cycles_since_speaker_update++;
// keep track of internal time relative to this scanline
_horizontal_counter++; _horizontal_counter++;
// check for end of scanline
if(_horizontal_counter == 65) if(_horizontal_counter == 65)
{ {
_horizontal_counter = 0; _horizontal_counter = 0;
_vertical_counter++; _vertical_counter++;
_column_counter = -1; _column_counter = -1;
@ -276,14 +280,25 @@ void MOS6560::set_graphics_value(uint8_t value, uint8_t colour_value)
uint8_t cell_colour = _colours[_character_colour & 0x7]; uint8_t cell_colour = _colours[_character_colour & 0x7];
if(!(_character_colour&0x8)) if(!(_character_colour&0x8))
{ {
pixel_pointer[0] = ((_character_value >> 7)&1) ? cell_colour : _backgroundColour; uint8_t colours[2];
pixel_pointer[1] = ((_character_value >> 6)&1) ? cell_colour : _backgroundColour; if(_invertedCells)
pixel_pointer[2] = ((_character_value >> 5)&1) ? cell_colour : _backgroundColour; {
pixel_pointer[3] = ((_character_value >> 4)&1) ? cell_colour : _backgroundColour; colours[0] = cell_colour;
pixel_pointer[4] = ((_character_value >> 3)&1) ? cell_colour : _backgroundColour; colours[1] = _backgroundColour;
pixel_pointer[5] = ((_character_value >> 2)&1) ? cell_colour : _backgroundColour; }
pixel_pointer[6] = ((_character_value >> 1)&1) ? cell_colour : _backgroundColour; else
pixel_pointer[7] = ((_character_value >> 0)&1) ? cell_colour : _backgroundColour; {
colours[0] = _backgroundColour;
colours[1] = cell_colour;
}
pixel_pointer[0] = colours[(_character_value >> 7)&1];
pixel_pointer[1] = colours[(_character_value >> 6)&1];
pixel_pointer[2] = colours[(_character_value >> 5)&1];
pixel_pointer[3] = colours[(_character_value >> 4)&1];
pixel_pointer[4] = colours[(_character_value >> 3)&1];
pixel_pointer[5] = colours[(_character_value >> 2)&1];
pixel_pointer[6] = colours[(_character_value >> 1)&1];
pixel_pointer[7] = colours[(_character_value >> 0)&1];
} }
else else
{ {

1
Components/6560/6560.hpp
View File

@ -81,6 +81,7 @@ class MOS6560 {
bool _invertedCells; bool _invertedCells;
int _horizontal_counter, _vertical_counter; int _horizontal_counter, _vertical_counter;
bool _did_output_graphics;
int _column_counter, _row_counter; int _column_counter, _row_counter;
uint16_t _video_matrix_address_counter, _video_matrix_line_address_counter; uint16_t _video_matrix_address_counter, _video_matrix_line_address_counter;