refactor: consolidate constants and fix compilation issues

- Move constants from core/constants.rs to src/constants.rs
- Fix glam::const_vec3! macro usage (replaced with Vec3::new)
- Fix type mismatch in pointer.rs (Z_OFFSET.z vs Z_OFFSET)
- Remove unused imports and dead code
- Update tests and documentation accordingly

Author: rgilks

README.md

@@ -1,9 +1,9 @@
-# Geno-1 : Generative Music Visualizer (Rust + WebGPU + WebAudio)
+# Geno-1: Generative Music Visualizer (Rust + WebGPU + WebAudio)
 
 [![CI](https://github.com/rgilks/geno-1/actions/workflows/ci.yml/badge.svg)](https://github.com/rgilks/geno-1/actions/workflows/ci.yml)
 
 <div align="center">
- <img src="/docs/screenshot.png" alt="rgou Screenshot" width="626" />
+ <img src="/docs/screenshot.png" alt="geno-1 Screenshot" width="626" />
   <br />
   <a href='https://ko-fi.com/N4N31DPNUS' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi2.png?v=6' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
   <hr />
@@ -17,7 +17,7 @@
 - Mouse-driven FX: corner-based saturation (clean ↔ fizz) and opposite-corner delay emphasis; visuals have inertial swirl motion and click ripples
 - Note-driven visuals use attack/release smoothing for organic response (no abrupt jumps)
 - Start overlay to initialize audio (Click Start; canvas-click fallback)
-- Keyboard: A..F (root), 1..7 (mode), R (new sequence), T (random key+mode), Space (pause/resume), ArrowLeft/Right (tempo), ArrowUp/Down (volume), Enter (fullscreen)
+- Keyboard: A..G (root), 1..7 (mode), R (new sequence), T (random key+mode), Space (pause/resume), ArrowLeft/Right (tempo), ArrowUp/Down (volume), Enter (fullscreen)
 - Starts at a lower default volume; use ArrowUp to raise or ArrowDown to lower
 - Dynamic hint shows current BPM, paused, and muted state
 - Rich visuals: voice-reactive wave displacement, ambient waves background, post bloom/tonemap/vignette; optional analyser-driven spectrum dots
@@ -53,8 +53,10 @@ Additional scripts:
 
 Quick controls (browser):
 
-- A..F: root • 1..7: mode • R: new seq • T: random key+mode • Space: pause/resume • ArrowLeft/Right: tempo • ArrowUp/Down: volume • Enter: fullscreen
+- Click Start to initialize audio (canvas click also works)
 - Click canvas: play a note; mouse position affects sound
+- Keys: A..G (root), 1..7 (mode), R (new sequence), T (random key+mode), Space (pause/resume), ArrowLeft/Right (tempo), ArrowUp/Down (volume), Enter (fullscreen)
+- Mouse position maps to master saturation and delay; moving the pointer leaves a “water-like” trailing swirl in visuals
 
 ### Pre-commit Check
 
@@ -97,13 +99,6 @@ This repo is configured to deploy via Cloudflare Workers; cache-control headers
 
 - The build generates `pkg/env.js` with a `version` derived from the current git commit (short SHA, with CI env fallbacks). `index.html` appends `?v=<version>` to the dynamic import of `app_web.js` to ensure deterministic cache busting across deploys.
 
-Controls in browser:
-
-- Click Start to initialize audio (canvas click also works)
-- Click canvas: play a note; mouse position affects sound
-- Keys: A..F (root), 1..7 (mode), R (new sequence), T (random key+mode), Space (pause/resume), ArrowLeft/Right (tempo), ArrowUp/Down (volume), Enter (fullscreen)
-- Mouse position maps to master saturation and delay; moving the pointer leaves a “water-like” trailing swirl in visuals
-
 Headless test:
 
 - `npm run ci` builds, serves, and runs a Puppeteer test locally
@@ -117,8 +112,6 @@ Headless test:
   - Workflow file: `.github/workflows/ci.yml`
   - CI tolerates missing WebGPU in headless by skipping engine-coupled assertions
 
-<!-- Desktop run instructions removed -->
-
 ### Live Demo
 
 - Use the hosted app: [`https://geno-1.tre.systems/`](https://geno-1.tre.systems/)

package.json

@@ -2,7 +2,6 @@
   "name": "geno-1",
   "version": "1.0.0",
   "description": "Web (WASM): uses `wasm-pack` to build and a static `index.html` to run",
-  "main": "index.js",
   "scripts": {
     "build": "wasm-pack build --target web --out-dir pkg --out-name app_web --release && node scripts/gen-env.js && rm -rf dist && mkdir -p dist/pkg && cp pkg/app_web.js dist/pkg/ && cp pkg/app_web_bg.wasm dist/pkg/ && cp pkg/env.js dist/pkg/env.js && cp index.html dist/index.html && cp favicon.svg dist/favicon.svg",
     "dev": "wrangler dev --local --persist-to .wrangler/state --live-reload",

src/constants.rs

@@ -2,6 +2,8 @@
 ///
 /// These constants express intended behavior (e.g., time constants, clamp
 /// limits) and keep magic numbers out of the code, improving readability.
+use glam::Vec3;
+
 // Exponential decay rate for internal pulse energy
 pub const PULSE_ENERGY_DECAY_PER_SEC: f32 = 1.6;
 
@@ -62,6 +64,12 @@ pub const LEVEL_SPAN: f32 = 0.45;
 // Z distance used by both picking and audio listener alignment.
 pub const CAMERA_Z: f32 = 6.0;
 
+// Voice interaction
+pub const PICK_SPHERE_RADIUS: f32 = 0.5;
+pub const SPREAD: Vec3 = glam::Vec3::new(3.0, 3.0, 3.0);
+pub const Z_OFFSET: Vec3 = glam::Vec3::new(0.0, 0.0, -1.5);
+pub const ENGINE_DRAG_MAX_RADIUS: f32 = 1.0;
+
 // Post-processing defaults
 pub const BLOOM_STRENGTH: f32 = 0.9;
 pub const BLOOM_THRESHOLD: f32 = 0.6;

src/core/constants.rs

@@ -1,7 +1,5 @@
-pub mod constants;
 pub mod music;
 
-pub use constants::*;
 pub use music::*;
 
 // Shaders bundled as string constants

src/core/mod.rs

@@ -1,8 +1,6 @@
 use crate::audio;
-use crate::constants::CAMERA_Z;
-use crate::core::{
-    midi_to_hz, MusicEngine, ENGINE_DRAG_MAX_RADIUS, PICK_SPHERE_RADIUS, SPREAD, Z_OFFSET,
-};
+use crate::constants::{CAMERA_Z, ENGINE_DRAG_MAX_RADIUS, PICK_SPHERE_RADIUS, SPREAD, Z_OFFSET};
+use crate::core::{midi_to_hz, MusicEngine};
 use crate::input;
 use crate::render;
 use std::cell::RefCell;
@@ -114,7 +112,7 @@ fn wire_pointerdown(w: &InputWiring) {
             let mut ds = w.drag_state.borrow_mut();
             ds.active = true;
             ds.voice = i;
-            ds.plane_z_world = w.engine.borrow().voices[i].position.z * SPREAD + Z_OFFSET.z;
+            ds.plane_z_world = w.engine.borrow().voices[i].position.z * SPREAD.z + Z_OFFSET.z;
             log::info!("[mouse] begin drag on voice {}", i);
         }
         w.mouse_state.borrow_mut().down = true;

src/events/pointer.rs

@@ -9,7 +9,6 @@ use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_futures::spawn_local;
 use web_sys as web;
-// (DeviceExt no longer needed; legacy vertex buffers removed)
 
 mod audio;
 mod camera;
@@ -21,9 +20,7 @@ mod frame;
 mod input;
 mod overlay;
 mod render;
-// ui module removed; overlay is controlled directly from here
 
-// Rendering/picking shared constants live in `constants.rs`
 fn wire_canvas_resize(canvas: &web::HtmlCanvasElement) {
     dom::sync_canvas_backing_size(canvas);
     let canvas_resize = canvas.clone();
@@ -119,16 +116,6 @@ fn wire_overlay_buttons(audio_ctx: &web::AudioContext, paused: &Rc<RefCell<bool>
         });
     }
 }
-// noisy helper remnants removed
-
-// analyser creation moved to audio::create_analyser
-
-// global keydown moved to events.rs
-
-// Create a GainNode with an initial value; logs on failure and returns None
-// create_gain moved to audio.rs
-
-// (use overlay::hide instead of local helper)
 
 #[wasm_bindgen(start)]
 pub fn start() -> Result<(), JsValue> {
@@ -296,5 +283,3 @@ async fn init() -> anyhow::Result<()> {
 
     Ok(())
 }
-
-// (local GpuState definition removed; use `render::GpuState` exclusively)

src/lib.rs

@@ -1,4 +1,4 @@
-name = "geno-visualizer"
+name = "geno-1"
 compatibility_date = "2024-08-06"
 compatibility_flags = ["nodejs_compat"]
 main = "worker.js"