Remove unnecessary autoplay and loop video flags

Hubs-Foundation · Aug 9, 2023 · 81229b6 · 81229b6
1 parent a197395
commit 81229b6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 17 deletions.
diff --git a/src/bit-systems/video-system.ts b/src/bit-systems/video-system.ts
@@ -16,7 +16,6 @@ import { AudioSystem } from "../systems/audio-system";
 import { findAncestorWithComponent } from "../utils/bit-utils";
 import { Emitter2Audio, Emitter2Params, makeAudioEntity } from "./audio-emitter-system";
 import { takeSoftOwnership } from "../utils/take-soft-ownership";
-import { VIDEO_FLAGS } from "../inflators/video";
 
 enum Flags {
   PAUSED = 1 << 0
@@ -34,7 +33,7 @@ export function videoSystem(world: HubsWorld, audioSystem: AudioSystem) {
   mediaVideoEnterQuery(world).forEach(function (videoEid) {
     const videoObj = world.eid2obj.get(videoEid) as Mesh;
     const video = MediaVideoData.get(videoEid)!;
-    if (MediaVideo.flags[videoEid] & VIDEO_FLAGS.AUTOPLAY) {
+    if (video.autoplay) {
       video.play().catch(() => {
         // Need to deal with the fact play() may fail if user has not interacted with browser yet.
         console.error("Error auto-playing video.");

diff --git a/src/inflators/video.ts b/src/inflators/video.ts
@@ -8,36 +8,26 @@ import { EntityID } from "../utils/networking-types";
 import { Texture } from "three";
 
 export const VIDEO_FLAGS = {
-  AUTOPLAY: 1 << 0,
-  LOOP: 1 << 1,
   CONTROLS: 1 << 2
 };
 
 export interface VideoParams {
   texture: Texture;
   ratio: number;
   projection: ProjectionMode;
-  autoPlay: boolean;
   video: HTMLVideoElement;
-  loop: boolean;
   controls: boolean;
 }
 
 export function inflateVideo(world: HubsWorld, eid: EntityID, params: VideoParams) {
-  const { texture, ratio, projection, autoPlay, video, loop, controls } = params;
+  const { texture, ratio, projection, video, controls } = params;
   const mesh =
     projection === ProjectionMode.SPHERE_EQUIRECTANGULAR
       ? create360ImageMesh(texture)
       : createImageMesh(texture, ratio);
   addObject3DComponent(world, eid, mesh);
   addComponent(world, MediaVideo, eid);
 
-  if (autoPlay) {
-    MediaVideo.flags[eid] |= VIDEO_FLAGS.AUTOPLAY;
-  }
-  if (loop) {
-    MediaVideo.flags[eid] |= VIDEO_FLAGS.LOOP;
-  }
   if (controls) {
     MediaVideo.flags[eid] |= VIDEO_FLAGS.CONTROLS;
   }

diff --git a/src/utils/load-audio.tsx b/src/utils/load-audio.tsx
@@ -37,10 +37,8 @@ export function* loadAudio(world: HubsWorld, eid: EntityID, url: string) {
       video={{
         texture,
         ratio,
-        autoPlay,
         projection,
         video,
-        loop,
         controls
       }}
     ></entity>

diff --git a/src/utils/load-video.tsx b/src/utils/load-video.tsx
@@ -36,10 +36,8 @@ export function* loadVideo(world: HubsWorld, eid: EntityID, url: string, content
       video={{
         texture,
         ratio,
-        autoPlay,
         projection,
         video,
-        loop,
         controls
       }}
     ></entity>