Handle zone ownership race case

mozilla · Sep 17, 2020 · 3ce1d47 · 3ce1d47
1 parent 0238f17
commit 3ce1d47
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/systems/media-frames.js b/src/systems/media-frames.js
@@ -217,6 +217,16 @@ AFRAME.registerComponent("media-frame", {
         this.data.targetId
       }(${JSON.stringify(this.data.originalTargetScale)})`
     );
+    // Ownership race, whoever owns the old object needs to take care of "ejecting" it
+    if (oldData.targetId !== "empty" && oldData.tergetId !== this.data.targetId) {
+      let capturedEl = document.getElementById(oldData.targetId);
+      if (capturedEl && NAF.utils.isMine(capturedEl)) {
+        capturedEl.object3D.translateZ(this.data.bounds.z);
+        capturedEl.object3D.scale.copy(oldData.originalTargetScale);
+        capturedEl.object3D.matrixNeedsUpdate = true;
+        capturedEl.components["floaty-object"].setLocked(false);
+      }
+    }
   },
 
   play() {