summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/index.js18
-rw-r--r--client/lib/sampler.js28
2 files changed, 23 insertions, 23 deletions
diff --git a/client/index.js b/client/index.js
index f2f72c0..a1b12b1 100644
--- a/client/index.js
+++ b/client/index.js
@@ -23,7 +23,7 @@ let samplers = {}
requestAudioContext( () => {
samplers['smash'] = new Sampler('samples/smash/g{}.mp3', 12)
- // samplers['glass'] = new Sampler('samples/glass/0{}Particle.mp3', 90)
+ samplers['glass'] = new Sampler('samples/glass/0{}Particle.mp3', 90)
})
let last_index = 0
@@ -45,10 +45,10 @@ keys.listen(index => {
for (i = 0; i < count; i++) {
// kalimba.play(freq * (i+1)/4, now + Math.random()/(i+1))
when = Math.random()/2000 + (i + Math.random()/10)/randrange(2,5)
- // samplers['glass'].play(
- // 100 + index*(Math.random() * 10),
- // now + when
- // )
+ samplers['glass'].play(
+ 100 + index*(Math.random() * 10),
+ now + when
+ )
setTimeout( () => {
draw.triangle(randint(window.innerWidth), randint(window.innerHeight), randrange(10, 100))
}, when * 1000)
@@ -74,10 +74,10 @@ mouse.register({
let when, i, player
for (i = 0; i < count; i++) {
when = Math.random()/2000 + (i+ Math.random()/10)/randrange(2,5)
- // player = samplers['glass'].play(
- // 100 * randrange(2,5) / randrange(2,5) * randrange(0.5,1.5),
- // now + when
- // )
+ player = samplers['glass'].play(
+ 100 * randrange(2,5) / randrange(2,5) * randrange(0.5,1.5),
+ now + when
+ )
player.volume.value = isMobile ? -(1+i/2) : -i*i
}
setTimeout( () => {
diff --git a/client/lib/sampler.js b/client/lib/sampler.js
index a3d6bed..635427c 100644
--- a/client/lib/sampler.js
+++ b/client/lib/sampler.js
@@ -51,21 +51,21 @@ export default class Sampler {
crossFade.connect(output)
- let filter, note
- let filters = sample.filters = []
- for (let j = 0; j < filter_count; j++) {
- note = choice(notes)
- filter = new Tone.Filter({
- frequency: filter_count * j * note,
- Q: 5 * (filter_count-j) + 20,
- })
- player.connect(filter)
- filter.connect(wet)
- filters.push(filter)
- }
- // player.connect(reverb)
+ // let filter, note
+ // let filters = sample.filters = []
+ // for (let j = 0; j < filter_count; j++) {
+ // note = choice(notes)
+ // filter = new Tone.Filter({
+ // frequency: filter_count * j * note,
+ // Q: 5 * (filter_count-j) + 20,
+ // })
+ // player.connect(filter)
+ // filter.connect(wet)
+ // filters.push(filter)
+ // }
+ player.connect(reverb)
sample.players.push(player)
- sample.filters.push(filters)
+ // sample.filters.push(filters)
}
})