refactored videoLayer so it can also be used for other extensions (maps, 3d)

HISTORY.md

@@ -78,6 +78,9 @@
     * German
     * French
 
+### 2019-05-15
+* Objects, Treads: refactored videoLayer so it can also be used for other extensions (maps, 3d)
+
 ### 2019-05-14
 * Objects: fixed originalCloneName reference when setting a new parent
 

snap.html

@@ -7,8 +7,8 @@
         <script type="text/javascript" src="src/morphic.js?version=2019-02-07"></script>
         <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-13"></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-14"></script>
+        <script type="text/javascript" src="src/objects.js?version=2019-05-15"></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>

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-14';
+modules.objects = '2019-May-15';
 
 var SpriteMorph;
 var StageMorph;
@@ -1980,7 +1980,7 @@ SpriteMorph.prototype.videoSnap = function() {
     ctx = snap.getContext('2d');
     ctx.drawImage(cst, 0, 0);
     ctx.globalCompositeOperation = 'source-in';
-    ctx.drawImage(stage.videoLayer(), -offset.x, -offset.y);
+    ctx.drawImage(stage.projectionLayer(), -offset.x, -offset.y);
     return new Costume(snap, this.newCostumeName(localize('snap')));
 };
 
@@ -7020,11 +7020,13 @@ StageMorph.prototype.init = function (globals) {
 
     this.remixID = null;
 
-    // video motion detection, do not persist
+    // projection layer - for video, maps, 3D extensions etc., transient
-    this.cameraCanvas = null;
+    this.projectionCanvas = null;
+    this.projectionTransparency = 50;
+
+    // video motion detection, transient
     this.mirrorVideo = true;
     this.videoElement = null;
-    this.videoTransparency = 50;
     this.videoMotion = null;
 
     StageMorph.uber.init.call(this);
@@ -7131,15 +7133,15 @@ StageMorph.prototype.drawOn = function (aCanvas, aRect) {
             w,
             h
         );
-        // webcam
+        // projection layer (webcam, maps, etc.)
         if (this.videoElement) {
             ws = w / this.scale;
             hs = h / this.scale;
             context.save();
             context.scale(this.scale, this.scale);
-            context.globalAlpha = 1 - (this.videoTransparency / 100);
+            context.globalAlpha = 1 - (this.projectionTransparency / 100);
             context.drawImage(
-                this.videoLayer(),
+                this.projectionLayer(),
                 sl / this.scale,
                 st / this.scale,
                 ws,
@@ -7233,15 +7235,15 @@ StageMorph.prototype.penTrailsMorph = function () {
     return morph;
 };
 
-StageMorph.prototype.videoLayer = function () {
+StageMorph.prototype.projectionLayer = function () {
-    if (!this.cameraCanvas) {
+    if (!this.projectionCanvas) {
-        this.cameraCanvas = newCanvas(this.dimensions, true);
+        this.projectionCanvas = newCanvas(this.dimensions, true);
     }
-    return this.cameraCanvas;
+    return this.projectionCanvas;
 };
 
-StageMorph.prototype.clearVideoLayer = function () {
+StageMorph.prototype.clearProjectionLayer = function () {
-    this.cameraCanvas = null;
+    this.projectionCanvas = null;
     this.changed();
 };
 
@@ -7318,7 +7320,6 @@ StageMorph.prototype.startVideo = function() {
     this.videoElement.height = this.dimensions.y;
     this.videoElement.hidden = true;
     document.body.appendChild(this.videoElement);
-    this.videoElement.isFlipped = !this.mirrorVideo;
     if (!this.videoMotion) {
         this.videoMotion = new VideoMotion(
             this.dimensions.x,
@@ -7345,13 +7346,13 @@ StageMorph.prototype.stopVideo = function() {
         this.videoElement = null;
         this.videoMotion = null;
     }
-    this.clearVideoLayer();
+    this.clearProjectionLayer();
 };
 
 StageMorph.prototype.videoSnap = function() {
     var snap = newCanvas(this.dimensions, true),
         ctx = snap.getContext('2d');
-    ctx.drawImage(this.videoLayer(), 0, 0);
+    ctx.drawImage(this.projectionLayer(), 0, 0);
     return new Costume(snap, this.newCostumeName(localize('snap')));
 };
 
@@ -7364,9 +7365,9 @@ StageMorph.prototype.getPixelColor = function (aPoint) {
         context = this.penTrailsMorph().image.getContext('2d');
         data = context.getImageData(point.x, point.y, 1, 1);
         if (data.data[3] === 0) {
-            if (this.cameraCanvas) {
+            if (this.projectionCanvas) {
                 point = point.divideBy(this.scale);
-                context = this.cameraCanvas.getContext('2d');
+                context = this.projectionCanvas.getContext('2d');
                 data = context.getImageData(point.x, point.y, 1, 1);
                 return new Color(
                     data.data[0],
@@ -7536,9 +7537,9 @@ StageMorph.prototype.step = function () {
 
     // video frame capture
     if (this.videoElement) {
-        var context = this.videoLayer().getContext('2d');
+        var context = this.projectionLayer().getContext('2d');
         context.save();
-        if (!this.videoElement.isFlipped) {
+        if (this.mirrorVideo) {
             context.translate(this.dimensions.x, 0);
             context.scale(-1, 1);
         }
@@ -8402,7 +8403,7 @@ StageMorph.prototype.thumbnail = function (extentPoint, excludedSprite) {
         ctx.save();
         ctx.globalAlpha = 1 - (this.videoTransparency / 100);
         ctx.drawImage(
-            this.videoLayer(),
+            this.projectionLayer(),
             0,
             0,
             this.dimensions.x * this.scale,

src/threads.js

@@ -61,7 +61,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
 isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph, Color,
 TableFrameMorph, ColorSlotMorph, isSnapObject, Map, newCanvas, Symbol*/
 
-modules.threads = '2019-May-13';
+modules.threads = '2019-May-15';
 
 var ThreadManager;
 var Process;
@@ -2043,9 +2043,6 @@ Process.prototype.doSetGlobalFlag = function (name, bool) {
         break;
     case 'mirror video':
         stage.mirrorVideo = bool;
-        if (stage.videoElement) {
-            stage.videoElement.isFlipped = !bool;
-        }
         break;
     }
 };
@@ -4440,7 +4437,7 @@ Process.prototype.doSetVideoTransparency = function(factor) {
     if (this.homeContext.receiver) {
         stage = this.homeContext.receiver.parentThatIsA(StageMorph);
         if (stage) {
-            stage.videoTransparency = Math.max(0, Math.min(100, factor));
+            stage.projectionTransparency = Math.max(0, Math.min(100, factor));
         }
     }
 };