Display visualizer name in Track Info and enhance 3D visualizer cameras, grid jitter, and Retro Fire soft bezel

Author: Soddentrough

src/engine.rs

@@ -3892,6 +3892,12 @@ impl VulkanEngine {
                                     // 4. Type
                                     ui.horizontal(|ui| { ui.label("Type"); ui.label(&state.module_type); });
 
+                                    // 4b. Visualization
+                                    let vis_name = crate::state::VISUALIZERS.get(state.current_visualizer_idx)
+                                        .map(|v| v.name)
+                                        .unwrap_or("Unknown");
+                                    ui.horizontal(|ui| { ui.label("Visualization"); ui.label(vis_name); });
+                                    
                                     // 5. Video
                                     if let Some(video) = &state.video_info {
                                         if video == "Unsupported Codec" {

src/shaders/vis_3doscilloscope.wgsl

@@ -58,10 +58,10 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     // Subtly rotate camera around center
     let rot_angle = sin(audio.time * 0.2) * 0.15; 
     let cam_dist = 3.2;
-    let cam_height = 1.8; // Higher up to look down at the grid
+    let cam_height = 1.7; // Adjusted camera height
 
     let ro = vec3<f32>(sin(rot_angle) * cam_dist, -cos(rot_angle) * cam_dist, cam_height);
-    let cam_target = vec3<f32>(0.0, 0.0, 0.0);
+    let cam_target = vec3<f32>(0.0, 0.8, 0.0); // Target adjusted to push the far edge higher up in the frame
 
     let w = normalize(cam_target - ro);
     let u = normalize(cross(w, vec3<f32>(0.0, 0.0, 1.0)));

src/shaders/vis_3doscilloscope_freq.wgsl

@@ -59,10 +59,10 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     // Subtly rotate camera around center
     let rot_angle = sin(audio.time * 0.2) * 0.15; 
     let cam_dist = 3.2;
-    let cam_height = 1.8; // Higher up to look down at the grid
+    let cam_height = 1.7; // Adjusted camera height
 
     let ro = vec3<f32>(sin(rot_angle) * cam_dist, -cos(rot_angle) * cam_dist, cam_height);
-    let cam_target = vec3<f32>(0.0, 0.0, 0.0);
+    let cam_target = vec3<f32>(0.0, 0.8, 0.0); // Target adjusted to push the far edge higher up in the frame
 
     let w = normalize(cam_target - ro);
     let u = normalize(cross(w, vec3<f32>(0.0, 0.0, 1.0)));
@@ -81,7 +81,7 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     for (var i = 0u; i < num_lines; i = i + 1u) {
         // Z layout: back to front. i=0 is back (low freq), i=31 is front (high freq).
         let i_f = f32(i);
-        let y_line = mix(5.64, -1.8, i_f / 31.0);
+        let y_line = mix(9.48, -1.8, i_f / 31.0);
 
         let t = (y_line - ro.y) / rd.y;
 

src/shaders/vis_3doscilloscope_raster.wgsl

@@ -74,9 +74,9 @@ fn vs_main_3d(in: VertexInput) -> VertexOutput3D {
     // Camera rotation matches the original 3D CRT Oscilloscope
     let rot_angle = sin(audio.time * 0.2) * 0.15;
     let cam_dist_val = 3.2;
-    let cam_height = 1.8;
+    let cam_height = 1.7; // Adjusted camera height to match others
     let ro = vec3<f32>(sin(rot_angle) * cam_dist_val, cam_height, -cos(rot_angle) * cam_dist_val);
-    let cam_target = vec3<f32>(0.0, 0.0, 0.0);
+    let cam_target = vec3<f32>(0.0, 0.0, 0.8); // Target adjusted to match others (Depth Z = 0.8, Height Y = 0.0)
 
     let f = normalize(cam_target - ro);
     let s = normalize(cross(f, vec3<f32>(0.0, 1.0, 0.0)));
@@ -89,7 +89,18 @@ fn vs_main_3d(in: VertexInput) -> VertexOutput3D {
         vec4<f32>(-dot(s, ro), -dot(u, ro), dot(f, ro), 1.0)
     );
 
-    let clip_pos = camera.proj_matrix * view_matrix * vec4<f32>(p3, 1.0);
+    let view_pos = view_matrix * vec4<f32>(p3, 1.0);
+    // Custom projection matrix to match the 116 degree horizontal / 84 degree vertical FOV of the raymarched versions
+    let p_00 = 1.0 / (0.9 * audio.aspect_ratio);
+    let p_11 = 1.11111111;
+    let p_22 = -1.0001;
+    let p_32 = -0.10001;
+    let clip_pos = vec4<f32>(
+        view_pos.x * p_00,
+        view_pos.y * p_11,
+        view_pos.z * p_22 + p_32,
+        -view_pos.z
+    );
 
     // Apply barrel distortion in clip space (NDC) to match the curved CRT glass
     let ndc = clip_pos.xy / max(clip_pos.w, 0.0001);
@@ -124,8 +135,10 @@ fn fs_main(in: VertexOutput3D) -> @location(0) vec4<f32> {
     // UV derivative-based wireframe grid shader
     // Width has 128 lines, depth has 72 lines
     let grid_res = vec2<f32>(128.0, 72.0);
-    let fwidth_uv = fwidth(in.uv * grid_res) + 0.0001;
-
+    
+    // Use the continuous world-space Z for the vertical grid coordinate to eliminate temporal jitter
+    let uv_g = vec2<f32>(in.uv.x, (in.world_pos.z + 1.8) / 10.8);
+    
     // Amplitude-reactive bloom width and brightness
     let wave_height = clamp(abs(in.hit_val) * 2.0, 0.0, 1.0);
     let bloom_boost = 1.0 + wave_height * 0.8;
@@ -134,22 +147,23 @@ fn fs_main(in: VertexOutput3D) -> @location(0) vec4<f32> {
     let offset_r = vec2<f32>(0.0005, 0.0003);
     let offset_b = vec2<f32>(-0.0005, -0.0003);
 
+    let fwidth_uv = fwidth(uv_g * grid_res) + 0.0001;
+
     // Red Channel Grid
-    let uv_r = in.uv + offset_r;
+    let uv_r = uv_g + offset_r;
     let grid_r = abs(fract(uv_r * grid_res - 0.5) - 0.5) / fwidth_uv;
     let line_r = min(grid_r.x, grid_r.y) / (1.0 + total_coc);
     let wire_r = exp(-line_r * 1.8) / (1.0 + total_coc * 0.5) +
                  (exp(-line_r * 0.15) * 0.45 / (1.0 + total_coc * 0.2) + exp(-line_r * 0.04) * 0.2 / (1.0 + total_coc * 0.1)) * bloom_boost;
 
     // Green/Amber Channel Grid (center)
-    let uv_g = in.uv;
     let grid_g = abs(fract(uv_g * grid_res - 0.5) - 0.5) / fwidth_uv;
     let line_g = min(grid_g.x, grid_g.y) / (1.0 + total_coc);
     let wire_g = exp(-line_g * 1.8) / (1.0 + total_coc * 0.5) +
                  (exp(-line_g * 0.15) * 0.45 / (1.0 + total_coc * 0.2) + exp(-line_g * 0.04) * 0.2 / (1.0 + total_coc * 0.1)) * bloom_boost;
 
     // Blue Channel Grid
-    let uv_b = in.uv + offset_b;
+    let uv_b = uv_g + offset_b;
     let grid_b = abs(fract(uv_b * grid_res - 0.5) - 0.5) / fwidth_uv;
     let line_b = min(grid_b.x, grid_b.y) / (1.0 + total_coc);
     let wire_b = exp(-line_b * 1.8) / (1.0 + total_coc * 0.5) +

src/shaders/vis_flame.wgsl

@@ -33,11 +33,16 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     // --- CRT barrel distortion ---
     let uv = crt_distort_uv(in.uv, 0.03);
 
-    // Outside the CRT tube → pure black
-    if uv.x < 0.0 || uv.x > 1.0 || uv.y < 0.0 || uv.y > 1.0 {
+    // Hard check slightly outside the tube to save performance
+    if uv.x < -0.015 || uv.x > 1.015 || uv.y < -0.015 || uv.y > 1.015 {
         return vec4<f32>(0.0, 0.0, 0.0, 1.0);
     }
 
+    // Soft bezel/vignette boundary fade (blends/blurs the hard edges nicely)
+    let bezel_fade_x = smoothstep(0.0, 0.015, uv.x) * smoothstep(1.0, 0.985, uv.x);
+    let bezel_fade_y = smoothstep(0.0, 0.015, uv.y) * smoothstep(1.0, 0.985, uv.y);
+    let bezel = bezel_fade_x * bezel_fade_y;
+
     // --- Pixelate to virtual resolution (nearest-neighbor, chunky pixels) ---
     let virt_res = vec2<f32>(256.0, 144.0);
     let pixel_coord = floor(uv * virt_res);
@@ -91,5 +96,8 @@ fn fs_main(in: VertexOutput) -> @location(0) vec4<f32> {
     crt_settings.flicker_intensity = 0.03;
     color = apply_crt_effects(color, in.uv, in.clip_position.xy, audio.smooth_time, crt_settings);
 
+    // Apply soft bezel edge fade
+    color *= bezel;
+
     return vec4<f32>(color, 1.0);
 }

src/ui.rs

@@ -252,6 +252,15 @@ pub fn draw(f: &mut Frame, state: &AppState) {
         Span::raw(&state.module_type)
     ]));
 
+    // 4b. Visualization
+    let vis_name = crate::state::VISUALIZERS.get(state.current_visualizer_idx)
+        .map(|v| v.name)
+        .unwrap_or("Unknown");
+    lines.push(Line::from(vec![
+        Span::raw("Vis:    "),
+        Span::raw(vis_name)
+    ]));
+
     // 5. BPM (if available)
     if state.bpm > 0 {
         lines.push(Line::from(vec![