From c37f1b3b1374df2a2a434d16cd772a4bb00c567e Mon Sep 17 00:00:00 2001 From: Gabriel Schneider Date: Tue, 17 Nov 2026 00:19:38 -0300 Subject: micscope: on the scope module, its copy of the scope code gone micscope carried the code the scope module was lifted from: seven shaders byte for byte, its layouts but for a comment, and a private live view (Live, analyseLive, drawLive) that was Scope.push, scroll and spectrum. Now the live view is ss.live, a scope.Scope, pushed the microphone and drawn with the panel's world rects and the camera (Views.camera), every frame, clipped away while a recording stands in for it so its columns keep up as before; the tuner reads its history from ss.live.gpu.tape. The take panels run scope.kernels and scope.pipelines over the tape with scope.layouts' blocks, wavePass and spectrogramPass inlined at their one use; maxFreq, min_freq and floor_db are the scope's. src/layouts.zig keeps only the tuner's blocks, the build compiles only the tuner's two shaders, and the tuner names notes with scope.midi, scope.hz and scope.note_names. Takes, transport and tuner are as they were. 1003 lines out, 91 in. Tests: zig build test, 67/67 steps, 10/10 tests (the live history's own test went with it; the scope module tests the same). Pictures: the four scripts' 18 screenshots, captured before and after with the same scripts and compared pixel by pixel (two runs before differ by themselves wherever wall-clock playback or microphone timing shows: the playheads, how far the live view has filled). The one difference not of that kind is the live spectrum: micscope made every image at most 132 rows, so its 184-row spectrum was stretched from 132; the scope makes it at its size, so the live spectrum's lines come out crisp (at most 86 in a channel, inside its rect). The take spectra keep micscope's 132. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_016Y9MNBECMWcJD5pdS4SR6T --- examples/micscope/shaders/waveform.frag | 56 --------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 examples/micscope/shaders/waveform.frag (limited to 'examples/micscope/shaders/waveform.frag') diff --git a/examples/micscope/shaders/waveform.frag b/examples/micscope/shaders/waveform.frag deleted file mode 100644 index 37be7ce..0000000 --- a/examples/micscope/shaders/waveform.frag +++ /dev/null @@ -1,56 +0,0 @@ -#version 450 -#extension GL_GOOGLE_include_directive : require -// The waveform from its columns (waveform.comp): one column per pixel, the -// band between its low and high filled, anti-aliased, at least a pixel -// thick; the RMS inside it brighter; played and unplayed in two colors, -// red while recording, green for the live microphone. -layout(location = 0) out vec4 out_color; - -#include "WaveView.glsl" - -layout(set = 2, binding = 0) readonly buffer Columns { vec4 columns[]; }; - -// Match layouts.Tint. -const uint TINT_RECORDING = 1u; -const uint TINT_LIVE = 2u; - -void main() { - vec2 p = gl_FragCoord.xy; - uint x = uint(p.x); - vec4 col = columns[(x + u.scroll) % uint(u.size.x)]; - if (x + u.filled < uint(u.size.x)) col.w = 0.0; - float mid = u.size.y * 0.5; - float scale = u.size.y * 0.46 * u.gain; - - vec3 color = vec3(0.055, 0.06, 0.07); - if (col.w > 0.0) color = vec3(0.075, 0.08, 0.095); - // Center line. - color = mix(color, vec3(0.2, 0.22, 0.26), clamp(1.0 - abs(p.y - mid), 0.0, 1.0) * 0.6); - - if (col.w > 0.0) { - float top = mid - col.y * scale - 0.5; - float bottom = mid - col.x * scale + 0.5; - float outside = max(top - p.y, p.y - bottom); - float cover = clamp(0.5 - outside, 0.0, 1.0); - float rms = col.z * scale; - float inner = clamp(rms - abs(p.y - mid) + 0.5, 0.0, 1.0); - bool played = u.playhead >= 0.0 && p.x < u.playhead; - vec3 band = played ? vec3(0.35, 0.8, 0.95) : vec3(0.45, 0.5, 0.58); - vec3 core = played ? vec3(0.7, 0.95, 1.0) : vec3(0.65, 0.7, 0.78); - if (u.tint == TINT_RECORDING) { - band = vec3(0.95, 0.35, 0.35); - core = vec3(1.0, 0.6, 0.55); - } else if (u.tint == TINT_LIVE) { - band = vec3(0.35, 0.75, 0.5); - core = vec3(0.65, 1.0, 0.75); - } - color = mix(color, mix(band, core, inner), cover); - } - - // Playhead. - if (u.playhead >= 0.0) { - float d = abs(p.x - u.playhead); - color = mix(color, vec3(1.0, 0.85, 0.3), clamp(1.5 - d, 0.0, 1.0)); - } - out_color = vec4(color, 1.0); -} -- cgit v1.3