From e9e2d264704befb74a0c369bd11bce667215fe27 Mon Sep 17 00:00:00 2001 From: "google-labs-jules[bot]" <161369871+google-labs-jules[bot]@users.noreply.github.com> Date: Fri, 26 Jun 2026 02:36:53 +0000 Subject: [PATCH] feat: implement advanced drum synthesis based on DSP research - Enhanced TR-808 and TR-909 drum models with authentic synthesis logic. - Implemented diode damping emulation for the 808 Kick. - Added 15-bit LFSR noise generation for vintage digital textures (909 Snappy). - Integrated micro-randomization (pitch drift, variance) across all drum models. - Added drum pattern randomization with Telegram haptic feedback. - Ensured robust AudioNode disposal and CPU optimization (early exits). - Synchronized internal engine parameters with application state. Co-authored-by: Pitrat-wav <255843145+Pitrat-wav@users.noreply.github.com> --- src/components/DrumsView.tsx | 35 ++++++++++++++++++++++++++--- src/logic/DrumMachine.ts | 8 +++++++ src/logic/DrumUtils.ts | 39 +++++++++++++++++++++++++++++++++ src/logic/drums/TR808Clap.ts | 16 ++++++++------ src/logic/drums/TR808Cowbell.ts | 32 ++++++++++++++++----------- src/logic/drums/TR808HiHat.ts | 36 ++++++++++++++++-------------- src/logic/drums/TR808Kick.ts | 13 +++++++---- src/logic/drums/TR808Snare.ts | 23 ++++++++++--------- src/logic/drums/TR909Kick.ts | 24 ++++++++++---------- src/logic/drums/TR909Snare.ts | 21 ++++++++---------- src/store/audioStore.ts | 12 ++++++++++ src/store/instrumentStore.ts | 15 ++++++++++--- 12 files changed, 191 insertions(+), 83 deletions(-) diff --git a/src/components/DrumsView.tsx b/src/components/DrumsView.tsx index 7d191e90..5e2d514b 100644 --- a/src/components/DrumsView.tsx +++ b/src/components/DrumsView.tsx @@ -1,14 +1,12 @@ import { useDrumStore, DrumParams } from '../store/instrumentStore' import { Knob } from './Knob' -import { useBassStore, useHarmonyStore } from '../store/instrumentStore' -import { generateBassPattern } from '../logic/StingGenerator' import { Dices } from 'lucide-react' import { useAudioStore, AudioState } from '../store/audioStore' import { bjorklund, rotateArray } from '../logic/bjorklund' import { TransportControls } from './TransportControls' export function DrumsView() { - const { kick, snare, hihat, hihatOpen, clap, kit, drive, setParams, setKit, setDrive } = useDrumStore() + const { kick, snare, hihat, hihatOpen, clap, kit, drive, setParams, setKit, setDrive, randomizeDrums } = useDrumStore() const { drumMachine, volumes, setVolume } = useAudioStore() const updateDrum = (drum: 'kick' | 'snare' | 'hihat' | 'hihatOpen' | 'clap' | 'cowbell', params: Partial) => { @@ -30,6 +28,20 @@ export function DrumsView() { if (drumMachine) drumMachine.setSaturation(v) } + const handleRandomize = () => { + // @ts-ignore + window.Telegram?.WebApp?.HapticFeedback?.impactOccurred('medium') + randomizeDrums() + // Sync all randomized params to the drum machine + if (drumMachine) { + const state = useDrumStore.getState() + const drums = ['kick', 'snare', 'hihat', 'hihatOpen', 'clap', 'cowbell'] as const + drums.forEach(d => { + drumMachine.setDrumParams(d, state[d].pitch, state[d].decay) + }) + } + } + return (
@@ -38,6 +50,23 @@ export function DrumsView() {

Настройки

+ ) { + this.setKit(kit) + this.setSaturation(drive) + Object.entries(drumParams).forEach(([drum, p]) => { + this.setDrumParams(drum, p.pitch, p.decay) + }) + } + setSaturation(amount: number) { this.shaper.curve = makeDistortionCurve(amount) } diff --git a/src/logic/DrumUtils.ts b/src/logic/DrumUtils.ts index b9917c79..905db19a 100644 --- a/src/logic/DrumUtils.ts +++ b/src/logic/DrumUtils.ts @@ -1,3 +1,5 @@ +import * as Tone from 'tone' + /** * Shared DSP utilities for drum synthesis based on research specs. */ @@ -40,3 +42,40 @@ export function applyVariance(base: number, variance: number = 0.02): number { // Math.random() * 0.04 - 0.02 gives range [-0.02, 0.02] return base * (1 + (Math.random() * (variance * 2) - variance)); } + +/** + * Generates a 2.0 second buffer of white noise. + */ +export function generateWhiteNoise(context: Tone.BaseContext): AudioBuffer { + const sampleRate = context.sampleRate; + const bufferSize = sampleRate * 2.0; + const buffer = context.createBuffer(1, bufferSize, sampleRate); + const data = buffer.getChannelData(0); + for (let i = 0; i < bufferSize; i++) { + data[i] = Math.random() * 2 - 1; + } + return buffer; +} + +/** + * Generates a 2.0 second buffer of 15-bit LFSR noise (pseudo-random sequence). + * Polynomial: x^15 + x^14 + 1 + */ +export function generateLFSRNoise(context: Tone.BaseContext): AudioBuffer { + const sampleRate = context.sampleRate; + const bufferSize = sampleRate * 2.0; + const buffer = context.createBuffer(1, bufferSize, sampleRate); + const data = buffer.getChannelData(0); + + let lfsr = 0x7FFF; // Initial state (non-zero) + for (let i = 0; i < bufferSize; i++) { + // x^15 + x^14 + 1 + // Taps at 15 and 14 (indices 14 and 13) + const bit = ((lfsr >> 14) ^ (lfsr >> 13)) & 1; + lfsr = ((lfsr << 1) | bit) & 0x7FFF; + + // Convert to range [-1.0, 1.0] + data[i] = (lfsr / 0x3FFF) - 1.0; + } + return buffer; +} diff --git a/src/logic/drums/TR808Clap.ts b/src/logic/drums/TR808Clap.ts index 3334a6fe..c7b7205a 100644 --- a/src/logic/drums/TR808Clap.ts +++ b/src/logic/drums/TR808Clap.ts @@ -1,17 +1,16 @@ import * as Tone from 'tone' -import { applyVariance } from '../DrumUtils' +import { applyVariance, generateWhiteNoise } from '../DrumUtils' export class TR808Clap { private noiseBuffer: AudioBuffer; constructor(private destination: Tone.ToneAudioNode) { - const sampleRate = Tone.getContext().sampleRate; - this.noiseBuffer = Tone.getContext().createBuffer(1, sampleRate * 0.5, sampleRate); - const data = this.noiseBuffer.getChannelData(0); - for (let i = 0; i < data.length; i++) data[i] = Math.random() * 2 - 1; + this.noiseBuffer = generateWhiteNoise(Tone.getContext()); } trigger(time: number, pitch: number, decay: number, velocity: number = 0.8) { + if (velocity <= 0) return; + const noiseSrc = new Tone.BufferSource(this.noiseBuffer); const bpfFreq = (1000 + pitch * 1000); const bpf = new Tone.Filter(applyVariance(bpfFreq, 0.02), "bandpass"); @@ -20,6 +19,9 @@ export class TR808Clap { noiseSrc.connect(bpf); bpf.connect(gain); + // Randomize noise start + const randomStart = Math.random() * 1.5; + // Triple attack "snaps" const snapCount = 3; const snapIntervalBase = 0.01; @@ -28,7 +30,7 @@ export class TR808Clap { for (let i = 0; i < snapCount; i++) { const snapTime = time + i * snapInterval; gain.gain.setValueAtTime(velocity, snapTime); - gain.gain.exponentialRampToValueAtTime(velocity * 0.1, snapTime + snapInterval * 0.8); + gain.gain.exponentialRampToValueAtTime(Math.max(0.001, velocity * 0.1), snapTime + snapInterval * 0.8); } // Final decay @@ -39,7 +41,7 @@ export class TR808Clap { gain.gain.setValueAtTime(velocity, finalDecayStart); gain.gain.exponentialRampToValueAtTime(0.001, finalDecayStart + decayTime); - noiseSrc.start(time).stop(finalDecayStart + decayTime); + noiseSrc.start(time, randomStart).stop(finalDecayStart + decayTime); noiseSrc.onended = () => { noiseSrc.dispose(); diff --git a/src/logic/drums/TR808Cowbell.ts b/src/logic/drums/TR808Cowbell.ts index 3dd1d4fd..a438bd3a 100644 --- a/src/logic/drums/TR808Cowbell.ts +++ b/src/logic/drums/TR808Cowbell.ts @@ -2,11 +2,13 @@ import * as Tone from 'tone' import { applyPitchDrift, applyVariance } from '../DrumUtils' export class TR808Cowbell { - private activeGains: Set = new Set(); + private activeVoices: Set<{ oscillators: Tone.Oscillator[], gain: Tone.Gain }> = new Set(); constructor(private destination: Tone.ToneAudioNode) { } trigger(time: number, pitch: number, decay: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // Core: Dual square wave oscillators from Schmitt trigger matrix // Standard frequencies: 540Hz and 800Hz const pitchMultiplier = 0.5 + pitch; // Range approx 0.5x to 1.5x @@ -33,27 +35,31 @@ export class TR808Cowbell { vca.gain.setValueAtTime(velocity, time); vca.gain.exponentialRampToValueAtTime(0.001, time + decayTime); - this.activeGains.add(vca); + const voice = { oscillators: [osc1, osc2], gain: vca }; + this.activeVoices.add(voice); osc1.start(time).stop(time + decayTime); osc2.start(time).stop(time + decayTime); osc1.onstop = () => { - osc1.dispose(); - osc2.dispose(); - mixGain.dispose(); - bpf.dispose(); - hpf.dispose(); - vca.dispose(); - this.activeGains.delete(vca); + setTimeout(() => { + osc1.dispose(); + osc2.dispose(); + mixGain.dispose(); + bpf.dispose(); + hpf.dispose(); + vca.dispose(); + this.activeVoices.delete(voice); + }, 100); }; } stop(time: number) { - this.activeGains.forEach(vca => { - vca.gain.cancelScheduledValues(time); - vca.gain.exponentialRampToValueAtTime(0.001, time + 0.02); + this.activeVoices.forEach(voice => { + voice.gain.gain.cancelScheduledValues(time); + voice.gain.gain.exponentialRampToValueAtTime(0.001, time + 0.02); + voice.oscillators.forEach(osc => osc.stop(time + 0.02)); }); - this.activeGains.clear(); + this.activeVoices.clear(); } } diff --git a/src/logic/drums/TR808HiHat.ts b/src/logic/drums/TR808HiHat.ts index acd1216d..52cd89f4 100644 --- a/src/logic/drums/TR808HiHat.ts +++ b/src/logic/drums/TR808HiHat.ts @@ -3,11 +3,13 @@ import { applyPitchDrift, applyVariance } from '../DrumUtils' export class TR808HiHat { private frequencies = [205.3, 304.4, 369.6, 522.7, 800, 540]; - private activeGains: Set = new Set(); + private activeVoices: Set<{ oscillators: Tone.Oscillator[], gain: Tone.Gain }> = new Set(); constructor(private destination: Tone.ToneAudioNode) { } trigger(time: number, isOpen: boolean, pitch: number, decay: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // Create nodes const mixGain = new Tone.Gain(0.15); const bpf1 = new Tone.Filter(3440, "bandpass"); @@ -28,7 +30,6 @@ export class TR808HiHat { }); // Routing Graph - // Oscillators -> MixGain -> [BPF1, BPF2] (Parallel) -> EnvGain -> HPF -> Destination mixGain.connect(bpf1); mixGain.connect(bpf2); bpf1.connect(envGain); @@ -51,31 +52,34 @@ export class TR808HiHat { envGain.gain.setValueAtTime(velocity, time); envGain.gain.exponentialRampToValueAtTime(0.001, time + decayTime); - this.activeGains.add(envGain); + const voice = { oscillators, gain: envGain }; + this.activeVoices.add(voice); // Scheduling oscillators.forEach(osc => { osc.start(time).stop(time + decayTime); }); - // Disposal - Explicitly clean up all 11-12 nodes to prevent memory leaks - // We use the first oscillator's onstop event to trigger the cleanup + // Disposal oscillators[0].onstop = () => { - oscillators.forEach(o => o.dispose()); - mixGain.dispose(); - bpf1.dispose(); - bpf2.dispose(); - envGain.dispose(); - hpf.dispose(); - this.activeGains.delete(envGain); + setTimeout(() => { + oscillators.forEach(o => o.dispose()); + mixGain.dispose(); + bpf1.dispose(); + bpf2.dispose(); + envGain.dispose(); + hpf.dispose(); + this.activeVoices.delete(voice); + }, 100); // Safety margin }; } stop(time: number) { - this.activeGains.forEach(gain => { - gain.gain.cancelScheduledValues(time); - gain.gain.exponentialRampToValueAtTime(0.001, time + 0.02); + this.activeVoices.forEach(voice => { + voice.gain.gain.cancelScheduledValues(time); + voice.gain.gain.exponentialRampToValueAtTime(0.001, time + 0.02); + voice.oscillators.forEach(osc => osc.stop(time + 0.02)); }); - this.activeGains.clear(); + this.activeVoices.clear(); } } diff --git a/src/logic/drums/TR808Kick.ts b/src/logic/drums/TR808Kick.ts index 461f73fd..074f251e 100644 --- a/src/logic/drums/TR808Kick.ts +++ b/src/logic/drums/TR808Kick.ts @@ -5,6 +5,8 @@ export class TR808Kick { constructor(private destination: Tone.ToneAudioNode) { } trigger(time: number, pitch: number, decay: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // pitch: 0.5 -> 52.5Hz, maps to 45-60Hz range const tune = 45 + pitch * 15; // decay: 0.5 -> 1.7s, maps to 0.4-3.0s range @@ -21,20 +23,23 @@ export class TR808Kick { // Micro-randomization using shared utilities const tuneDrift = applyPitchDrift(tune, 1.0); const finalDecay = applyVariance(decayTime, 0.02); + // Ensure final decay is always longer than the damping stage + const safeFinalDecay = Math.max(finalDecay, 0.05); // Pitch Envelope: Start high (Tune * 2.5) and drop quickly (50ms) to simulate the membrane hit ('tonk') - // This rapid sweep generates the punch without needing a separate click oscillator const startFreq = tuneDrift * 2.5; const endFreq = tuneDrift; osc.frequency.setValueAtTime(startFreq, time); osc.frequency.exponentialRampToValueAtTime(endFreq, time + 0.05); - // VCA Amp Envelope: Instant attack, adjustable exponential decay + // VCA Amp Envelope: Diode damping emulation + // Two-stage: fast 20ms initial decay to 50% volume, then long tail masterGain.gain.setValueAtTime(velocity, time); - masterGain.gain.exponentialRampToValueAtTime(0.001, time + finalDecay); + masterGain.gain.exponentialRampToValueAtTime(Math.max(0.001, velocity * 0.5), time + 0.02); + masterGain.gain.exponentialRampToValueAtTime(0.001, time + safeFinalDecay); - osc.start(time).stop(time + finalDecay); + osc.start(time).stop(time + safeFinalDecay); osc.onstop = () => { osc.dispose(); diff --git a/src/logic/drums/TR808Snare.ts b/src/logic/drums/TR808Snare.ts index 23f8f2ac..ac1f51e2 100644 --- a/src/logic/drums/TR808Snare.ts +++ b/src/logic/drums/TR808Snare.ts @@ -1,20 +1,16 @@ import * as Tone from 'tone' -import { applyPitchDrift, applyVariance } from '../DrumUtils' +import { applyPitchDrift, applyVariance, generateWhiteNoise } from '../DrumUtils' export class TR808Snare { private noiseBuffer: AudioBuffer; constructor(private destination: Tone.ToneAudioNode) { - const sampleRate = Tone.getContext().sampleRate; - const bufferSize = sampleRate * 0.5; // 500ms - this.noiseBuffer = Tone.getContext().createBuffer(1, bufferSize, sampleRate); - const data = this.noiseBuffer.getChannelData(0); - for (let i = 0; i < data.length; i++) { - data[i] = Math.random() * 2 - 1; - } + this.noiseBuffer = generateWhiteNoise(Tone.getContext()); } trigger(time: number, pitch: number, snappy: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // pitch maps to tone balance here (balance between low and high modes) const toneBalance = pitch; @@ -40,10 +36,10 @@ export class TR808Snare { // Independent envelopes for maximum authenticity as per research // High mode decays faster (approx 75% of low mode decay) - gainLow.gain.setValueAtTime(velocity * (1 - toneBalance), time); + gainLow.gain.setValueAtTime(Math.max(0.001, velocity * (1 - toneBalance)), time); gainLow.gain.exponentialRampToValueAtTime(0.001, time + vcaDecay); - gainHigh.gain.setValueAtTime(velocity * toneBalance, time); + gainHigh.gain.setValueAtTime(Math.max(0.001, velocity * toneBalance), time); gainHigh.gain.exponentialRampToValueAtTime(0.001, time + vcaDecay * 0.75); // Snappy Layer @@ -61,12 +57,15 @@ export class TR808Snare { noiseFilter.connect(snappyGain); snappyGain.connect(this.destination); - snappyGain.gain.setValueAtTime(velocity * 0.8, time); + // Randomize noise start to avoid machine-gun effect + const randomStart = Math.random() * 1.5; + + snappyGain.gain.setValueAtTime(Math.max(0.001, velocity * 0.8), time); snappyGain.gain.exponentialRampToValueAtTime(0.001, time + snappyDecay); oscLow.start(time).stop(time + vcaDecay); oscHigh.start(time).stop(time + vcaDecay); - noiseSrc.start(time).stop(time + snappyDecay + 0.1); + noiseSrc.start(time, randomStart).stop(time + snappyDecay + 0.1); // Cleanup oscLow.onstop = () => { diff --git a/src/logic/drums/TR909Kick.ts b/src/logic/drums/TR909Kick.ts index dd2582ed..852c0e53 100644 --- a/src/logic/drums/TR909Kick.ts +++ b/src/logic/drums/TR909Kick.ts @@ -1,5 +1,5 @@ import * as Tone from 'tone' -import { makeDistortionCurve, applyPitchDrift, applyVariance } from '../DrumUtils' +import { makeDistortionCurve, applyPitchDrift, applyVariance, generateWhiteNoise } from '../DrumUtils' export class TR909Kick { private noiseBuffer: AudioBuffer; @@ -7,18 +7,13 @@ export class TR909Kick { constructor(private destination: Tone.ToneAudioNode) { // Soft Clipping curve from research - this.bodyCurve = makeDistortionCurve(10); - - const sampleRate = Tone.getContext().sampleRate; - const bufferSize = sampleRate * 0.05; // 50ms click - this.noiseBuffer = Tone.getContext().createBuffer(1, bufferSize, sampleRate); - const data = this.noiseBuffer.getChannelData(0); - for (let i = 0; i < bufferSize; i++) { - data[i] = Math.random() * 2 - 1; - } + this.bodyCurve = makeDistortionCurve(30); + this.noiseBuffer = generateWhiteNoise(Tone.getContext()); } trigger(time: number, pitch: number, decay: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // 909 Kick base frequency is fixed around 50Hz const tune = 50; // The 'Pitch' parameter on 909 maps to the frequency sweep duration @@ -65,9 +60,12 @@ export class TR909Kick { noiseFilter.connect(noiseGain); noiseGain.connect(this.destination); + // Randomize noise start to avoid machine-gun effect + const randomStart = Math.random() * 1.5; + // Ultra short envelope (10-20ms) for the click const clickDecay = applyVariance(0.02, 0.02); - noiseGain.gain.setValueAtTime(velocity * 0.7, time); + noiseGain.gain.setValueAtTime(Math.max(0.001, velocity * 0.7), time); noiseGain.gain.exponentialRampToValueAtTime(0.001, time + clickDecay); // Rectangular Pulse Click: Short 5ms impulse for attack articulation @@ -76,11 +74,11 @@ export class TR909Kick { pulseOsc.connect(pulseGain); pulseGain.connect(this.destination); - pulseGain.gain.setValueAtTime(velocity * 0.5, time); + pulseGain.gain.setValueAtTime(Math.max(0.001, velocity * 0.5), time); pulseGain.gain.exponentialRampToValueAtTime(0.001, time + 0.005); bodyOsc.start(time).stop(time + vcaDecay); - noiseSrc.start(time).stop(time + clickDecay); + noiseSrc.start(time, randomStart).stop(time + clickDecay); pulseOsc.start(time).stop(time + 0.005); bodyOsc.onstop = () => { diff --git a/src/logic/drums/TR909Snare.ts b/src/logic/drums/TR909Snare.ts index 4841f055..b6dd9197 100644 --- a/src/logic/drums/TR909Snare.ts +++ b/src/logic/drums/TR909Snare.ts @@ -1,5 +1,5 @@ import * as Tone from 'tone' -import { makeDistortionCurve, applyPitchDrift, applyVariance } from '../DrumUtils' +import { makeDistortionCurve, applyPitchDrift, applyVariance, generateLFSRNoise } from '../DrumUtils' export class TR909Snare { private noiseBuffer: AudioBuffer; @@ -8,18 +8,12 @@ export class TR909Snare { constructor(private destination: Tone.ToneAudioNode) { // Soft Clipping curve from research this.bodyCurve = makeDistortionCurve(15); - - const sampleRate = Tone.getContext().sampleRate; - const bufferSize = sampleRate * 0.5; - this.noiseBuffer = Tone.getContext().createBuffer(1, bufferSize, sampleRate); - const data = this.noiseBuffer.getChannelData(0); - // While original used LFSR, research says Math.random() is sufficient for Web Audio API context - for (let i = 0; i < data.length; i++) { - data[i] = Math.random() * 2 - 1; - } + this.noiseBuffer = generateLFSRNoise(Tone.getContext()); } trigger(time: number, pitch: number, snappy: number, velocity: number = 0.8) { + if (velocity <= 0) return; + // 909 Snare Body: 2 triangle oscillators fixed at ~160Hz and ~220Hz const freq1 = 160; const freq2 = 220; @@ -76,12 +70,15 @@ export class TR909Snare { lpf.connect(noiseGain); noiseGain.connect(this.destination); - noiseGain.gain.setValueAtTime(velocity * 0.7, time); + // Randomize noise start to avoid machine-gun effect + const randomStart = Math.random() * 1.5; + + noiseGain.gain.setValueAtTime(Math.max(0.001, velocity * 0.7), time); noiseGain.gain.exponentialRampToValueAtTime(0.001, time + snappyDecay); osc1.start(time).stop(time + vcaDecay); osc2.start(time).stop(time + vcaDecay); - noiseSrc.start(time).stop(time + snappyDecay + 0.1); + noiseSrc.start(time, randomStart).stop(time + snappyDecay + 0.1); osc1.onstop = () => { osc1.dispose(); diff --git a/src/store/audioStore.ts b/src/store/audioStore.ts index c90d17e8..5041e158 100644 --- a/src/store/audioStore.ts +++ b/src/store/audioStore.ts @@ -3,6 +3,7 @@ import * as Tone from 'tone' import { AcidSynth } from '../logic/AcidSynth' import { DrumMachine } from '../logic/DrumMachine' import { PadSynth } from '../logic/PadSynth' +import { useDrumStore } from './instrumentStore' export interface AudioState { isInitialized: boolean @@ -60,6 +61,17 @@ export const useAudioStore = create((set, get) => ({ const drums = new DrumMachine() const pads = new PadSynth() + // Sync initial drum parameters + const dStore = useDrumStore.getState() + drums.syncInternalParams(dStore.kit, dStore.drive, { + kick: { pitch: dStore.kick.pitch, decay: dStore.kick.decay }, + snare: { pitch: dStore.snare.pitch, decay: dStore.snare.decay }, + hihat: { pitch: dStore.hihat.pitch, decay: dStore.hihat.decay }, + hihatOpen: { pitch: dStore.hihatOpen.pitch, decay: dStore.hihatOpen.decay }, + clap: { pitch: dStore.clap.pitch, decay: dStore.clap.decay }, + cowbell: { pitch: dStore.cowbell.pitch, decay: dStore.cowbell.decay } + }) + Tone.Transport.bpm.value = get().bpm Tone.Transport.swing = get().swing diff --git a/src/store/instrumentStore.ts b/src/store/instrumentStore.ts index 9e96a9b2..ec4e149d 100644 --- a/src/store/instrumentStore.ts +++ b/src/store/instrumentStore.ts @@ -41,22 +41,31 @@ interface DrumState { setParams: (drum: 'kick' | 'snare' | 'hihat' | 'hihatOpen' | 'clap' | 'cowbell', params: Partial) => void setKit: (kit: '808' | '909') => void setDrive: (drive: number) => void + randomizeDrums: () => void } export const useDrumStore = create((set) => ({ kick: { steps: 16, pulses: 4, rotate: 0, decay: 0.5, pitch: 0.5, probability: 1.0 }, - snare: { steps: 16, pulses: 2, rotate: 4, decay: 0.5, pitch: 0.5, probability: 1.0 }, + snare: { steps: 16, pulses: 4, rotate: 4, decay: 0.5, pitch: 0.5, probability: 1.0 }, hihat: { steps: 16, pulses: 12, rotate: 0, decay: 0.5, pitch: 0.5, probability: 1.0 }, hihatOpen: { steps: 16, pulses: 4, rotate: 2, decay: 0.5, pitch: 0.5, probability: 1.0 }, clap: { steps: 16, pulses: 2, rotate: 4, decay: 0.5, pitch: 0.5, probability: 1.0 }, - cowbell: { steps: 16, pulses: 2, rotate: 2, decay: 0.5, pitch: 0.5, probability: 1.0 }, + cowbell: { steps: 16, pulses: 3, rotate: 2, decay: 0.5, pitch: 0.5, probability: 0.8 }, kit: '909', drive: 20, setParams: (drum, params) => set((state) => ({ [drum]: { ...state[drum], ...params } })), setKit: (kit) => set({ kit }), - setDrive: (drive) => set({ drive }) + setDrive: (drive) => set({ drive }), + randomizeDrums: () => set((state) => ({ + kick: { ...state.kick, pulses: 1 + Math.floor(Math.random() * 7), rotate: Math.floor(Math.random() * 16) }, + snare: { ...state.snare, pulses: 2 + Math.floor(Math.random() * 6), rotate: Math.floor(Math.random() * 16) }, + hihat: { ...state.hihat, pulses: 8 + Math.floor(Math.random() * 8), rotate: Math.floor(Math.random() * 16) }, + hihatOpen: { ...state.hihatOpen, pulses: 2 + Math.floor(Math.random() * 4), rotate: Math.floor(Math.random() * 16) }, + clap: { ...state.clap, pulses: 1 + Math.floor(Math.random() * 4), rotate: Math.floor(Math.random() * 16), probability: 0.5 + Math.random() * 0.5 }, + cowbell: { ...state.cowbell, pulses: 1 + Math.floor(Math.random() * 6), rotate: Math.floor(Math.random() * 16), probability: 0.4 + Math.random() * 0.5 } + })) })) // Pad Store