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

Added in the missing keys; added variable phase to the video.

Browse Source
This commit is contained in:
Thomas Harte 2016-10-14 22:39:27 -04:00
parent 288d10c253
commit da9c9ad51a
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/Oric/Video.cpp
View File

@ -15,7 +15,8 @@ VideoOutput::VideoOutput(uint8_t *memory) :
_frame_counter(0), _counter(0), _frame_counter(0), _counter(0),
_state(Sync), _cycles_in_state(0), _state(Sync), _cycles_in_state(0),
_is_graphics_mode(false), _is_graphics_mode(false),
_character_set_base_address(0xb400) _character_set_base_address(0xb400),
_phase(0)
{ {
_crt.reset(new Outputs::CRT::CRT(64*6, 6, Outputs::CRT::DisplayType::PAL50, 1)); _crt.reset(new Outputs::CRT::CRT(64*6, 6, Outputs::CRT::DisplayType::PAL50, 1));
@ -27,6 +28,8 @@ VideoOutput::VideoOutput(uint8_t *memory) :
"texValue >>= 4 - (int(icoordinate.x * 8) & 4);" "texValue >>= 4 - (int(icoordinate.x * 8) & 4);"
"return vec3( uvec3(texValue) & uvec3(4u, 2u, 1u));" "return vec3( uvec3(texValue) & uvec3(4u, 2u, 1u));"
"}"); "}");
_crt->set_output_device(Outputs::CRT::Television);
} }
std::shared_ptr<Outputs::CRT::CRT> VideoOutput::get_crt() std::shared_ptr<Outputs::CRT::CRT> VideoOutput::get_crt()
@ -50,6 +53,7 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
_paper = 0x00; _paper = 0x00;
_use_alternative_character_set = _use_double_height_characters = _blink_text = false; _use_alternative_character_set = _use_double_height_characters = _blink_text = false;
set_character_set_base_address(); set_character_set_base_address();
_phase += 64;
if(!_counter) _frame_counter++; if(!_counter) _frame_counter++;
} }
@ -58,12 +62,14 @@ void VideoOutput::run_for_cycles(int number_of_cycles)
if( if(
(h_counter >= 48 && h_counter <= 53) || (h_counter >= 48 && h_counter <= 53) ||
(_counter >= 256*64 && _counter <= 259*64)) new_state = Sync; (_counter >= 256*64 && _counter <= 259*64)) new_state = Sync;
else if(h_counter >= 54 && h_counter <= 56) new_state = ColourBurst;
else if(_counter < 224*64 && h_counter < 40) new_state = Pixels; else if(_counter < 224*64 && h_counter < 40) new_state = Pixels;
if(_state != new_state) if(_state != new_state)
{ {
switch(_state) switch(_state)
{ {
case ColourBurst: _crt->output_colour_burst(_cycles_in_state * 6, _phase, 128); break;
case Sync: _crt->output_sync(_cycles_in_state * 6); break; case Sync: _crt->output_sync(_cycles_in_state * 6); break;
case Blank: _crt->output_blank(_cycles_in_state * 6); break; case Blank: _crt->output_blank(_cycles_in_state * 6); break;
case Pixels: _crt->output_data(_cycles_in_state * 6, 2); break; case Pixels: _crt->output_data(_cycles_in_state * 6, 2); break;

4
Machines/Oric/Video.hpp
View File

@ -28,7 +28,7 @@ class VideoOutput {
// Output state // Output state
enum State { enum State {
Blank, Sync, Pixels Blank, Sync, Pixels, ColourBurst
} _state; } _state;
unsigned int _cycles_in_state; unsigned int _cycles_in_state;
uint8_t *_pixel_target; uint8_t *_pixel_target;
@ -48,6 +48,8 @@ class VideoOutput {
bool _use_alternative_character_set; bool _use_alternative_character_set;
bool _use_double_height_characters; bool _use_double_height_characters;
bool _blink_text; bool _blink_text;
uint8_t _phase;
}; };
} }

10
OSBindings/Mac/Clock Signal/Machine/Wrappers/CSOric.mm
View File

@ -89,6 +89,16 @@
case VK_Space: _oric.set_key_state(Oric::Key::KeySpace, isPressed); break; case VK_Space: _oric.set_key_state(Oric::Key::KeySpace, isPressed); break;
case VK_Return: _oric.set_key_state(Oric::Key::KeyReturn, isPressed); break; case VK_Return: _oric.set_key_state(Oric::Key::KeyReturn, isPressed); break;
case VK_ANSI_Minus: _oric.set_key_state(Oric::Key::KeyMinus, isPressed); break; case VK_ANSI_Minus: _oric.set_key_state(Oric::Key::KeyMinus, isPressed); break;
case VK_ANSI_Equal: _oric.set_key_state(Oric::Key::KeyEquals, isPressed); break;
case VK_ANSI_Backslash:
_oric.set_key_state(Oric::Key::KeyBackSlash, isPressed); break;
case VK_ANSI_Slash: _oric.set_key_state(Oric::Key::KeyForwardSlash, isPressed); break;
case VK_ANSI_LeftBracket:
_oric.set_key_state(Oric::Key::KeyOpenSquare, isPressed); break;
case VK_ANSI_RightBracket:
_oric.set_key_state(Oric::Key::KeyCloseSquare, isPressed); break;
case VK_ANSI_Quote: _oric.set_key_state(Oric::Key::KeyQuote, isPressed); break;
case VK_RightArrow: _oric.set_key_state(Oric::Key::KeyRight, isPressed); break; case VK_RightArrow: _oric.set_key_state(Oric::Key::KeyRight, isPressed); break;
case VK_LeftArrow: _oric.set_key_state(Oric::Key::KeyLeft, isPressed); break; case VK_LeftArrow: _oric.set_key_state(Oric::Key::KeyLeft, isPressed); break;