6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-12-22 04:18:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into QtFixUp

Browse Source
This commit is contained in:
Thomas Harte
2025-12-08 21:42:29 -05:00
parent 1c7db60d31 4668b12817
commit be23cf67c6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
View File

@@ -61,8 +61,8 @@
isEnabled = "NO"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--new=archimedes" argument = "--new=zxspectrum"
isEnabled = "NO"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "/Users/thomasharte/Downloads/Program/Program.prg" argument = "/Users/thomasharte/Downloads/Program/Program.prg"
@@ -70,11 +70,11 @@
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages" argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages"
isEnabled = "NO"> isEnabled = "YES">
</CommandLineArgument> </CommandLineArgument>
<CommandLineArgument <CommandLineArgument
argument = "--help" argument = "--help"
isEnabled = "YES"> isEnabled = "NO">
</CommandLineArgument> </CommandLineArgument>
</CommandLineArguments> </CommandLineArguments>
</LaunchAction> </LaunchAction>

5
Outputs/CRT/CRT.cpp
View File

@@ -469,7 +469,7 @@ void CRT::posit(Display::Rect rect) {
}; };
// Continue with any ongoing animation. // Continue with any ongoing animation.
if(animation_step_ < AnimationSteps) { if(animation_step_ != NoFrameYet && animation_step_ < AnimationSteps) {
set_rect(current_rect()); set_rect(current_rect());
++animation_step_; ++animation_step_;
if(animation_step_ == AnimationSteps) { if(animation_step_ == AnimationSteps) {
@@ -507,8 +507,9 @@ void CRT::posit(Display::Rect rect) {
return; return;
} }
} }
}
return;
}
const auto output_frame = rect_accumulator_.posit(rect); const auto output_frame = rect_accumulator_.posit(rect);
dynamic_framer_.update(rect, output_frame, first_reading); dynamic_framer_.update(rect, output_frame, first_reading);