6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-26 10:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Minor step towards correct answers: divide by time_multiplier_.

Browse Source
This commit is contained in:
Thomas Harte 2020-01-20 22:33:51 -05:00
parent 82e5def7c4
commit e7fff6e123
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Outputs/CRT/CRT.cpp
View File

@ -420,7 +420,7 @@ void CRT::output_data(int number_of_cycles, size_t number_of_samples) {
// MARK: - Getters.
Outputs::Display::Rect CRT::get_rect_for_area(int first_line_after_sync, int number_of_lines, int first_cycle_after_sync, int number_of_cycles, float aspect_ratio) {
Outputs::Display::Rect CRT::get_rect_for_area(int first_line_after_sync, int number_of_lines, int first_cycle_after_sync, int number_of_cycles, float aspect_ratio) const {
first_cycle_after_sync *= time_multiplier_;
number_of_cycles *= time_multiplier_;
@ -470,8 +470,11 @@ Outputs::Display::Rect CRT::get_rect_for_area(int first_line_after_sync, int num
Outputs::Display::ScanStatus CRT::get_scan_status() const {
Outputs::Display::ScanStatus status;
status.field_duration = vertical_flywheel_->get_locked_period();
status.field_duration_gradient = vertical_flywheel_->get_last_period_adjustment();
status.current_position = float(vertical_flywheel_->get_current_output_position()) / float(vertical_flywheel_->get_locked_period());
status.field_duration = float(vertical_flywheel_->get_locked_period()) / float(time_multiplier_);
status.field_duration_gradient = float(vertical_flywheel_->get_last_period_adjustment()) / float(time_multiplier_);
status.current_position =
std::max(0.0f,
float(vertical_flywheel_->get_current_output_position()) / (float(vertical_flywheel_->get_locked_period()) * float(time_multiplier_))
);
return status;
}

2
Outputs/CRT/CRT.hpp
View File

@ -264,7 +264,7 @@ class CRT {
int number_of_lines,
int first_cycle_after_sync,
int number_of_cycles,
float aspect_ratio);
float aspect_ratio) const;
/*! Sets the CRT delegate; set to @c nullptr if no delegate is desired. */
inline void set_delegate(Delegate *delegate) {