6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Introduced a scan's delay, as intended.

Browse Source
This commit is contained in:
Thomas Harte 2016-01-23 17:49:25 -05:00
parent cd97617a8a
commit a9e26d7808
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Outputs/CRT.cpp
View File

@ -170,18 +170,11 @@ CRT::SyncEvent CRT::get_next_horizontal_sync_event(bool hsync_is_requested, unsi
return proposedEvent; return proposedEvent;
} }
void CRT::advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Type type) void CRT::advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Type type, uint16_t tex_x, uint16_t tex_y)
{ {
number_of_cycles *= _time_multiplier; number_of_cycles *= _time_multiplier;
bool is_output_run = ((type == Type::Level) || (type == Type::Data)); bool is_output_run = ((type == Type::Level) || (type == Type::Data));
uint16_t tex_x = 0;
uint16_t tex_y = 0;
if(is_output_run && _current_frame_builder) {
tex_x = _current_frame_builder->_write_x_position;
tex_y = _current_frame_builder->_write_y_position;
}
while(number_of_cycles) { while(number_of_cycles) {
@ -344,16 +337,17 @@ void CRT::set_delegate(Delegate *delegate)
#pragma mark - stream feeding methods #pragma mark - stream feeding methods
void CRT::output_scan(Scan *scan) void CRT::output_scan()
{ {
_next_scan ^= 1;
Scan *scan = &_scans[_next_scan];
bool this_is_sync = (scan->type == Type::Sync); bool this_is_sync = (scan->type == Type::Sync);
bool hsync_requested = !_is_receiving_sync && this_is_sync; bool hsync_requested = !_is_receiving_sync && this_is_sync;
bool vsync_requested = _is_receiving_sync; bool vsync_requested = _is_receiving_sync;
_is_receiving_sync = this_is_sync; _is_receiving_sync = this_is_sync;
advance_cycles(scan->number_of_cycles, scan->source_divider, hsync_requested, vsync_requested, this_is_sync, scan->type); advance_cycles(scan->number_of_cycles, scan->source_divider, hsync_requested, vsync_requested, this_is_sync, scan->type, scan->tex_x, scan->tex_y);
_next_scan ^= 1;
} }
/* /*
@ -363,14 +357,14 @@ void CRT::output_sync(unsigned int number_of_cycles)
{ {
_scans[_next_scan].type = Type::Sync; _scans[_next_scan].type = Type::Sync;
_scans[_next_scan].number_of_cycles = number_of_cycles; _scans[_next_scan].number_of_cycles = number_of_cycles;
output_scan(&_scans[_next_scan]); output_scan();
} }
void CRT::output_blank(unsigned int number_of_cycles) void CRT::output_blank(unsigned int number_of_cycles)
{ {
_scans[_next_scan].type = Type::Blank; _scans[_next_scan].type = Type::Blank;
_scans[_next_scan].number_of_cycles = number_of_cycles; _scans[_next_scan].number_of_cycles = number_of_cycles;
output_scan(&_scans[_next_scan]); output_scan();
} }
void CRT::output_level(unsigned int number_of_cycles) void CRT::output_level(unsigned int number_of_cycles)
@ -379,7 +373,7 @@ void CRT::output_level(unsigned int number_of_cycles)
_scans[_next_scan].number_of_cycles = number_of_cycles; _scans[_next_scan].number_of_cycles = number_of_cycles;
_scans[_next_scan].tex_x = _current_frame_builder ? _current_frame_builder->_write_x_position : 0; _scans[_next_scan].tex_x = _current_frame_builder ? _current_frame_builder->_write_x_position : 0;
_scans[_next_scan].tex_y = _current_frame_builder ? _current_frame_builder->_write_y_position : 0; _scans[_next_scan].tex_y = _current_frame_builder ? _current_frame_builder->_write_y_position : 0;
output_scan(&_scans[_next_scan]); output_scan();
} }
void CRT::output_colour_burst(unsigned int number_of_cycles, uint8_t phase, uint8_t magnitude) void CRT::output_colour_burst(unsigned int number_of_cycles, uint8_t phase, uint8_t magnitude)
@ -388,7 +382,7 @@ void CRT::output_colour_burst(unsigned int number_of_cycles, uint8_t phase, uint
_scans[_next_scan].number_of_cycles = number_of_cycles; _scans[_next_scan].number_of_cycles = number_of_cycles;
_scans[_next_scan].phase = phase; _scans[_next_scan].phase = phase;
_scans[_next_scan].magnitude = magnitude; _scans[_next_scan].magnitude = magnitude;
output_scan(&_scans[_next_scan]); output_scan();
} }
void CRT::output_data(unsigned int number_of_cycles, unsigned int source_divider) void CRT::output_data(unsigned int number_of_cycles, unsigned int source_divider)
@ -398,7 +392,7 @@ void CRT::output_data(unsigned int number_of_cycles, unsigned int source_divider
_scans[_next_scan].tex_x = _current_frame_builder ? _current_frame_builder->_write_x_position : 0; _scans[_next_scan].tex_x = _current_frame_builder ? _current_frame_builder->_write_x_position : 0;
_scans[_next_scan].tex_y = _current_frame_builder ? _current_frame_builder->_write_y_position : 0; _scans[_next_scan].tex_y = _current_frame_builder ? _current_frame_builder->_write_y_position : 0;
_scans[_next_scan].source_divider = source_divider; _scans[_next_scan].source_divider = source_divider;
output_scan(&_scans[_next_scan]); output_scan();
} }
#pragma mark - Buffer supply #pragma mark - Buffer supply

4
Outputs/CRT.hpp
View File

@ -146,7 +146,7 @@ class CRT {
enum Type { enum Type {
Sync, Level, Data, Blank, ColourBurst Sync, Level, Data, Blank, ColourBurst
} type; } type;
void advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, bool vsync_charging, Type type); void advance_cycles(unsigned int number_of_cycles, unsigned int source_divider, bool hsync_requested, bool vsync_requested, const bool vsync_charging, const Type type, uint16_t tex_x, uint16_t tex_y);
// the inner entry point that determines whether and when the next sync event will occur within // the inner entry point that determines whether and when the next sync event will occur within
// the current output window // the current output window
@ -173,7 +173,7 @@ class CRT {
}; };
} _scans[2]; } _scans[2];
int _next_scan; int _next_scan;
void output_scan(Scan *scan); void output_scan();
}; };
} }