@needle-tools/engine 3.37.4-alpha → 3.37.6-alpha

package/src/engine-components/VideoPlayer.ts

@@ -59,7 +59,19 @@ export class VideoPlayer extends Behaviour {
     @serializable()
     private source: VideoSource = VideoSource.Url;
     @serializable(URL)
-    private url?: string | null = null;
+    get url() { return this._url }
+    set url(val: string | null) {
+        const prev = this._url;
+        const changed = prev !== val;
+        if (this.__didAwake) {
+            if (changed) {
+                this.setClipURL(val ?? "");
+            }
+        }
+        else this._url = val;
+    }
+
+    private _url: string | null = null;
 
     @serializable()
     private renderMode?: VideoRenderMode;
@@ -209,15 +221,15 @@ export class VideoPlayer extends Behaviour {
     }
 
     setClipURL(url: string) {
-        if (this.url === url) return;
-        this.url = url;
+        if (this._url === url) return;
+        this._url = url;
         this.source = VideoSource.Url;
 
         if (debug) console.log("set url", url);
         if (!this._videoElement) this.create(this.playOnAwake);
         else {
-            if (url.endsWith(".m3u8")) {
-                this.ensureM3U8CanBePlayed();
+            if (url.endsWith(".m3u8") || url.includes(".m3u")) {
+                this.ensureM3UCanBePlayed();
             }
             else {
                 this._videoElement.src = url;
@@ -308,8 +320,8 @@ export class VideoPlayer extends Behaviour {
         if (!this._receivedInput) this._videoElement.muted = true;
         this.handleBeginPlaying(false);
 
-        if(this.shouldUseM3U8){
-            this.ensureM3U8CanBePlayed();
+        if (this.shouldUseM3U) {
+            this.ensureM3UCanBePlayed();
             return;
         }
 
@@ -487,8 +499,8 @@ export class VideoPlayer extends Behaviour {
         this.updateVideoElementSettings();
         this.updateVideoElementStyles();
         if (playAutomatically) {
-            if (this.shouldUseM3U8) {
-                this.ensureM3U8CanBePlayed();
+            if (this.shouldUseM3U) {
+                this.ensureM3UCanBePlayed();
             }
             this.play();
         }
@@ -576,10 +588,10 @@ export class VideoPlayer extends Behaviour {
 
 
 
-    private get shouldUseM3U8(): boolean { return this.url != undefined && this.url.endsWith(".m3u8") && this.source === VideoSource.Url; }
+    private get shouldUseM3U(): boolean { return this.url != undefined && (this.url.endsWith(".m3u8") || this.url.endsWith(".m3u")) && this.source === VideoSource.Url; }
 
-    private ensureM3U8CanBePlayed() {
-        if (!this.shouldUseM3U8) return;
+    private ensureM3UCanBePlayed() {
+        if (!this.shouldUseM3U) return;
         let hls_script = document.head.querySelector("script[data-hls_library]") as HTMLScriptElement;
         if (!hls_script) {
             if (debug) console.log("HLS: load script");
@@ -599,7 +611,7 @@ export class VideoPlayer extends Behaviour {
     private _hls?: Hls;
     private onHlsAvailable = () => {
         if (debug) console.log("HLS: available", this.clip);
-        if (!this.shouldUseM3U8 || !this.url) return;
+        if (!this.shouldUseM3U || !this.url) return;
         if (!this._hls)
             this._hls = new Hls();
         this.videoElement!.autoplay = true;

package/src/engine-components/webxr/WebARCameraBackground.ts

@@ -116,6 +116,15 @@ export class WebARCameraBackground extends Behaviour {
     updateFromFrame(frame: XRFrame | null) {
         if (!frame) return;
 
+        // If camera feed is not present, then abort and hiden background
+        const enabledFeatures = frame.session.enabledFeatures;
+        if (enabledFeatures && !enabledFeatures.some(x => x === 'camera-access')) {
+            if (this.background) {
+                this.background.visible = false;
+            }
+            return;
+        }
+
         // https://chromium.googlesource.com/chromium/src/+/7c5ac3c0f95b97cf12be95a5c1c0a8ff163246d8/third_party/webxr_test_pages/webxr-samples/proposals/camera-access-barebones.html
         const pose = frame.getViewerPose(this.context.renderer.xr.getReferenceSpace()!);
         if (pose) {