From 6038b99b60870b1120bb7f373f551a9c752b985d Mon Sep 17 00:00:00 2001 From: neon443 <69979447+neon443@users.noreply.github.com> Date: Wed, 27 Aug 2025 15:11:06 +0100 Subject: [PATCH] AAGHDHDHDHDHFhioheoihwioe --- ShhShell/Terminal/CRT.metal | 13 ++----------- ShhShell/Terminal/SSHTerminalDelegate.swift | 1 + ShhShell/Views/Terminal/CRTView.swift | 2 +- ShhShell/Views/Terminal/ShellView.swift | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ShhShell/Terminal/CRT.metal b/ShhShell/Terminal/CRT.metal index 0523bc5..96e920a 100644 --- a/ShhShell/Terminal/CRT.metal +++ b/ShhShell/Terminal/CRT.metal @@ -16,22 +16,13 @@ using namespace metal; float2 bottomLeading = float2(size.y, 0); float2 bottomTrailing = size; - // scanwave -// 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; + half scanline = 0.5 + 0.5 * sin(uv.y * size.y*2); half alpha = 1 - scanline; alpha *= 2; -// half4 output = half4(layer.sample(pos).xyz*newCol, 1); - half4 output = half4(color.xyz*newColor*alpha, alpha); - return output; + return half4(color.xyz*scanline*alpha, alpha); } //learning shaders stuff here diff --git a/ShhShell/Terminal/SSHTerminalDelegate.swift b/ShhShell/Terminal/SSHTerminalDelegate.swift index 5a74ef5..3d1b4da 100644 --- a/ShhShell/Terminal/SSHTerminalDelegate.swift +++ b/ShhShell/Terminal/SSHTerminalDelegate.swift @@ -53,6 +53,7 @@ final class SSHTerminalDelegate: TerminalView, Sendable, @preconcurrency Termina } override func cursorStyleChanged(source: Terminal, newStyle: CursorStyle) { + super.cursorStyleChanged(source: source, newStyle: newStyle) } diff --git a/ShhShell/Views/Terminal/CRTView.swift b/ShhShell/Views/Terminal/CRTView.swift index 74702ac..9daed9b 100644 --- a/ShhShell/Views/Terminal/CRTView.swift +++ b/ShhShell/Views/Terminal/CRTView.swift @@ -14,7 +14,7 @@ struct CRTView: View { TimelineView(.animation) { tl in let time = tl.date.distance(to: startTime) Rectangle() - .foregroundStyle(.white.opacity(0.1)) + .foregroundStyle(.black.opacity(0.1)) .visualEffect { content, proxy in content .colorEffect( diff --git a/ShhShell/Views/Terminal/ShellView.swift b/ShhShell/Views/Terminal/ShellView.swift index 59973da..ed492ed 100644 --- a/ShhShell/Views/Terminal/ShellView.swift +++ b/ShhShell/Views/Terminal/ShellView.swift @@ -25,7 +25,7 @@ struct ShellView: View { ZStack { TerminalController(handler: handler, hostsManager: hostsManager) // .colorMultiply(Color(red: 0.95, green: 1, blue: 0.95, opacity: 1)) - .brightness(0.2) + .brightness(hostsManager.settings.filter == .crt ? 0.2 : 0.0) if hostsManager.settings.filter == .crt { CRTView() .opacity(0.75)