diff --git a/ShhShell/Terminal/ShaderTestingView.swift b/ShhShell/Terminal/ShaderTestingView.swift index c154a21..a621f09 100644 --- a/ShhShell/Terminal/ShaderTestingView.swift +++ b/ShhShell/Terminal/ShaderTestingView.swift @@ -11,71 +11,69 @@ struct ShaderTestingView: View { @State private var start = Date.now var body: some View { - GeometryReader { geo in - TimelineView(.animation) { tl in - ZStack { - let time = start.distance(to: tl.date) - VStack { - HStack { - Image(systemName: "figure.walk.circle") - .resizable().scaledToFit() - .foregroundStyle(.blue) - Image(systemName: "arrow.right") - .foregroundStyle(.gray) - .frame(width: 25, height: 25) - Image(systemName: "figure.walk.circle") - .resizable().scaledToFit() - .foregroundStyle(.blue) - .colorEffect(ShaderLibrary.redify()) - } - + TimelineView(.animation) { tl in + let time = start.distance(to: tl.date) + ZStack { + VStack { + HStack { Image(systemName: "figure.walk.circle") .resizable().scaledToFit() .foregroundStyle(.blue) - .colorEffect(ShaderLibrary.rainbow(.float(time))) - + Image(systemName: "arrow.right") + .foregroundStyle(.gray) + .frame(width: 25, height: 25) Image(systemName: "figure.walk.circle") .resizable().scaledToFit() .foregroundStyle(.blue) - .distortionEffect( - ShaderLibrary.wave(.float(time)), - maxSampleOffset: .zero - ) - Rectangle() - .padding(.vertical, 20) - .foregroundStyle(.red) - .compositingGroup() - .visualEffect { - content, - proxy in - content.distortionEffect( - ShaderLibrary.waveFlag(.float(time), .float2(proxy.size)), - maxSampleOffset: CGSize(width: 0, height: 40) - ) - } - - Rectangle() - .colorEffect( - ShaderLibrary.sinebow(.float2(300, 200), .float(time)) - ) + .colorEffect(ShaderLibrary.redify()) } - .brightness(0.2) + + Image(systemName: "figure.walk.circle") + .resizable().scaledToFit() + .foregroundStyle(.blue) + .colorEffect(ShaderLibrary.rainbow(.float(time))) + + Image(systemName: "figure.walk.circle") + .resizable().scaledToFit() + .foregroundStyle(.blue) + .distortionEffect( + ShaderLibrary.wave(.float(time)), + maxSampleOffset: .zero + ) + Rectangle() + .padding(.vertical, 20) + .foregroundStyle(.red) + .compositingGroup() + .visualEffect { + content, + proxy in + content.distortionEffect( + ShaderLibrary.waveFlag(.float(time), .float2(proxy.size)), + maxSampleOffset: CGSize(width: 0, height: 40) + ) + } Rectangle() - .foregroundStyle(.black.opacity(1)) - .visualEffect { content, proxy in - content - .colorEffect( - ShaderLibrary.crt( - .float2(proxy.size), - .float(time) - ) - ) - } - .opacity(0.75) - .blendMode(.overlay) - .allowsHitTesting(false) + .colorEffect( + ShaderLibrary.sinebow(.float2(300, 200), .float(time)) + ) } + .brightness(0.2) + + Rectangle() + .foregroundStyle(.black.opacity(1)) + .visualEffect { content, proxy in + content + .colorEffect( + ShaderLibrary.crt( + .float2(proxy.size), + .float(time) + ) + ) + } + .opacity(0.75) + .blendMode(.overlay) + .allowsHitTesting(false) } } } diff --git a/ShhShell/Views/About/AboutView.swift b/ShhShell/Views/About/AboutView.swift index af1e99b..41f318c 100644 --- a/ShhShell/Views/About/AboutView.swift +++ b/ShhShell/Views/About/AboutView.swift @@ -54,9 +54,12 @@ struct AboutView: View { NavigationLink { ShaderTestingView() } label: { - Text("Shader Playground") - .bold() - Text("This is a collection of all the shaders I made while learning!") + VStack { + Text("Shader Playground") + .bold() + Text("This is a collection of all the shaders I made while learning!") + .font(.caption2) + } } } .transition(.scale)