From d4134cd0d8c819c5373713a4538c8d1fcad00878 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 24 Feb 2019 14:35:13 -0500 Subject: [PATCH] Restores proper colour phase to the Apple II. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- Machines/AppleII/Video.cpp | 2 +- Machines/AppleII/Video.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Machines/AppleII/Video.cpp b/Machines/AppleII/Video.cpp index 548974fc7..736f71734 100644 --- a/Machines/AppleII/Video.cpp +++ b/Machines/AppleII/Video.cpp @@ -18,7 +18,7 @@ VideoBase::VideoBase(bool is_iie, std::function &&target) : // Show only the centre 75% of the TV frame. 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_immediate_default_phase(0.0f); + crt_.set_immediate_default_phase(0.5f); character_zones[0].xor_mask = 0; character_zones[0].address_mask = 0x3f; diff --git a/Machines/AppleII/Video.hpp b/Machines/AppleII/Video.hpp index 4c6c619be..fd53ea18a 100644 --- a/Machines/AppleII/Video.hpp +++ b/Machines/AppleII/Video.hpp @@ -534,7 +534,7 @@ template class Video: public VideoBase { 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); 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_);