6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-20 14:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Corrects quick-hack version of border drawing: the assumption that the colour must be the same over a plotted period. Also corrects my entry for colour 15.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-04 12:13:05 -04:00
parent c2bb019381
commit c0f0c68f4f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Machines/AmstradCPC/AmstradCPC.cpp
View File

@ -171,9 +171,7 @@ class CRTCBusHandler {
pixel_pointer_ = pixel_data_ = nullptr; pixel_pointer_ = pixel_data_ = nullptr;
} }
} else { } else {
uint8_t *colour_pointer = (uint8_t *)crt_->allocate_write_area(1); output_border(cycles_);
if(colour_pointer) *colour_pointer = border_;
crt_->output_level(cycles_ * 16);
} }
} }
@ -309,8 +307,13 @@ class CRTCBusHandler {
/// Palette management: sets the colour of the selected pen. /// Palette management: sets the colour of the selected pen.
void set_colour(uint8_t colour) { void set_colour(uint8_t colour) {
if(pen_ & 16) { if(pen_ & 16) {
// If border is[/was] currently being output, flush what should have been
// drawn in the old colour.
if(!was_sync_ && !was_enabled_) {
output_border(cycles_);
cycles_ = 0;
}
border_ = mapped_palette_value(colour); border_ = mapped_palette_value(colour);
// TODO: should flush any border currently in progress
} else { } else {
palette_[pen_] = mapped_palette_value(colour); palette_[pen_] = mapped_palette_value(colour);
// TODO: no need for a full regeneration, of every mode, every time // TODO: no need for a full regeneration, of every mode, every time
@ -319,6 +322,12 @@ class CRTCBusHandler {
} }
private: private:
void output_border(unsigned int length) {
uint8_t *colour_pointer = (uint8_t *)crt_->allocate_write_area(1);
if(colour_pointer) *colour_pointer = border_;
crt_->output_level(length * 16);
}
void build_mode_tables() { void build_mode_tables() {
for(int c = 0; c < 256; c++) { for(int c = 0; c < 256; c++) {
// prepare mode 0 // prepare mode 0
@ -357,7 +366,7 @@ class CRTCBusHandler {
COL(1, 1, 1), COL(1, 1, 1), COL(0, 2, 1), COL(2, 2, 1), COL(1, 1, 1), COL(1, 1, 1), COL(0, 2, 1), COL(2, 2, 1),
COL(0, 0, 1), COL(2, 0, 1), COL(0, 1, 1), COL(2, 1, 1), COL(0, 0, 1), COL(2, 0, 1), COL(0, 1, 1), COL(2, 1, 1),
COL(2, 0, 1), COL(2, 2, 1), COL(2, 2, 0), COL(2, 2, 2), COL(2, 0, 1), COL(2, 2, 1), COL(2, 2, 0), COL(2, 2, 2),
COL(2, 0, 0), COL(2, 0, 2), COL(2, 1, 0), COL(2, 1, 1), COL(2, 0, 0), COL(2, 0, 2), COL(2, 1, 0), COL(2, 1, 2),
COL(0, 0, 1), COL(0, 2, 1), COL(0, 2, 0), COL(0, 2, 2), COL(0, 0, 1), COL(0, 2, 1), COL(0, 2, 0), COL(0, 2, 2),
COL(0, 0, 0), COL(0, 0, 2), COL(0, 1, 0), COL(0, 1, 2), COL(0, 0, 0), COL(0, 0, 2), COL(0, 1, 0), COL(0, 1, 2),
COL(1, 0, 1), COL(1, 2, 1), COL(1, 2, 0), COL(1, 2, 2), COL(1, 0, 1), COL(1, 2, 1), COL(1, 2, 0), COL(1, 2, 2),