Merge pull request #6413 from mozilla/bitecs-aframe-media-fix

Fix aframe media loading
Hubs-Foundation · Dec 11, 2023 · 31b1f50 · 31b1f50
2 parents 472c236 + 552ed78
commit 31b1f50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/components/media-loader.js b/src/components/media-loader.js
@@ -28,8 +28,8 @@ import { cloneObject3D, setMatrixWorld } from "../utils/three-utils";
 import { waitForDOMContentLoaded } from "../utils/async-utils";
 
 import { SHAPE } from "three-ammo/constants";
-import { addComponent, entityExists, removeComponent } from "bitecs";
-import { MediaContentBounds, MediaLoading } from "../bit-components";
+import { addComponent } from "bitecs";
+import { MediaContentBounds } from "../bit-components";
 
 let loadingObject;
 
@@ -288,9 +288,6 @@ AFRAME.registerComponent("media-loader", {
  MediaContentBounds.bounds[el.eid].set(contentBounds.toArray());
 
  el.emit("media-loaded");
- if (el.eid && entityExists(APP.world, el.eid)) {
- removeComponent(APP.world, MediaLoading, el.eid);
- }
  };
 
  if (this.data.animate) {
@@ -349,7 +346,6 @@ AFRAME.registerComponent("media-loader", {
  try {
  if ((forceLocalRefresh || srcChanged) && !this.showLoaderTimeout) {
  this.showLoaderTimeout = setTimeout(this.showLoader, 100);
- addComponent(APP.world, MediaLoading, this.el.eid);
  }
 
  //check if url is an anchor hash e.g. #Spawn_Point_1

diff --git a/src/systems/bit-media-frames.js b/src/systems/bit-media-frames.js
@@ -20,7 +20,6 @@ import {
  MediaFrame,
  MediaImage,
  MediaLoaded,
- MediaLoading,
  MediaPDF,
  MediaVideo,
  Networked,
@@ -102,7 +101,7 @@ function getCapturableEntity(world, physicsSystem, frame) {
  const eid = bodyData.object3D.eid;
  if (
  MediaFrame.mediaType[frame] & mediaTypeMaskFor(world, eid) &&
- !hasComponent(world, MediaLoading, eid) &&
+ hasComponent(world, MediaContentBounds, eid) &&
  !inOtherFrame(world, frame, eid) &&
  !isAncestor(bodyData.object3D, frameObj)
  ) {