6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-27 16:31:31 +00:00
Code Issues Projects Releases Wiki Activity

Restores proper colour phase to the Apple II.

Browse Source 
Given that its timing errors were fixed, this also switches back to using 'default' colour bursts — i.e. ones with implicit phase. The Apple II continues to be an excellent bellwether for issues in the pipeline, and this helps further to ensure that.
This commit is contained in:
Thomas Harte 2019-02-24 14:35:13 -05:00
parent c775a6c0f8
commit d4134cd0d8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Machines/AppleII/Video.cpp
View File

@ -18,7 +18,7 @@ VideoBase::VideoBase(bool is_iie, std::function<void(Cycles)> &&target) :
// Show only the centre 75% of the TV frame. // Show only the centre 75% of the TV frame.
crt_.set_display_type(Outputs::Display::DisplayType::CompositeColour); crt_.set_display_type(Outputs::Display::DisplayType::CompositeColour);
crt_.set_visible_area(Outputs::Display::Rect(0.118f, 0.122f, 0.77f, 0.77f)); crt_.set_visible_area(Outputs::Display::Rect(0.118f, 0.122f, 0.77f, 0.77f));
crt_.set_immediate_default_phase(0.0f); crt_.set_immediate_default_phase(0.5f);
character_zones[0].xor_mask = 0; character_zones[0].xor_mask = 0;
character_zones[0].address_mask = 0x3f; character_zones[0].address_mask = 0x3f;

2
Machines/AppleII/Video.hpp
View File

@ -534,7 +534,7 @@ template <class BusHandler, bool is_iie> class Video: public VideoBase {
const int colour_burst_start = std::max(first_sync_column + sync_length + 1, column_); const int colour_burst_start = std::max(first_sync_column + sync_length + 1, column_);
const int colour_burst_end = std::min(first_sync_column + sync_length + 4, ending_column); const int colour_burst_end = std::min(first_sync_column + sync_length + 4, ending_column);
if(colour_burst_end > colour_burst_start) { if(colour_burst_end > colour_burst_start) {
crt_.output_colour_burst((colour_burst_end - colour_burst_start) * 14, 192); crt_.output_default_colour_burst((colour_burst_end - colour_burst_start) * 14);
} }
second_blank_start = std::max(first_sync_column + sync_length + 3, column_); second_blank_start = std::max(first_sync_column + sync_length + 3, column_);