diff options
Diffstat (limited to 'client/lib')
| -rw-r--r-- | client/lib/hall.js | 4 | ||||
| -rw-r--r-- | client/lib/mouse.js | 11 | ||||
| -rw-r--r-- | client/lib/sampler.js | 51 | ||||
| -rw-r--r-- | client/lib/spectrum.js | 184 | ||||
| -rw-r--r-- | client/lib/util.js | 3 |
5 files changed, 222 insertions, 31 deletions
diff --git a/client/lib/hall.js b/client/lib/hall.js index e07db80..3fe390f 100644 --- a/client/lib/hall.js +++ b/client/lib/hall.js @@ -37,8 +37,8 @@ class Hall { } play(sound, i, freq, pan, time){ const speaker = this.getSpeaker(i) - sound.play(freq, time || 0, pan < 0.5 ? speaker.panLeft : speaker.panRight) - return speaker + const player = sound.play(freq, time || 0, pan < 0.5 ? speaker.panLeft : speaker.panRight) + return { speaker, player } } } diff --git a/client/lib/mouse.js b/client/lib/mouse.js index 990b8ef..809f209 100644 --- a/client/lib/mouse.js +++ b/client/lib/mouse.js @@ -15,6 +15,7 @@ mouse.register({ let fns = { down: [], move: [], + drag: [], up: [], } @@ -27,6 +28,7 @@ export default { register: (callbacks) => { callbacks.down && fns.down.push(callbacks.down) callbacks.move && fns.move.push(callbacks.move) + callbacks.drag && fns.drag.push(callbacks.drag) callbacks.up && fns.up.push(callbacks.up) } } @@ -36,17 +38,20 @@ let x, y, dragging = false function down(e){ x = e.pageX y = e.pageY + x /= window.innerWidth + y /= window.innerHeight dragging = true fns.down.map(f => f(x, y)) } function move(e){ - if (!dragging) return let dx = e.pageX - x let dy = e.pageY - y x = e.pageX y = e.pageY - dragging = true + x /= window.innerWidth + y /= window.innerHeight fns.move.map(f => f(x, y, dx, dy)) + dragging && fns.drag.map(f => f(x, y, dx, dy)) } function up(e){ dragging = false @@ -61,7 +66,7 @@ function touch(f){ } document.body.addEventListener("mousedown", down) document.body.addEventListener("mousemove", move) -document.body.addEventListener("mouseup", up) +window.addEventListener("mouseup", up) document.body.addEventListener("touchstart", touch(down)) document.body.addEventListener("touchmove", touch(move)) document.body.addEventListener("touchup", touch(up)) diff --git a/client/lib/sampler.js b/client/lib/sampler.js index 481a940..9a1b1fc 100644 --- a/client/lib/sampler.js +++ b/client/lib/sampler.js @@ -1,21 +1,20 @@ import Tone from 'tone' -import { lerp, choice } from './util' +import { choice, clamp } from './util' +import spectrum from './spectrum' -const player_count = 2 -const filter_count = 3 - -const crossfaders = [] +const player_count = 1 export default class Sampler { constructor(path, count){ this.samples = (() => { let s = '', a = [] for (let i = 1; i < count; i++) { - const s = i < 10 ? '0' + i : i; + s = i < 10 ? '0' + i : i; a.push({ root: 100, fn: path.replace(/{}/, s) }) } return a })() + this.length = this.samples.length this.samples.forEach((sample) => { sample.players = [] @@ -38,24 +37,52 @@ export default class Sampler { return choice(this.samples) } play(freq, time, output) { - const best = this.choice() - best.index = (best.index + 1) % player_count - - const player = best.players[ best.index ] + const { player, best } = this.getPlayer() freq = freq || best.root + player.playbackRate = freq / best.root + time = time || Tone.now() - player.playbackRate = freq / best.root if (player.loaded) { player.stop() player.disconnect() player.connect(output) player.start(time) } else { - console.log('loading') + // console.log('loading') } return player } + getRandomPlayer(){ + const best = this.choice() + best.index = (best.index + 1) % player_count + + const player = best.players[ best.index ] + return { player, best } + } + getPlayer(n){ + n = n || 0 + if (n < 1) n *= this.samples.length + const best = this.samples[clamp(n|0, 0, this.samples.length-1)] + best.index = (best.index + 1) % player_count + + const player = best.players[ best.index ] + return { player, best } + } + getWaveAndSpectrum(n){ + const { player } = this.getPlayer(n) + const buf = player._buffer.get() + if (! buf) return { pcm: null, spec: null } + const pcm = buf.getChannelData(0) + if (! player._spectrum) { + const sr = buf.sampleRate + player._spectrum = spectrum.toSpectrum(pcm, sr) + } + return { + pcm: pcm, + spec: player._spectrum, + } + } } diff --git a/client/lib/spectrum.js b/client/lib/spectrum.js index 2b30792..1dd9619 100644 --- a/client/lib/spectrum.js +++ b/client/lib/spectrum.js @@ -1,13 +1,12 @@ import Tone from 'tone' -import output from './output' +import { shuffle, quantize, mod } from './util' -const signalWindows = require('signal-windows').windows -const FFTJS = require('fft.js') +import { windows as signalWindows } from 'signal-windows' +import FFTJS from 'fft.js' -const fft_size = 2 << 10 +const fft_size = 1024 const fft_overlap = fft_size / 4 -const half_fft_size = fft_size / 2 const fft = new FFTJS(fft_size) @@ -49,15 +48,15 @@ function fromSpectrum(spec){ const audioBuffer = Tone.context.createBuffer(1, pcm_length, sr) const pcm = audioBuffer.getChannelData(0); - let i, j, u, v, _r, _i, col + let i, j, u, col for (i = 0; i < spec_len; i++) { col = data[i] + // for (j = fft_size; j < fft_size << 1; j++) { + // col[j] = 0 + // } fft.inverseTransform(out, col) u = i * (fft_overlap) - // for (j = fft_size * 1/4; j < fft_size * 3/4; j++) { - // pcm[u+j] = out[j*2] / ham[j] || 0 - // } for (j = 0; j < fft_size; j++) { pcm[u+j] += out[j*2] * ham[j] || 0 } @@ -78,12 +77,171 @@ function fadeInOut(pcm, fade_size){ pcm[pcm_length - i] *= fade } } -function fadeOut(pcm){ - +function rotatePhase(spec, theta){ + let { data, fft_size } = spec + let i, j, col, len = data.length + for (i = 0; i < len; i++) { + col = data[i] + for (j = 0; j < fft_size; j++) { + col[j*2+1] += theta + } + } + return spec +} + +function linearBins(spec, n){ + n = n || 1 + + let bins = [], i, q_i + for (q_i = 0; q_i < n; q_i++) { + bins[q_i] = [] + } + const step = Math.floor(spec.fft_size / n) + const len_quantize_n = quantize(spec.fft_size, n) + for (i = 0; i < len_quantize_n; i++) { + q_i = Math.floor(i/step) + bins[q_i] = bins[q_i] || [] + bins[q_i].push(i) + } + // leftover bins get put at end + for (; i < spec.fft_size; i++) { + bins[q_i].push(i) + } + return bins +} +function logarithmicBins(spec){ + let bins = [], i, j, q_i + let binCount = Math.log2(spec.fft_size) - 1 + for (i = 0, q_i = 0, j = 0; i < binCount; i++) { + j += 1 << i + bins[i] = [] + for (; q_i < j; q_i++) { + bins[i].push(q_i) + } + } + return bins +} +function concatBins(bins){ + return bins.reduce((acc, cv) => acc.concat(cv), []) +} +function reverseBins(bins){ + return bins.map( bin => bin.reverse() ) +} +function minBins(bins){ + return bins.map( bin => { + const b = bin[0] + return bin.map(() => b) + }) +} +function maxBins(bins){ + return bins.map( bin => { + const b = bin[bin.length-1] + return bin.map(() => b) + }) +} +function rotateSpectrum(spec, n){ + const { fft_size } = spec + if (n && n < 1) { + n -= 0.5 + n *= fft_size + } + n = Math.floor(n) + let order = new Array(fft_size), i + for (i = 0; i < fft_size; i++) { + order[i] = mod(i + n, fft_size/2) + } + return reorderBins(spec, order) +} +function cloneSpectrum(spec){ + const { + data, + fft_size, + sr, fft_overlap + } = spec + const spec_len = data.length + + let new_data = new Array(spec_len) + let i + for (i = 0; i < spec_len; i++) { + new_data[i] = data[i].concat() + new_data[i][2] = 0 + } + + return { + data: new_data, + fft_size, + sr, fft_overlap, + } +} +function reverseSpectrum(spec){ + let new_spec = cloneSpectrum(spec) + new_spec.data = new_spec.data.reverse() + return new_spec +} +function shuffleSpectrum(spec){ + const { fft_size } = spec + let order = new Array(fft_size), i + for (i = 0; i < fft_size; i++) { + order[i] = i + } + shuffle(order) + return reorderBins(spec, order) +} +function invertSpectrum(spec){ + const { fft_size } = spec + let order = new Array(fft_size), i + for (i = 0; i < fft_size; i++) { + order[i] = fft_size - i - 1 + } + return reorderBins(spec, order) +} +function reorderBins(spec, order){ + let new_spec = cloneSpectrum(spec) + const { + data, + sr, + fft_size, + fft_overlap, + } = spec + const spec_len = data.length + const { data: new_data } = new_spec + + let i, j, col, new_col + for (j = order.length; j < fft_size; j++) { + order[j] = j + } + + for (i = 0; i < spec_len; i++) { + col = data[i] + new_col = new_data[i] = data[i].concat() + col[0] = 0 + // col[2] = 0 + // col[4] = 0 + for (j = 0; j < fft_size/2; j++) { + new_col[j*2] = col[order[j]*2] + new_col[j*2+1] = col[order[j]*2+1] + } + for (; j < fft_size; j++) { + new_col[j*2] = 0 + new_col[j*2+1] = 0 + } + } + + return { + data: new_data, + sr, fft_size, fft_overlap, + } } export default { - toSpectrum, - fromSpectrum + toSpectrum, fromSpectrum, + fadeInOut, + cloneSpectrum, + reverseSpectrum, shuffleSpectrum, invertSpectrum, rotateSpectrum, + reorderBins, + linearBins, logarithmicBins, + concatBins, + reverseBins, minBins, maxBins, + rotatePhase, } diff --git a/client/lib/util.js b/client/lib/util.js index fd48768..1bbee9d 100644 --- a/client/lib/util.js +++ b/client/lib/util.js @@ -21,6 +21,7 @@ function lerp(n,a,b){ return (b-a)*n+a } function angle(x0,y0,x1,y1){ return Math.atan2(y1-y0,x1-x0) } function dist(x0,y0,x1,y1){ return Math.sqrt(Math.pow(x1-x0,2)+Math.pow(y1-y0,2)) } function xor(a,b){ a=!!a; b=!!b; return (a||b) && !(a&&b) } +function quantize(a,b){ return Math.floor(a/b)*b } function shuffle(a){ for (var i = a.length; i > 0; i--){ var r = randint(i) @@ -104,7 +105,7 @@ function requestAudioContext (fn) { } export { - clamp, choice, mod, lerp, angle, dist, xor, + clamp, choice, mod, lerp, angle, dist, xor, quantize, randint, randrange, randsign, shuffle, gaussian, browser, requestAudioContext, } |