@babylonjs/core 6.41.0 → 6.41.2

package/Audio/sound.js

@@ -28,11 +28,10 @@ export class Sound {
      * Gets the current time for the sound.
      */
     get currentTime() {
-        var _a;
         if (this._htmlAudioElement) {
             return this._htmlAudioElement.currentTime;
         }
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext) && (this.isPlaying || this.isPaused)) {
+        if (Engine.audioEngine?.audioContext && (this.isPlaying || this.isPaused)) {
             // The `_currentTime` member is only updated when the sound is paused. Add the time since the last start
             // to get the actual current time.
             const timeSinceLastStart = this.isPaused ? 0 : Engine.audioEngine.audioContext.currentTime - this._startTime;
@@ -77,7 +76,6 @@ export class Sound {
      * @param options Objects to provide with the current available options: autoplay, loop, volume, spatialSound, maxDistance, rolloffFactor, refDistance, distanceModel, panningModel, streaming
      */
     constructor(name, urlOrArrayBuffer, scene, readyToPlayCallback = null, options) {
-        var _a, _b, _c, _d, _e;
         /**
          * Does the sound autoplay once loaded.
          */
@@ -168,18 +166,18 @@ export class Sound {
             if (options.volume !== undefined) {
                 this._volume = options.volume;
             }
-            this._spatialSound = (_a = options.spatialSound) !== null && _a !== void 0 ? _a : false;
-            this.maxDistance = (_b = options.maxDistance) !== null && _b !== void 0 ? _b : 100;
-            this.useCustomAttenuation = (_c = options.useCustomAttenuation) !== null && _c !== void 0 ? _c : false;
+            this._spatialSound = options.spatialSound ?? false;
+            this.maxDistance = options.maxDistance ?? 100;
+            this.useCustomAttenuation = options.useCustomAttenuation ?? false;
             this.rolloffFactor = options.rolloffFactor || 1;
             this.refDistance = options.refDistance || 1;
             this.distanceModel = options.distanceModel || "linear";
             this._playbackRate = options.playbackRate || 1;
-            this._streaming = (_d = options.streaming) !== null && _d !== void 0 ? _d : false;
+            this._streaming = options.streaming ?? false;
             this._length = options.length;
             this._offset = options.offset;
         }
-        if (((_e = Engine.audioEngine) === null || _e === void 0 ? void 0 : _e.canUseWebAudio) && Engine.audioEngine.audioContext) {
+        if (Engine.audioEngine?.canUseWebAudio && Engine.audioEngine.audioContext) {
             this._soundGain = Engine.audioEngine.audioContext.createGain();
             this._soundGain.gain.value = this._volume;
             this._inputAudioNode = this._soundGain;
@@ -347,8 +345,7 @@ export class Sound {
      * Release the sound and its associated resources
      */
     dispose() {
-        var _a;
-        if ((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) {
+        if (Engine.audioEngine?.canUseWebAudio) {
             if (this.isPlaying) {
                 this.stop();
             }
@@ -402,8 +399,7 @@ export class Sound {
         return "Sound";
     }
     _audioBufferLoaded(buffer) {
-        var _a;
-        if (!((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext)) {
+        if (!Engine.audioEngine?.audioContext) {
             return;
         }
         this._audioBuffer = buffer;
@@ -416,8 +412,7 @@ export class Sound {
         }
     }
     _soundLoaded(audioData) {
-        var _a;
-        if (!((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext)) {
+        if (!Engine.audioEngine?.audioContext) {
             return;
         }
         Engine.audioEngine.audioContext.decodeAudioData(audioData, (buffer) => {
@@ -431,8 +426,7 @@ export class Sound {
      * @param audioBuffer The audioBuffer containing the data
      */
     setAudioBuffer(audioBuffer) {
-        var _a;
-        if ((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) {
+        if (Engine.audioEngine?.canUseWebAudio) {
             this._audioBuffer = audioBuffer;
             this._isReadyToPlay = true;
         }
@@ -442,19 +436,18 @@ export class Sound {
      * @param options A JSON object containing values named as the object properties
      */
     updateOptions(options) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (options) {
-            this.loop = (_a = options.loop) !== null && _a !== void 0 ? _a : this.loop;
-            this.maxDistance = (_b = options.maxDistance) !== null && _b !== void 0 ? _b : this.maxDistance;
-            this.useCustomAttenuation = (_c = options.useCustomAttenuation) !== null && _c !== void 0 ? _c : this.useCustomAttenuation;
-            this.rolloffFactor = (_d = options.rolloffFactor) !== null && _d !== void 0 ? _d : this.rolloffFactor;
-            this.refDistance = (_e = options.refDistance) !== null && _e !== void 0 ? _e : this.refDistance;
-            this.distanceModel = (_f = options.distanceModel) !== null && _f !== void 0 ? _f : this.distanceModel;
-            this._playbackRate = (_g = options.playbackRate) !== null && _g !== void 0 ? _g : this._playbackRate;
-            this._length = (_h = options.length) !== null && _h !== void 0 ? _h : undefined;
-            this.spatialSound = (_j = options.spatialSound) !== null && _j !== void 0 ? _j : this._spatialSound;
-            this._setOffset((_k = options.offset) !== null && _k !== void 0 ? _k : undefined);
-            this.setVolume((_l = options.volume) !== null && _l !== void 0 ? _l : this._volume);
+            this.loop = options.loop ?? this.loop;
+            this.maxDistance = options.maxDistance ?? this.maxDistance;
+            this.useCustomAttenuation = options.useCustomAttenuation ?? this.useCustomAttenuation;
+            this.rolloffFactor = options.rolloffFactor ?? this.rolloffFactor;
+            this.refDistance = options.refDistance ?? this.refDistance;
+            this.distanceModel = options.distanceModel ?? this.distanceModel;
+            this._playbackRate = options.playbackRate ?? this._playbackRate;
+            this._length = options.length ?? undefined;
+            this.spatialSound = options.spatialSound ?? this._spatialSound;
+            this._setOffset(options.offset ?? undefined);
+            this.setVolume(options.volume ?? this._volume);
             this._updateSpatialParameters();
             if (this.isPlaying) {
                 if (this._streaming && this._htmlAudioElement) {
@@ -481,12 +474,11 @@ export class Sound {
         }
     }
     _createSpatialParameters() {
-        var _a, _b;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && Engine.audioEngine.audioContext) {
+        if (Engine.audioEngine?.canUseWebAudio && Engine.audioEngine.audioContext) {
             if (this._scene.headphone) {
                 this._panningModel = "HRTF";
             }
-            this._soundPanner = (_b = this._soundPanner) !== null && _b !== void 0 ? _b : Engine.audioEngine.audioContext.createPanner();
+            this._soundPanner = this._soundPanner ?? Engine.audioEngine.audioContext.createPanner();
             if (this._soundPanner && this._outputAudioNode) {
                 this._updateSpatialParameters();
                 this._soundPanner.connect(this._outputAudioNode);
@@ -495,12 +487,11 @@ export class Sound {
         }
     }
     _disableSpatialSound() {
-        var _a;
         if (!this._spatialSound) {
             return;
         }
         this._inputAudioNode = this._soundGain;
-        (_a = this._soundPanner) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this._soundPanner?.disconnect();
         this._soundPanner = null;
         this._spatialSound = false;
     }
@@ -548,8 +539,7 @@ export class Sound {
         this._switchPanningModel();
     }
     _switchPanningModel() {
-        var _a;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._spatialSound && this._soundPanner) {
+        if (Engine.audioEngine?.canUseWebAudio && this._spatialSound && this._soundPanner) {
             this._soundPanner.panningModel = this._panningModel;
         }
     }
@@ -558,8 +548,7 @@ export class Sound {
      * @param soundTrackAudioNode the sound track audio node to connect to
      */
     connectToSoundTrackAudioNode(soundTrackAudioNode) {
-        var _a;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._outputAudioNode) {
+        if (Engine.audioEngine?.canUseWebAudio && this._outputAudioNode) {
             if (this._isOutputConnected) {
                 this._outputAudioNode.disconnect();
             }
@@ -597,14 +586,13 @@ export class Sound {
      * Gets or sets the inner angle for the directional cone.
      */
     set directionalConeInnerAngle(value) {
-        var _a;
         if (value != this._coneInnerAngle) {
             if (this._coneOuterAngle < value) {
                 Logger.Error("directionalConeInnerAngle: outer angle of the cone must be superior or equal to the inner angle.");
                 return;
             }
             this._coneInnerAngle = value;
-            if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._spatialSound && this._soundPanner) {
+            if (Engine.audioEngine?.canUseWebAudio && this._spatialSound && this._soundPanner) {
                 this._soundPanner.coneInnerAngle = this._coneInnerAngle;
             }
         }
@@ -619,14 +607,13 @@ export class Sound {
      * Gets or sets the outer angle for the directional cone.
      */
     set directionalConeOuterAngle(value) {
-        var _a;
         if (value != this._coneOuterAngle) {
             if (value < this._coneInnerAngle) {
                 Logger.Error("directionalConeOuterAngle: outer angle of the cone must be superior or equal to the inner angle.");
                 return;
             }
             this._coneOuterAngle = value;
-            if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._spatialSound && this._soundPanner) {
+            if (Engine.audioEngine?.canUseWebAudio && this._spatialSound && this._soundPanner) {
                 this._soundPanner.coneOuterAngle = this._coneOuterAngle;
             }
         }
@@ -636,12 +623,11 @@ export class Sound {
      * @param newPosition Defines the new position
      */
     setPosition(newPosition) {
-        var _a;
         if (newPosition.equals(this._position)) {
             return;
         }
         this._position.copyFrom(newPosition);
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._spatialSound && this._soundPanner && !isNaN(this._position.x) && !isNaN(this._position.y) && !isNaN(this._position.z)) {
+        if (Engine.audioEngine?.canUseWebAudio && this._spatialSound && this._soundPanner && !isNaN(this._position.x) && !isNaN(this._position.y) && !isNaN(this._position.z)) {
             this._soundPanner.positionX.value = this._position.x;
             this._soundPanner.positionY.value = this._position.y;
             this._soundPanner.positionZ.value = this._position.z;
@@ -652,9 +638,8 @@ export class Sound {
      * @param newLocalDirection Defines the new local direction
      */
     setLocalDirectionToMesh(newLocalDirection) {
-        var _a;
         this._localDirection = newLocalDirection;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._connectedTransformNode && this.isPlaying) {
+        if (Engine.audioEngine?.canUseWebAudio && this._connectedTransformNode && this.isPlaying) {
             this._updateDirection();
         }
     }
@@ -671,8 +656,7 @@ export class Sound {
     }
     /** @internal */
     updateDistanceFromListener() {
-        var _a;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._connectedTransformNode && this.useCustomAttenuation && this._soundGain && this._scene.activeCamera) {
+        if (Engine.audioEngine?.canUseWebAudio && this._connectedTransformNode && this.useCustomAttenuation && this._soundGain && this._scene.activeCamera) {
             const distance = this._scene.audioListenerPositionProvider
                 ? this._connectedTransformNode.position.subtract(this._scene.audioListenerPositionProvider()).length()
                 : this._connectedTransformNode.getDistanceToCamera(this._scene.activeCamera);
@@ -694,11 +678,10 @@ export class Sound {
      * @param length (optional) Sound duration (in seconds)
      */
     play(time, offset, length) {
-        var _a, _b, _c, _d;
-        if (this._isReadyToPlay && this._scene.audioEnabled && ((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext)) {
+        if (this._isReadyToPlay && this._scene.audioEnabled && Engine.audioEngine?.audioContext) {
             try {
                 this._clearTimeoutsAndObservers();
-                let startTime = time ? ((_b = Engine.audioEngine) === null || _b === void 0 ? void 0 : _b.audioContext.currentTime) + time : (_c = Engine.audioEngine) === null || _c === void 0 ? void 0 : _c.audioContext.currentTime;
+                let startTime = time ? Engine.audioEngine?.audioContext.currentTime + time : Engine.audioEngine?.audioContext.currentTime;
                 if (!this._soundSource || !this._streamingSource) {
                     if (this._spatialSound && this._soundPanner) {
                         if (!isNaN(this._position.x) && !isNaN(this._position.y) && !isNaN(this._position.z)) {
@@ -737,19 +720,17 @@ export class Sound {
                         // the audio engine to be unlocked by a user gesture before trying to play
                         // an HTML Audio element
                         const tryToPlay = () => {
-                            var _a, _b;
-                            if ((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.unlocked) {
+                            if (Engine.audioEngine?.unlocked) {
                                 const playPromise = this._htmlAudioElement.play();
                                 // In browsers that don’t yet support this functionality,
                                 // playPromise won’t be defined.
                                 if (playPromise !== undefined) {
                                     playPromise.catch(() => {
-                                        var _a, _b;
                                         // Automatic playback failed.
                                         // Waiting for the audio engine to be unlocked by user click on unmute
-                                        (_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.lock();
+                                        Engine.audioEngine?.lock();
                                         if (this.loop || this.autoplay) {
-                                            this._audioUnlockedObserver = (_b = Engine.audioEngine) === null || _b === void 0 ? void 0 : _b.onAudioUnlockedObservable.addOnce(() => {
+                                            this._audioUnlockedObserver = Engine.audioEngine?.onAudioUnlockedObservable.addOnce(() => {
                                                 tryToPlay();
                                             });
                                         }
@@ -758,7 +739,7 @@ export class Sound {
                             }
                             else {
                                 if (this.loop || this.autoplay) {
-                                    this._audioUnlockedObserver = (_b = Engine.audioEngine) === null || _b === void 0 ? void 0 : _b.onAudioUnlockedObservable.addOnce(() => {
+                                    this._audioUnlockedObserver = Engine.audioEngine?.onAudioUnlockedObservable.addOnce(() => {
                                         tryToPlay();
                                     });
                                 }
@@ -769,8 +750,7 @@ export class Sound {
                 }
                 else {
                     const tryToPlay = () => {
-                        var _a, _b, _c, _d;
-                        if ((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext) {
+                        if (Engine.audioEngine?.audioContext) {
                             length = length || this._length;
                             if (offset !== undefined) {
                                 this._setOffset(offset);
@@ -781,7 +761,7 @@ export class Sound {
                                     oldSource.disconnect();
                                 };
                             }
-                            this._soundSource = (_b = Engine.audioEngine) === null || _b === void 0 ? void 0 : _b.audioContext.createBufferSource();
+                            this._soundSource = Engine.audioEngine?.audioContext.createBufferSource();
                             if (this._soundSource && this._inputAudioNode) {
                                 this._soundSource.buffer = this._audioBuffer;
                                 this._soundSource.connect(this._inputAudioNode);
@@ -796,17 +776,16 @@ export class Sound {
                                 this._soundSource.onended = () => {
                                     this._onended();
                                 };
-                                startTime = time ? ((_c = Engine.audioEngine) === null || _c === void 0 ? void 0 : _c.audioContext.currentTime) + time : Engine.audioEngine.audioContext.currentTime;
-                                const actualOffset = ((this.isPaused ? this.currentTime : 0) + ((_d = this._offset) !== null && _d !== void 0 ? _d : 0)) % this._soundSource.buffer.duration;
+                                startTime = time ? Engine.audioEngine?.audioContext.currentTime + time : Engine.audioEngine.audioContext.currentTime;
+                                const actualOffset = ((this.isPaused ? this.currentTime : 0) + (this._offset ?? 0)) % this._soundSource.buffer.duration;
                                 this._soundSource.start(startTime, actualOffset, this.loop ? undefined : length);
                             }
                         }
                     };
-                    if (((_d = Engine.audioEngine) === null || _d === void 0 ? void 0 : _d.audioContext.state) === "suspended") {
+                    if (Engine.audioEngine?.audioContext.state === "suspended") {
                         // Wait a bit for FF as context seems late to be ready.
                         this._tryToPlayTimeout = setTimeout(() => {
-                            var _a;
-                            if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext.state) === "suspended") {
+                            if (Engine.audioEngine?.audioContext.state === "suspended") {
                                 // Automatic playback failed.
                                 // Waiting for the audio engine to be unlocked by user click on unmute
                                 Engine.audioEngine.lock();
@@ -848,7 +827,6 @@ export class Sound {
      * @param time (optional) Stop the sound after X seconds. Stop immediately (0) by default.
      */
     stop(time) {
-        var _a;
         if (this.isPlaying) {
             this._clearTimeoutsAndObservers();
             if (this._streaming) {
@@ -864,7 +842,7 @@ export class Sound {
                 }
                 this.isPlaying = false;
             }
-            else if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext) && this._soundSource) {
+            else if (Engine.audioEngine?.audioContext && this._soundSource) {
                 const stopTime = time ? Engine.audioEngine.audioContext.currentTime + time : undefined;
                 this._soundSource.onended = () => {
                     this.isPlaying = false;
@@ -892,7 +870,6 @@ export class Sound {
      * Put the sound in pause
      */
     pause() {
-        var _a;
         if (this.isPlaying) {
             this._clearTimeoutsAndObservers();
             if (this._streaming) {
@@ -905,7 +882,7 @@ export class Sound {
                 this.isPlaying = false;
                 this.isPaused = true;
             }
-            else if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.audioContext) && this._soundSource) {
+            else if (Engine.audioEngine?.audioContext && this._soundSource) {
                 this._soundSource.onended = () => void 0;
                 this._soundSource.stop();
                 this.isPlaying = false;
@@ -920,8 +897,7 @@ export class Sound {
      * @param time Define time for gradual change to new volume
      */
     setVolume(newVolume, time) {
-        var _a;
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._soundGain) {
+        if (Engine.audioEngine?.canUseWebAudio && this._soundGain) {
             if (time && Engine.audioEngine.audioContext) {
                 this._soundGain.gain.cancelScheduledValues(Engine.audioEngine.audioContext.currentTime);
                 this._soundGain.gain.setValueAtTime(this._soundGain.gain.value, Engine.audioEngine.audioContext.currentTime);
@@ -997,7 +973,6 @@ export class Sound {
         }
     }
     _onRegisterAfterWorldMatrixUpdate(node) {
-        var _a;
         if (!node.getBoundingInfo) {
             this.setPosition(node.absolutePosition);
         }
@@ -1006,7 +981,7 @@ export class Sound {
             const boundingInfo = mesh.getBoundingInfo();
             this.setPosition(boundingInfo.boundingSphere.centerWorld);
         }
-        if (((_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.canUseWebAudio) && this._isDirectional && this.isPlaying) {
+        if (Engine.audioEngine?.canUseWebAudio && this._isDirectional && this.isPlaying) {
             this._updateDirection();
         }
     }
@@ -1194,13 +1169,12 @@ export class Sound {
         this._offset = value;
     }
     _clearTimeoutsAndObservers() {
-        var _a;
         if (this._tryToPlayTimeout) {
             clearTimeout(this._tryToPlayTimeout);
             this._tryToPlayTimeout = null;
         }
         if (this._audioUnlockedObserver) {
-            (_a = Engine.audioEngine) === null || _a === void 0 ? void 0 : _a.onAudioUnlockedObservable.remove(this._audioUnlockedObserver);
+            Engine.audioEngine?.onAudioUnlockedObservable.remove(this._audioUnlockedObserver);
             this._audioUnlockedObserver = null;
         }
     }