From 94ba321f96638906e41eda7abf371066011c8508 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Wed, 29 Apr 2015 18:46:21 -0400
Subject: misc edits

---
 .../javascripts/rectangles/engine/scenery/_scenery.js   | 17 +++++++++++++++--
 .../javascripts/rectangles/engine/scenery/sound.js      |  2 +-
 .../rectangles/engine/scenery/types/video.js            |  7 ++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'public/assets/javascripts/rectangles/engine')

diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
index e9be663..6203c20 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js
@@ -121,7 +121,10 @@ var Scenery = new function(){
 	}
 	base.playAll = function(){
 	  base.forEach(function(scenery){
-	    if (scenery.type == "video") scenery.play()
+	    if (scenery.type == "video") {
+	      scenery.unmute()
+	      scenery.play()
+	    }
 	  })
 	}
 	base.pauseAll = function(){
@@ -129,7 +132,17 @@ var Scenery = new function(){
 	    if (scenery.type == "video") scenery.pause()
 	  })
 	}
-
+	base.muteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.mute()
+	  })
+	}
+	base.unmuteAll = function(){
+	  base.forEach(function(scenery){
+	    if (scenery.type == "video") scenery.mx.unmute()
+	  })
+	}
+	
 	return base
 }
 
diff --git a/public/assets/javascripts/rectangles/engine/scenery/sound.js b/public/assets/javascripts/rectangles/engine/scenery/sound.js
index 37bdee0..d63d8c4 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/sound.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/sound.js
@@ -5,7 +5,7 @@ Scenery.sound.init = function(){
   app.tube.on("move", Scenery.sound.move)
 }
 Scenery.sound.move = function(){
-  var vals = Scenery.map(function(scenery){
+  Scenery.forEach(function(scenery){
     if ((scenery.type == "video" || scenery.type == "audio") && ! scenery.muted()) {
       var distance = dist(cam.x, cam.z, 
                           scenery.mx.x, scenery.mx.z)
diff --git a/public/assets/javascripts/rectangles/engine/scenery/types/video.js b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
index fb1a868..163e19e 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/types/video.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/types/video.js
@@ -38,7 +38,8 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 				backface: false,
 			})
 			scene.add(this.mx)
-			this.mx.load()
+			
+      this.mx.load()
 		},
 		
 		play: function(){
@@ -90,6 +91,10 @@ Scenery.types.video = Scenery.types.base.extend(function(base){
 			}
 		},
 
+		unmute: function(){
+      this.mx.unmute()
+		},
+		
 		setVolume: function(n){
 			this.mx.setVolume(n)
 		},
-- 
cgit v1.2.3-70-g09d2