diff --git a/vu1_gui.py b/vu1_gui.py index f363485..758aa5f 100644 --- a/vu1_gui.py +++ b/vu1_gui.py @@ -410,12 +410,14 @@ body { +
+ @@ -449,6 +451,11 @@ body { 300ms Anstiegszeit, ~1% Überschwingen
Der Filter ist die Nadelphysik.
+
@@ -561,10 +568,11 @@ function setMode(mode){ fetch('/set/mode/'+mode); document.getElementById('dualband-box').style.display=mode==='dualband'?'block':'none'; document.getElementById('iec-box').style.display=mode==='iec_true'?'block':'none'; - document.getElementById('physics-ctrls').style.display=mode==='iec_true'?'none':'block'; - ['full','dual','iec'].forEach(m=>{ + document.getElementById('natural-box').style.display=mode==='natural_formula'?'block':'none'; + document.getElementById('physics-ctrls').style.display=(mode==='iec_true'||mode==='natural_formula')?'none':'block'; + ['full','dual','iec','natural'].forEach(m=>{ const btn=document.getElementById('mode-'+m); - const act=(m==='full'&&mode==='full')||(m==='dual'&&mode==='dualband')||(m==='iec'&&mode==='iec_true'); + const act=(m==='full'&&mode==='full')||(m==='dual'&&mode==='dualband')||(m==='iec'&&mode==='iec_true')||(m==='natural'&&mode==='natural_formula'); btn.classList.toggle('active', act); }); } @@ -590,6 +598,7 @@ function preset(name){ const P={ iec_vu:{mass:1.0,damping:1.5,spring:4.0,gravity:0}, bbc_ppm:{mass:0.3,damping:2.0,spring:12.0,gravity:0}, + natural_vu:{mass:1.35,damping:2.6,spring:6.4,gravity:0.1}, bouncy:{mass:0.6,damping:0.4,spring:6.0,gravity:0}, heavy:{mass:3.0,damping:2.5,spring:2.0,gravity:1.0}, fast:{mass:0.1,damping:1.8,spring:15.0,gravity:0}, @@ -658,9 +667,10 @@ function drawVU(level, peak){ const ctx = vuCtx; ctx.clearRect(0,0,w,h); - // Center pivot point - const cx = w/2, cy = h + 40; - const radius = h + 20; + // Center pivot point (inside canvas so needle is always visible) + const cx = w/2; + const cy = h - 22; + const radius = Math.min(w * 0.45, h * 0.78); // Scale arc const arcStart = Math.PI + 0.35; @@ -703,7 +713,7 @@ function drawVU(level, peak){ // "VU" label ctx.font = 'italic 24px "Instrument Serif"'; ctx.fillStyle = '#8a7a60'; - ctx.fillText('VU', cx, h*0.45); + ctx.fillText('VU', cx, h*0.62); // Sub minor ticks for(let p=0; p<=100; p+=2){ @@ -1061,6 +1071,9 @@ class PhysicsVU: self._iec_z = np.zeros(2) self._iec_level = 0.0 + # Natural+ Formel (neue Ballistik) + self._natural_env = 0.0 + # ── Biquad helpers ── def _calc_biquad(self, fc): w0 = 2.0 * math.pi * fc / self.sample_rate @@ -1267,6 +1280,50 @@ class PhysicsVU: self.peak_pos = max(0.0, min(100.0, self.peak_pos)) return self.needle_pos, self.peak_pos + # Natural+ (eigene Formel): + # 1) getrennte Attack/Release-Hüllkurve + # 2) 2.-Ordnung Nadelmodell für natürliches Ein-/Ausschwingen + if self.mode == 'natural_formula': + target = self._rms_to_percent(self._latest_rms) + + atk_t = 0.085 # schneller Angriff + rel_t = 0.650 # weicher Rücklauf + alpha_a = 1.0 - math.exp(-dt / atk_t) + alpha_r = 1.0 - math.exp(-dt / rel_t) + alpha = alpha_a if target > self._natural_env else alpha_r + self._natural_env += (target - self._natural_env) * alpha + + # 2nd-order Needle (kritisch nahe gedämpft) + stiffness = 58.0 + damping = 14.5 + acc = stiffness * (self._natural_env - self.needle_pos) - damping * self.needle_vel + self.needle_vel += acc * dt + self.needle_pos += self.needle_vel * dt + self.needle_pos = max(0.0, min(100.0, self.needle_pos)) + + # Bei sehr kleinen Pegeln ruhig auf 0 setzen (kein Mikrozappeln) + if self._natural_env < 0.3 and self.needle_pos < 0.3: + self._natural_env = 0.0 + self.needle_pos = 0.0 + self.needle_vel *= 0.6 + + self._target = self._natural_env + self._f_spring = 0.0 + self._f_damping = 0.0 + self._f_gravity = 0.0 + + peak_t = self._rms_to_percent(self._latest_peak) + if peak_t > self.peak_pos: + self.peak_pos = peak_t + self.peak_hold_t = 1.2 + else: + if self.peak_hold_t > 0: + self.peak_hold_t -= dt + else: + self.peak_pos -= 16.0 * dt + self.peak_pos = max(0.0, min(100.0, self.peak_pos)) + return self.needle_pos, self.peak_pos + # Target if self.mode == 'dualband': target = min(100.0, self._rms_to_percent(self._latest_rms_lo)*self.band_lo_weight + @@ -1411,7 +1468,10 @@ def set_param(param, value): if not meter: return jsonify({"ok": False}) if param == 'mode': meter.mode = value - if value == 'iec_true': meter._iec_z[:] = 0 + if value == 'iec_true': + meter._iec_z[:] = 0 + if value == 'natural_formula': + meter._natural_env = meter.needle_pos elif param == 'monitor': meter.monitor = value == '1' elif param == 'bypass': @@ -1444,7 +1504,7 @@ def reset(): meter.needle_pos=0; meter.needle_vel=0; meter.peak_pos=0 meter.mode='full'; meter.monitor=False; meter.bypass=False; meter.solo='off' meter.band_crossover=250; meter.band_lo_weight=0.6; meter.band_hi_weight=0.4 - meter._iec_z[:]=0; meter._iec_level=0 + meter._iec_z[:]=0; meter._iec_level=0; meter._natural_env=0 return jsonify({"ok": True})