quake2ts 0.0.483 → 0.0.484

package/packages/engine/dist/cjs/index.cjs

@@ -1868,6 +1868,12 @@ var AudioApi = class {
     }
     return this.music.play(track, { loop });
   }
+  play_track(trackNum, loop = true) {
+    if (!this.music) {
+      return Promise.resolve();
+    }
+    return this.music.playTrack(trackNum);
+  }
   pause_music() {
     this.music?.pause();
   }
@@ -4945,60 +4951,138 @@ var clamp01 = (value) => clamp(value, 0, 1);
 
 // src/audio/music.ts
 var MusicSystem = class {
+  // Timer handle
   constructor(options) {
     this.createElement = options.createElement;
     this.resolveSource = options.resolveSource ?? (async (path) => path);
     this.volume = options.volume ?? 1;
+    this.crossfadeDuration = options.crossfadeDuration ?? 1;
+  }
+  async playTrack(trackNum) {
+    const trackName = `music/track${trackNum.toString().padStart(2, "0")}.ogg`;
+    return this.play(trackName);
   }
   async play(track, { loop = true, restart = false } = {}) {
-    if (this.track === track && this.element) {
-      this.element.loop = loop;
-      this.element.volume = this.volume;
+    if (this.track === track && this.currentElement) {
+      this.currentElement.loop = loop;
+      this.cancelFade();
+      if (this.fadingElement) {
+        this.fadingElement.pause();
+        this.fadingElement = void 0;
+      }
+      this.currentElement.volume = this.volume;
       if (restart) {
-        this.element.currentTime = 0;
+        this.currentElement.currentTime = 0;
       }
-      if (this.element.paused || restart) {
-        await this.element.play();
+      if (this.currentElement.paused || restart) {
+        await this.currentElement.play();
       }
       return;
     }
     const src = await this.resolveSource(track);
+    this.cancelFade();
+    if (this.fadingElement) {
+      this.fadingElement.pause();
+      this.fadingElement = void 0;
+    }
+    if (this.currentElement) {
+      this.fadingElement = this.currentElement;
+      this.currentElement = void 0;
+    }
     const element = this.createElement();
     element.src = src;
     element.loop = loop;
-    element.volume = this.volume;
+    element.volume = 0;
     element.currentTime = 0;
     element.load();
-    await element.play();
-    this.element = element;
+    try {
+      await element.play();
+    } catch (e) {
+      console.warn(`MusicSystem: Failed to play ${track}`, e);
+      if (this.fadingElement) {
+      }
+    }
+    this.currentElement = element;
     this.track = track;
+    this.startCrossfade();
   }
   pause() {
-    if (!this.element || this.element.paused) return;
-    this.element.pause();
+    this.cancelFade();
+    if (this.currentElement && !this.currentElement.paused) {
+      this.currentElement.pause();
+    }
+    if (this.fadingElement) {
+      this.fadingElement.pause();
+      this.fadingElement = void 0;
+    }
   }
   async resume() {
-    if (!this.element || !this.element.paused) return;
-    await this.element.play();
+    if (!this.currentElement || !this.currentElement.paused) return;
+    await this.currentElement.play();
+    this.currentElement.volume = this.volume;
   }
   stop() {
-    if (!this.element) return;
-    this.element.pause();
-    this.element.currentTime = 0;
-    this.element = void 0;
+    this.cancelFade();
+    if (this.currentElement) {
+      this.currentElement.pause();
+      this.currentElement.currentTime = 0;
+      this.currentElement = void 0;
+    }
+    if (this.fadingElement) {
+      this.fadingElement.pause();
+      this.fadingElement = void 0;
+    }
     this.track = void 0;
   }
   setVolume(volume) {
     this.volume = volume;
-    if (this.element) {
-      this.element.volume = volume;
+    if (this.currentElement && !this.fadeInterval) {
+      this.currentElement.volume = volume;
     }
   }
   getState() {
-    const playing = Boolean(this.element && !this.element.paused && !this.element.ended);
-    const paused = Boolean(this.element?.paused);
+    const playing = Boolean(this.currentElement && !this.currentElement.paused && !this.currentElement.ended);
+    const paused = Boolean(this.currentElement?.paused);
     return { track: this.track, paused, playing, volume: this.volume };
   }
+  startCrossfade() {
+    const stepTime = 50;
+    const steps = this.crossfadeDuration * 1e3 / stepTime;
+    const volStep = this.volume / steps;
+    let currentVol = 0;
+    let fadingVol = this.fadingElement ? this.fadingElement.volume : 0;
+    const tick = () => {
+      let active = false;
+      if (this.currentElement) {
+        currentVol = Math.min(this.volume, currentVol + volStep);
+        this.currentElement.volume = currentVol;
+        if (currentVol < this.volume) active = true;
+      }
+      if (this.fadingElement) {
+        fadingVol = Math.max(0, fadingVol - volStep);
+        this.fadingElement.volume = fadingVol;
+        if (fadingVol > 0) {
+          active = true;
+        } else {
+          this.fadingElement.pause();
+          this.fadingElement = void 0;
+        }
+      }
+      if (!active) {
+        this.cancelFade();
+      }
+    };
+    tick();
+    if (this.currentElement && this.currentElement.volume < this.volume || this.fadingElement) {
+      this.fadeInterval = setInterval(tick, stepTime);
+    }
+  }
+  cancelFade() {
+    if (this.fadeInterval) {
+      clearInterval(this.fadeInterval);
+      this.fadeInterval = void 0;
+    }
+  }
 };
 
 // src/render/context.ts