6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-29 12:50:28 +00:00
Code Issues Projects Releases Wiki Activity

Corrects monochrome composite generation.

Browse Source
This commit is contained in:
Thomas Harte 2018-11-24 21:55:15 -05:00
parent 6a62cf9146
commit 6c92853461
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Outputs/OpenGL/ScanTarget.cpp
View File

@ -102,7 +102,7 @@ ScanTarget::~ScanTarget() {
} }
void ScanTarget::set_modals(Modals modals) { void ScanTarget::set_modals(Modals modals) {
modals.display_type = DisplayType::SVideo; modals.display_type = DisplayType::CompositeMonochrome;
modals_ = modals; modals_ = modals;

5
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
View File

@ -309,7 +309,7 @@ std::unique_ptr<Shader> ScanTarget::input_shader(InputDataType input_data_type,
} }
// If the output type is SVideo, throw in an attempt to separate the two chrominance // If the output type is SVideo, throw in an attempt to separate the two chrominance
// channels here; otherwise add an SVideo to composite step. // channels here.
if(display_type == DisplayType::SVideo) { if(display_type == DisplayType::SVideo) {
if(computed_display_type != DisplayType::RGB) { if(computed_display_type != DisplayType::RGB) {
fragment_shader += fragment_shader +=
@ -320,11 +320,12 @@ std::unique_ptr<Shader> ScanTarget::input_shader(InputDataType input_data_type,
"fragColour = vec3(fragColour.x, chroma);"; "fragColour = vec3(fragColour.x, chroma);";
} }
// Add an SVideo to composite step if necessary.
if( if(
(display_type == DisplayType::CompositeMonochrome || display_type == DisplayType::CompositeColour) && (display_type == DisplayType::CompositeMonochrome || display_type == DisplayType::CompositeColour) &&
computed_display_type != DisplayType::CompositeMonochrome computed_display_type != DisplayType::CompositeMonochrome
) { ) {
fragment_shader += "fragColour = vec3(fragColour.r, 2.0*(fragColour.g - 0.5) * quadrature);"; fragment_shader += "fragColour = vec3(mix(fragColour.r, 2.0*(fragColour.g - 0.5), compositeAmplitudeOut));";
} }
return std::unique_ptr<Shader>(new Shader( return std::unique_ptr<Shader>(new Shader(