Comment, reshuffle shape drawing

voicegardens/static/voicegardens.js

@@ -438,6 +438,7 @@ function draw() {
   screenY = lerp(screenY, toScreenY, 0.2);
   translate(screenX, screenY);
 
+  // generate a new shape after a sound recording
   if (newSoundJustRecorded === true) {
     let newShape = new GeneratedShape();
     shapes.push(newShape);
@@ -448,19 +449,24 @@ function draw() {
   for (let i = 0; i < shapes.length; i++) {
     let shape = shapes[i];
 
-    shape.draw();
+    // randomly move the shapes
-    shape.move();
-
     if (positionTick) {
       shape.destX = random(windowWidth);
       shape.destY = random(windowHeight);
     }
 
-    if (shape.collide(shapes) === true) {
+    shape.draw();
+    shape.move();
+
+    // play recordings when shapes collide
+    let [collision, collidedShape] = shape.collide(shapes);
+    if (collision === true) {
       shape.sound();
+      collidedShape.sound();
     }
   }
 
+  // reset random shape position time ticker
   positionTick = false;
 }