From 06fcbc3823263434a6df74fcd03e3bc25542f4e4 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Thu, 16 May 2019 19:03:59 +0200
Subject: [PATCH] more refactoring to generalize projection extensions

---
 HISTORY.md     |  3 +++
 snap.html      |  2 +-
 src/objects.js | 28 ++++++++++++++++++----------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 434c87c2..a0227196 100755
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -78,6 +78,9 @@
     * German
     * French
 
+### 2019-05-16
+* Objects: more refactoring to generalize projection extensions
+
 ### 2019-05-15
 * Objects, Treads: refactored videoLayer so it can also be used for other extensions (maps, 3d)
 * Objects: refactored video frame capture
diff --git a/snap.html b/snap.html
index b08ff3bf..686d73e1 100755
--- a/snap.html
+++ b/snap.html
@@ -8,7 +8,7 @@
         <script type="text/javascript" src="src/widgets.js?version=2019-04-05"></script>
         <script type="text/javascript" src="src/blocks.js?version=2019-05-08"></script>
         <script type="text/javascript" src="src/threads.js?version=2019-05-15"></script>
-        <script type="text/javascript" src="src/objects.js?version=2019-05-15"></script>
+        <script type="text/javascript" src="src/objects.js?version=2019-05-16"></script>
         <script type="text/javascript" src="src/gui.js?version=2019-05-09"></script>
         <script type="text/javascript" src="src/paint.js?version=2019-02-22"></script>
         <script type="text/javascript" src="src/lists.js?version=2019-04-27"></script>
diff --git a/src/objects.js b/src/objects.js
index 1e5dfcb9..ff7b2110 100644
--- a/src/objects.js
+++ b/src/objects.js
@@ -84,7 +84,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
 TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph, HandleMorph,
 AlignmentMorph, Process, XML_Element, VectorPaintEditorMorph*/
 
-modules.objects = '2019-May-15';
+modules.objects = '2019-May-16';
 
 var SpriteMorph;
 var StageMorph;
@@ -7022,6 +7022,7 @@ StageMorph.prototype.init = function (globals) {
 
     // projection layer - for video, maps, 3D extensions etc., transient
     this.projectionSource = null; // offscreen DOM element for video, maps, 3D
+    this.getProjectionImage = null; // function to return a blittable image
     this.stopProjectionSource = null; // function to turn off video stream etc.
     this.continuousProjection = false; // turn ON for video
     this.projectionCanvas = null;
@@ -7331,6 +7332,7 @@ StageMorph.prototype.startVideo = function() {
     if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
         navigator.mediaDevices.getUserMedia({ video: true })
             .then(function(stream) {
+                myself.getProjectionImage = myself.getVideoImage;
                 myself.stopProjectionSource = myself.stopVideo;
                 myself.continuousProjection = true;
                 myself.projectionSource.srcObject = stream;
@@ -7341,6 +7343,10 @@ StageMorph.prototype.startVideo = function() {
     }
 };
 
+StageMorph.prototype.getVideoImage = function () {
+    return this.projectionSource;
+};
+
 StageMorph.prototype.stopVideo = function() {
     this.projectionSource.stream.getTracks().forEach(
         function (track) {track.stop(); }
@@ -7558,20 +7564,22 @@ StageMorph.prototype.stepProjection = function () {
         context.scale(-1, 1);
     }
     context.drawImage(
-        this.projectionSource,
+        this.getProjectionImage(),
         0,
         0,
         this.projectionSource.width,
         this.projectionSource.height
     );
-    this.videoMotion.addFrame(
-        context.getImageData(
-            0,
-            0,
-            this.projectionSource.width,
-            this.projectionSource.height
-        ).data
-    );
+    if (this.videoMotion) {
+        this.videoMotion.addFrame(
+            context.getImageData(
+                0,
+                0,
+                this.projectionSource.width,
+                this.projectionSource.height
+            ).data
+        );
+    }
     context.restore();
     this.changed();
 };