Merge branch 'master' of github.com:stemkoski/stemkoski.github.com

stemkoski · stemkoski · commit 4c3ca54ee7d3 · 2013-07-04T15:20:36.000-04:00
diff --git a/Three.js/Webcam-Motion-Detection-Texture.html b/Three.js/Webcam-Motion-Detection-Texture.html
@@ -19,7 +19,7 @@
 <div id="messageArea" style="position: relative; left: 0px; top: 270px;"></div>
 <div id="container" style="z-index: 2; position: absolute; left:0px; top:0px"></div>
 <script>
-navigator.getUserMedia = navigator.webkitGetUserMedia || navigator.getUserMedia;
+navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
 window.URL = window.URL || window.webkitURL;
 
 var camvideo = document.getElementById('monitor');
diff --git a/Three.js/Webcam-Motion-Detection.html b/Three.js/Webcam-Motion-Detection.html
@@ -36,7 +36,7 @@
 </script>
 
 <script>
-navigator.getUserMedia = navigator.webkitGetUserMedia || navigator.getUserMedia;
+navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
 window.URL = window.URL || window.webkitURL;
 
 var camvideo = document.getElementById('monitor');
diff --git a/Three.js/Webcam-Test.html b/Three.js/Webcam-Test.html
@@ -24,7 +24,7 @@
 </script>
 
 <script>
-navigator.getUserMedia = navigator.webkitGetUserMedia || navigator.getUserMedia;
+navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
 window.URL = window.URL || window.webkitURL;
 
 var camvideo = document.getElementById('monitor');
diff --git a/Three.js/Webcam-Texture.html b/Three.js/Webcam-Texture.html
@@ -14,7 +14,7 @@
 <canvas id="videoImage" width="160" height="120" style="visibility: hidden; float:left;"></canvas>
 
 <script>
-navigator.getUserMedia = navigator.webkitGetUserMedia || navigator.getUserMedia;
+navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
 window.URL = window.URL || window.webkitURL;
 
 var camvideo = document.getElementById('monitor');
@@ -23,9 +23,9 @@
 	{
 		document.getElementById('errorMessage').innerHTML = 
 			'Sorry. <code>navigator.getUserMedia()</code> is not available.';
-		return;
+	} else {
+		navigator.getUserMedia({video: true}, gotStream, noStream);
 	}
-	navigator.getUserMedia({video: true}, gotStream, noStream);
 
 function gotStream(stream) 
 {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`<canvas id="videoImage" width="160" height="120" style="visibility: hidden; float:left;"></canvas>`
`15`	`15`
`16`	`16`	`<script>`
`17`		`-navigator.getUserMedia = navigator.webkitGetUserMedia \|\| navigator.getUserMedia;`
	`17`	`+navigator.getUserMedia = navigator.getUserMedia \|\| navigator.webkitGetUserMedia \|\| navigator.mozGetUserMedia;`
`18`	`18`	`window.URL = window.URL \|\| window.webkitURL;`
`19`	`19`
`20`	`20`	`var camvideo = document.getElementById('monitor');`
`@@ -23,9 +23,9 @@`
`23`	`23`	`{`
`24`	`24`	`document.getElementById('errorMessage').innerHTML =`
`25`	`25`	`'Sorry. <code>navigator.getUserMedia()</code> is not available.';`
`26`		`- return;`
	`26`	`+ } else {`
	`27`	`+ navigator.getUserMedia({video: true}, gotStream, noStream);`
`27`	`28`	`}`
`28`		`- navigator.getUserMedia({video: true}, gotStream, noStream);`
`29`	`29`
`30`	`30`	`function gotStream(stream)`
`31`	`31`	`{`