From a01f90ff3e2195d00817889d6d4e4968debd0cbd Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Sun, 14 Feb 2016 21:57:23 -0500 Subject: [PATCH] Attempted a switch to the real PAL visible area and to something a bit like a real phosphor decay. --- Machines/Electron/Electron.cpp | 2 +- OSBindings/Mac/Clock Signal/Views/CSCathodeRayView.m | 2 +- Outputs/CRT/CRTOpenGL.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Machines/Electron/Electron.cpp b/Machines/Electron/Electron.cpp index df7578a3c..364a44a49 100644 --- a/Machines/Electron/Electron.cpp +++ b/Machines/Electron/Electron.cpp @@ -37,7 +37,7 @@ Machine::Machine() : "float texValue = texture(texID, coordinate).r;" "return vec3(step(4.0/256.0, mod(texValue, 8.0/256.0)), step(2.0/256.0, mod(texValue, 4.0/256.0)), step(1.0/256.0, mod(texValue, 2.0/256.0)));" "}"); -// _crt->set_visible_area(Outputs::Rect(0.2f, 0.05f, 0.82f, 0.82f)); + _crt->set_visible_area(Outputs::Rect(0.1875f, 0.0f, 0.8125f, 0.98f)); memset(_keyStates, 0, sizeof(_keyStates)); memset(_palette, 0xf, sizeof(_palette)); diff --git a/OSBindings/Mac/Clock Signal/Views/CSCathodeRayView.m b/OSBindings/Mac/Clock Signal/Views/CSCathodeRayView.m index 7c223f4de..3134350cf 100644 --- a/OSBindings/Mac/Clock Signal/Views/CSCathodeRayView.m +++ b/OSBindings/Mac/Clock Signal/Views/CSCathodeRayView.m @@ -162,7 +162,7 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt NSOpenGLPFADoubleBuffer, NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core, NSOpenGLPFASampleBuffers, 1, - NSOpenGLPFASamples, 2, + NSOpenGLPFASamples, 16, 0 }; diff --git a/Outputs/CRT/CRTOpenGL.cpp b/Outputs/CRT/CRTOpenGL.cpp index 871c847a9..23c308c66 100644 --- a/Outputs/CRT/CRTOpenGL.cpp +++ b/Outputs/CRT/CRTOpenGL.cpp @@ -311,7 +311,7 @@ char *CRT::get_fragment_shader() "void main(void)" "{" - "fragColour = vec4(rgb_sample(srcCoordinatesVarying).rgb, 2.0 - age);" + "fragColour = vec4(rgb_sample(srcCoordinatesVarying).rgb, 10.0 * exp(-age * 2.0));" "}" , _rgb_shader); }