basic functionality of one room

Author: ianmunrobot

app/index.js

@@ -18,9 +18,16 @@ function changeFrequency(id, direction, frequency) {
   synthesizers[id][direction].frequency.value = frequency
 }
 
+function changeAmplitude(id, amplitude) {
+  // var newAmp = amplitude * -3
+  // console.log('newAmp:', newAmp);
+  // synthesizers[id].x.volume.value = newAmp;
+  // synthesizers[id].y.volume.value = newAmp;
+}
+
 function attack(id) {
   synthesizers[id].x.triggerAttack(synthesizers[id].x.frequency.value)
-  synthesizers[id].y.triggerAttack(synthesizers[id].y.frequency.value)
+  synthesizers[id].y.triggerAttack(synthesizers[id].x.frequency.value * 1.5)
 }
 
 function release(id) {
@@ -35,8 +42,8 @@ socket.on('connect', () => {
 
 socket.on('populateSynths', (ids) => {
   ids.forEach(id => {
-    let newXSynth1 = new Tone.Synth().chain(reverb)
-    let newYSynth2 = new Tone.Synth().chain(reverb)
+    let newXSynth1 = new Tone.DuoSynth({harmonicity: 1.5}).chain(reverb)
+    let newYSynth2 = new Tone.DuoSynth({harmonicity: 1.5}).chain(reverb)
     newXSynth1.volume.value = -12;
     newYSynth2.volume.value = -12;
     synthesizers[id] = {
@@ -48,13 +55,17 @@ socket.on('populateSynths', (ids) => {
 
 socket.on('mouseDown', (event) => {
   changeFrequency(event.id, 'x', event.x)
-  changeFrequency(event.id, 'y', event.y)
+  changeFrequency(event.id, 'y', event.x * 1.5)
   attack(event.id)
 })
 
 socket.on('mouseDrag', (event) => {
+  // console.log(event);
+  let amplitude = Math.abs(event.delta[1]) + Math.abs(event.delta[2])
+  changeAmplitude(event.id, amplitude)
+
   changeFrequency(event.id, 'x', event.x)
-  changeFrequency(event.id, 'y', event.y)
+  changeFrequency(event.id, 'y', event.x * 1.5)
 })
 
 socket.on('mouseUp', (event) => {

public/js/ui.js

@@ -59,7 +59,6 @@ for (var i = 0; i < count; i++) {
 	placedSymbol.scale(i / count);
 	placedSymbol.direction = 2 * Math.PI * Math.random()
 }
-console.log(view.size);
 
 // The onFrame function is called up to 60 times a second:
 function onFrame(event) {
@@ -128,15 +127,6 @@ socket.on('mouseDown', function(event) {
 })
 
 function onMouseDrag(event) {
-	// var step = event.delta / 2;
-	// step.angle += 90;
-
-	// var top = event.middlePoint + step;
-	// var bottom = event.middlePoint - step;
-
-	// path.add(top);
-	// path.insert(0, bottom);
-	// path.smooth();
 	var outEvent = {
 		id: socket.id,
 		x: event.point.x,

server/index.js

@@ -6,8 +6,8 @@ const volleyball = require('volleyball')
 
 const express = require('express');
 const app = express();
-
 const socketio = require('socket.io');
+const chalk = require('chalk')
 
 server.on('request', app);
 
@@ -29,8 +29,8 @@ app.use(express.static(path.join(__dirname, '../public')));
 app.use(volleyball)
 
 io.on('connection', socket => {
-    console.log('New client connection');
-    console.log(socket.id);
+    console.log(chalk.blue('New client connection'));
+    console.log(chalk.blue(socket.id));
 
     // join room on create (room name is passed from client)
     socket.on('create', room => {
@@ -43,28 +43,13 @@ io.on('connection', socket => {
       // dispatch the current synths (including self)
       io.to(room).emit('populateSynths', memory[room])
 
-      // on 'draw' add to memory and draw to others in room
-      // socket.to(room).on('draw', (...payload) => {
-      //     memory[room].push(payload);
-      //     io.to(room).emit('otherDrawing', ...payload)
-      // })
 
       // on 'draw' add to memory and draw to others in room
       socket.to(room).on('mouseDown', (inEvent) => {
-        // const event = {
-        //   id: socket.id,
-        //   x: inEvent.x,
-        //   y: inEvent.y
-        // }
         io.to(room).emit('mouseDown', inEvent)
       })
 
       socket.to(room).on('mouseDrag', (inEvent) => {
-        // const event = {
-        //   id: socket.id,
-        //   x: inEvent.x,
-        //   y: inEvent.y
-        // }
         io.to(room).emit('mouseDrag', inEvent)
       })
 
@@ -75,11 +60,9 @@ io.on('connection', socket => {
       // log on disconnect
       socket.on('disconnect', () => {
         socket.leave(room);
-        console.log('before', memory[room]);
+        console.log(chalk.yellow(`leaving: ${socket.id}`))
         let deleteIndex = memory[room].indexOf(socket.id)
         if (deleteIndex !== -1) memory[room].splice(deleteIndex)
-        console.log('after', memory[room]);
-        console.log('disconnect :()');
       });
     })
   });