Merge branch 'master' into add-view-#3

ianmunrobot · web-flow · commit 0a957c277e96 · 2017-01-22T18:48:55.000-05:00
diff --git a/.profile b/.profile
@@ -0,0 +1 @@
+npm run build
diff --git a/README.md b/README.md
@@ -1 +1,4 @@
 # socketjam
+
+A simple <a href="http://socket.io/">`socket.io`</a> based collaborative music-making app using a <a href="http://paperjs.org/">Paper.js</a> interface and <a href="https://tonejs.github.io/">Tone.js</a> driven synthesis
+
diff --git a/app/index.js b/app/index.js
@@ -4,6 +4,13 @@ const socket = require('./socket')
 const spaceCircle = require('./views/spaceCircle')
 const coolBlobs = require('./views/coolBlobs')
 
+StartAudioContext(Tone.context, '#test').then(function(){
+
+})
+
+const drums = require('./basic-beat')
+
+
 const canvas = document.getElementById('paperCanvas');
 paper.setup(canvas);
 paper.install(window);
diff --git a/index.html b/index.html
@@ -10,7 +10,6 @@
   <script type="text/javascript" src="socket/socket.io.js"></script>
   <script type="text/javascript" src="paper/paper-full.js"></script>
   <script type="text/javascript" src="startaudiocontext/StartAudioContext.js"></script>
-  <!--<script type="text/paperscript" src="js/ui.js" canvas="paperCanvas"></script>-->
 </head>
 <body>
   <div id="test">
diff --git a/package.json b/package.json
@@ -23,10 +23,12 @@
     "chalk": "^1.1.3",
     "express": "^4.14.0",
     "http": "0.0.0",
-    "paper": "^0.10.2",
+    "nodemon": "^1.11.0",
     "path": "^0.12.7",
     "socket.io": "^1.7.2",
+    "startaudiocontext": "^1.2.0",
     "tone": "^0.9.0",
-    "volleyball": "^1.4.1"
+    "volleyball": "^1.4.1",
+    "webpack": "^1.14.0"
   }
 }
diff --git a/public/js/ui.js b/public/js/ui.js
@@ -64,7 +64,8 @@ for (var i = 0; i < count; i++) {
 	var placedSymbol = symbol.place(center);
 	// symbol.fillColor.hue += (Math.random() * 8)
 	placedSymbol.scale(i / count);
-	placedSymbol.direction = 2 * Math.PI * Math.random()
+	placedSymbol.direction = 2 * Math.PI * Math.random();
+	if (i === 50) console.log(placedSymbol);
 }
 
 // The onFrame function is called up to 60 times a second:
@@ -74,13 +75,15 @@ function onFrame(event) {
 	for (var i = 0; i < count; i++) {
 		var item = project.activeLayer.children[i];
 
-		// Move the item 1/20th of its width. This way
+
+		// Move the item 1/20th of its width in the direction of its motion. This way
 		// larger circles move faster than smaller circles:
 		var speed = item.bounds.width / 30;
 		item.position.x += Math.cos(item.direction) * speed;
 		item.position.y += Math.sin(item.direction) * speed;
 
 		// If the item has the view, move it back
+
 		if (item.bounds.left > view.size.width) {
 			item.position.x = item.bounds.width;
 		}
@@ -96,7 +99,6 @@ function onFrame(event) {
 	}
 }
 
-
 tool.minDistance = 1;
 tool.maxDistance = 45;
 
@@ -113,7 +115,6 @@ function onMouseDown(event) {
 }
 
 socket.on('mouseDown', function(event) {
-	// console.log(event);
 	var path = new Path();
 	path.fillColor = {
 		hue: Math.random() * 360,

-Original file line number
+Diff line change
@@ @@ -1 +1,4 @@ @@
 # socketjam
++
 +A simple <a href="http://socket.io/">`socket.io`</a> based collaborative music-making app using a <a href="http://paperjs.org/">Paper.js</a> interface and <a href="https://tonejs.github.io/">Tone.js</a> driven synthesis
++