diff --git a/ShhShell/Terminal/CRT.metal b/ShhShell/Terminal/CRT.metal index 09f50c4..b0da855 100644 --- a/ShhShell/Terminal/CRT.metal +++ b/ShhShell/Terminal/CRT.metal @@ -17,14 +17,14 @@ using namespace metal; float2 bottomTrailing = size; // scanwave - half3 scanwave = 0.5 + 0.5 * sin(time + uv.y*10); - scanwave*=2; +// half3 scanwave = 0.5 + 0.5 * sin(time + uv.y*10); +// scanwave*=2; //scanlines half scanline = 0.5 + 0.5 * sin(uv.y * 1250.0); // scanline *= 0.5; - half3 newColor = scanwave*scanline; + half3 newColor = /*scanwave**/scanline; half alpha = 1 - scanline; alpha *= 1; diff --git a/ShhShell/Views/Terminal/ShellView.swift b/ShhShell/Views/Terminal/ShellView.swift index b39ee8a..59973da 100644 --- a/ShhShell/Views/Terminal/ShellView.swift +++ b/ShhShell/Views/Terminal/ShellView.swift @@ -24,26 +24,15 @@ struct ShellView: View { ZStack { TerminalController(handler: handler, hostsManager: hostsManager) - .colorMultiply(Color(red: 0.95, green: 1, blue: 0.95, opacity: 1)) - .colorMultiply(.white) - // .visualEffect { content, proxy in - // content - // .layerEffect( - // ShaderLibrary.crt( - // .float2(proxy.size), - // .float(time) - // ), - // maxSampleOffset: .zero - // ) - // } - .overlay { - if hostsManager.settings.filter == .crt { - CRTView() - .opacity(0.75) - .blendMode(.overlay) - .allowsHitTesting(false) - } - } +// .colorMultiply(Color(red: 0.95, green: 1, blue: 0.95, opacity: 1)) + .brightness(0.2) + if hostsManager.settings.filter == .crt { + CRTView() + .opacity(0.75) + .brightness(-0.2) + .blendMode(.overlay) + .allowsHitTesting(false) + } } Group {