Media loading fixes

Hubs-Foundation · Jul 5, 2023 · 4c4e61a · 4c4e61a
1 parent 31373a2
commit 4c4e61a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/bit-systems/media-loading.ts b/src/bit-systems/media-loading.ts
@@ -79,8 +79,9 @@ const loaderForMediaType = {
     { accessibleUrl, contentType }: { accessibleUrl: string; contentType: string }
   ) => loadModel(world, accessibleUrl, contentType, true),
   [MediaType.PDF]: (world: HubsWorld, { accessibleUrl }: { accessibleUrl: string }) => loadPDF(world, accessibleUrl),
-  [MediaType.AUDIO]: (world: HubsWorld, { accessibleUrl }: { accessibleUrl: string }) => loadAudio(world, accessibleUrl),
-  [MediaType.HTML]: (world: HubsWorld, { canonicalUrl, thumbnail }: { canonicalUrl: string, thumbnail: string }) =>
+  [MediaType.AUDIO]: (world: HubsWorld, { accessibleUrl }: { accessibleUrl: string }) =>
+    loadAudio(world, accessibleUrl),
+  [MediaType.HTML]: (world: HubsWorld, { canonicalUrl, thumbnail }: { canonicalUrl: string; thumbnail: string }) =>
     loadHtml(world, canonicalUrl, thumbnail)
 };
 
@@ -100,6 +101,10 @@ function resizeAndRecenter(world: HubsWorld, media: EntityID, eid: EntityID) {
   const box = new Box3();
   box.setFromObject(mediaObj);
 
+  // The AABB can be empty here for interactables that fetch  media (ie. gltf with an empty that has a video component).
+  // If we don't return the interactable would be wrongly positioned at the (0,0,0).
+  if (box.isEmpty()) return;
+
   let scalar = 1;
   if (resize) {
     const size = new Vector3();