Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Tools/DevLoader/BabylonLoader.js

@@ -130,7 +130,7 @@ var BABYLONDEVTOOLS;
             var style = document.createElement('link');
             style.href = url;
             style.rel = "stylesheet";
-            style.type = "text/css"
+            style.type = "text/css";
             document.head.appendChild(style);
         }
 

Tools/Gulp/config.json

@@ -575,7 +575,8 @@
                 "../../src/Audio/babylon.audioEngine.js",
                 "../../src/Audio/babylon.sound.js",
                 "../../src/Audio/babylon.soundtrack.js",
-                "../../src/Audio/babylon.analyser.js"
+                "../../src/Audio/babylon.analyser.js",
+                "../../src/Audio/babylon.weightedsound.js"
             ],
             "dependUpon": [
                 "core"
@@ -1753,6 +1754,7 @@
                     "../../loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts",
                     "../../loaders/src/glTF/2.0/babylon.glTFLoader.ts",
                     "../../loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts",
+                    "../../loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_lod.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_minecraftMesh.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_sRGBFactors.ts",
@@ -1778,6 +1780,7 @@
                     "../../loaders/src/glTF/2.0/babylon.glTFLoaderInterfaces.ts",
                     "../../loaders/src/glTF/2.0/babylon.glTFLoader.ts",
                     "../../loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts",
+                    "../../loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_lod.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_minecraftMesh.ts",
                     "../../loaders/src/glTF/2.0/Extensions/MSFT_sRGBFactors.ts",

dist/preview release/what's new.md

@@ -82,6 +82,7 @@
 - Ability to customize meshes on gizmos ([TrevorDev](https://github.com/TrevorDev))
 - Added gltf light falloff [Issue 4148](https://github.com/BabylonJS/Babylon.js/issues/4148) ([sebavan](http://www.github.com/sebavan))
 - Added falloff type per light to prevent material only inconsistencies [Issue 4148](https://github.com/BabylonJS/Babylon.js/issues/4148) ([sebavan](http://www.github.com/sebavan))
+- Added WeightedSound; selects one from many Sounds with random weight for playback. ([najadojo](https://github.com/najadojo))
 
 ### glTF Loader
 
@@ -90,6 +91,7 @@
 - Added glTF loader settings to the GLTF tab in the debug layer ([bghgary](http://www.github.com/bghgary))
 - Added debug logging and performance counters ([bghgary](http://www.github.com/bghgary))
 - Added support for EXT_lights_imageBased ([bghgary](http://www.github.com/bghgary))
+- Added support for MSFT_audio_emitter ([najadojo](http://www.github.com/najadojo))
 
 ### Viewer
 

inspector/src/adapters/SoundAdapter.ts

@@ -39,6 +39,7 @@ export class SoundAdapter
         return tools;
     }
 
+
     public setPlaying(callback: Function) {
         if ((this._obj as Sound).isPlaying) {
             (this._obj as Sound).pause();
@@ -46,8 +47,8 @@ export class SoundAdapter
         else {
             (this._obj as Sound).play();
         }
-        (this._obj as Sound).onended = () => {
-            callback();
-        }
+        (this._obj as Sound).onEndedObservable.addOnce(() => { 
+            callback(); 
+        });
     }
 }

loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts

@@ -0,0 +1,276 @@
+/// <reference path="../../../../../dist/preview release/babylon.d.ts"/>
+
+module BABYLON.GLTF2.Extensions {
+
+    const NAME = "MSFT_audio_emitter";
+
+    interface _IClipReference {
+        clip: number;
+        weight?: number;
+    }
+
+    interface _IEmittersReference {
+        emitters: number[];
+    }
+
+    const enum _DistanceModel {
+        linear = "linear",
+        inverse = "inverse",
+        exponential = "exponential",
+    }
+
+    interface _IEmitter {
+        name?: string;
+        distanceModel?: _DistanceModel;
+        refDistance?: number;
+        maxDistance?: number;
+        rolloffFactor?: number;
+        innerAngle?: number;
+        outerAngle?: number;
+        loop?: boolean;
+        volume?: number;
+        clips: _IClipReference[];
+    }
+
+    const enum _AudioMimeType {
+        WAV = "audio/wav",
+    }
+
+    interface _IClip {
+        uri?: string;
+        bufferView?: number;
+        mimeType?: _AudioMimeType;
+    }
+
+    interface _ILoaderClip extends _IClip, _IArrayItem {
+        _objectURL?: Promise<string>;
+    }
+
+    interface _ILoaderEmitter extends _IEmitter, _IArrayItem {
+        _babylonData?: { 
+            sound?: WeightedSound;
+            loaded: Promise<void>;
+        };
+        _babylonSounds: Sound[];
+    }
+
+    interface _IMSFTAudioEmitter {
+        clips: _ILoaderClip[];
+        emitters: _ILoaderEmitter[];
+    }
+
+    const enum _AnimationEventAction {
+        play = "play",
+        pause = "pause",
+        stop = "stop",
+    }
+
+    interface _IAnimationEvent {
+        action: _AnimationEventAction,
+        emitter: number;
+        time: number;
+        startOffset?: number;
+    }
+
+    interface _ILoaderAnimationEvent extends _IAnimationEvent, _IArrayItem {
+    }
+
+    interface _ILoaderAnimationEvents {
+        events: _ILoaderAnimationEvent[];
+    }
+
+    /**
+     * [Specification](https://github.com/najadojo/glTF/tree/MSFT_audio_emitter/extensions/2.0/Vendor/MSFT_audio_emitter)
+     */
+    export class MSFT_audio_emitter extends GLTFLoaderExtension {
+        public readonly name = NAME;
+
+        private _loadClipAsync(context: string, clip: _ILoaderClip): Promise<string> {
+            if (clip._objectURL) {
+                return clip._objectURL;
+            }
+
+            let promise: Promise<ArrayBufferView>;
+            if (clip.uri) {
+                promise = this._loader._loadUriAsync(context, clip.uri);
+            }
+            else {
+                const bufferView = GLTFLoader._GetProperty(`${context}/bufferView`, this._loader._gltf.bufferViews, clip.bufferView);
+                promise = this._loader._loadBufferViewAsync(`#/bufferViews/${bufferView._index}`, bufferView);
+            }
+
+            clip._objectURL = promise.then(data => {
+                return URL.createObjectURL(new Blob([data], { type: clip.mimeType }));
+            });
+
+            return clip._objectURL;
+        }
+
+        private _loadEmitterAsync(context: string, emitter: _ILoaderEmitter): Promise<void> {
+            emitter._babylonSounds = emitter._babylonSounds || [];
+            if (!emitter._babylonData) {
+                const clipPromises = new Array<Promise<void>>();
+                const name = emitter.name || `emitter${emitter._index}`;
+                const options = {
+                    loop: false,
+                    autoplay: false,
+                    volume: emitter.volume == undefined ? 1 : emitter.volume,
+                };
+
+                _ArrayItem.Assign(this._clips);
+                for (let i = 0; i < emitter.clips.length; i++) {
+                    const clipContext = `#/extensions/${NAME}/clips`;
+                    const clip = GLTFLoader._GetProperty(clipContext, this._clips, emitter.clips[i].clip);
+                    clipPromises.push(this._loadClipAsync(`${clipContext}/${emitter.clips[i].clip}`, clip).then((objectURL: string) => {
+                        const sound = emitter._babylonSounds[i] = new Sound(name, objectURL, this._loader._babylonScene, null, options);
+                        sound.refDistance = emitter.refDistance || 1;
+                        sound.maxDistance = emitter.maxDistance || 256;
+                        sound.rolloffFactor = emitter.rolloffFactor || 1;
+                        sound.distanceModel = emitter.distanceModel || 'exponential';
+                        sound._positionInEmitterSpace = true;
+                    }));
+                }
+
+                const promise = Promise.all(clipPromises).then(() => {
+                    const weights = emitter.clips.map(clip => { return clip.weight || 1; });
+                    const weightedSound = new WeightedSound(emitter.loop || false, emitter._babylonSounds, weights);
+                    if (emitter.innerAngle) weightedSound.directionalConeInnerAngle = 2 * Tools.ToDegrees(emitter.innerAngle);
+                    if (emitter.outerAngle) weightedSound.directionalConeOuterAngle = 2 * Tools.ToDegrees(emitter.outerAngle);
+                    if (emitter.volume) weightedSound.volume = emitter.volume;
+                    emitter._babylonData!.sound = weightedSound;
+                });
+
+                emitter._babylonData = {
+                    loaded: promise
+                };
+            }
+
+            return emitter._babylonData.loaded;
+        }
+
+        protected _loadSceneAsync(context: string, scene: _ILoaderScene): Nullable<Promise<void>> { 
+            return this._loadExtensionAsync<_IEmittersReference>(context, scene, (extensionContext, extension) => {
+                return this._loader._loadSceneAsync(context, scene).then(() => {
+
+                    const promises = new Array<Promise<void>>();
+                    _ArrayItem.Assign(this._emitters);
+                    for (const emitterIndex of extension.emitters) {
+                        const emitter = GLTFLoader._GetProperty(`${extensionContext}/emitters`, this._emitters, emitterIndex);
+                        if (emitter.refDistance != undefined || emitter.maxDistance != undefined || emitter.rolloffFactor != undefined ||
+                            emitter.distanceModel != undefined || emitter.innerAngle != undefined || emitter.outerAngle != undefined) {
+                            throw new Error(`${extensionContext}: Direction or Distance properties are not allowed on emitters attached to a scene`);
+                        }
+
+                        promises.push(this._loadEmitterAsync(`${extensionContext}/emitters/${emitter._index}`, emitter));
+                    }
+
+                    return Promise.all(promises).then(() => {});
+                });
+            });
+        }
+
+        protected _loadNodeAsync(context: string, node: _ILoaderNode): Nullable<Promise<void>> { 
+            return this._loadExtensionAsync<_IEmittersReference>(context, node, (extensionContext, extension) => {
+                return this._loader._loadNodeAsync(extensionContext, node).then(() => {
+
+                    const promises = new Array<Promise<void>>();
+                    _ArrayItem.Assign(this._emitters);
+                    for (const emitterIndex of extension.emitters) {
+                        const emitter = GLTFLoader._GetProperty(`${extensionContext}/emitters`, this._emitters, emitterIndex);
+                        promises.push(this._loadEmitterAsync(`${extensionContext}/emitters/${emitter._index}`, emitter).then(() => {
+                            if (node._babylonMesh) {
+                                for (const sound of emitter._babylonSounds) {
+                                    sound.attachToMesh(node._babylonMesh);
+                                    if (emitter.innerAngle != undefined || emitter.outerAngle != undefined) {
+                                        sound.setLocalDirectionToMesh(new Vector3(0, 0, 1));
+                                        sound.setDirectionalCone(2 * Tools.ToDegrees(emitter.innerAngle == undefined ? Math.PI : emitter.innerAngle),
+                                                                 2 * Tools.ToDegrees(emitter.outerAngle == undefined ? Math.PI : emitter.outerAngle), 0);
+                                    }
+                                }
+                            }
+                        }));
+                    }
+
+                    return Promise.all(promises).then(() => {});
+                });
+            });
+        }
+
+        protected _loadAnimationAsync(context: string, animation: _ILoaderAnimation): Nullable<Promise<void>> { 
+            return this._loadExtensionAsync<_ILoaderAnimationEvents>(context, animation, (extensionContext, extension) => {
+                return this._loader._loadAnimationAsync(extensionContext, animation).then(() => {
+                    const promises = new Array<Promise<void>>();
+                    const babylonAnimationGroup = animation._babylonAnimationGroup!;
+
+                    _ArrayItem.Assign(extension.events);
+                    for (const event of extension.events) {
+                        promises.push(this._loadAnimationEventAsync(`${extensionContext}/events/${event._index}`, context, animation, event, babylonAnimationGroup));
+                    }
+
+                    return Promise.all(promises).then(() => {});
+                });
+            });
+        }
+
+        private _getEventAction(context:string, sound: WeightedSound, action: _AnimationEventAction, time: number, startOffset?: number): (currentFrame: number) => void {
+            if (action == _AnimationEventAction.play) {
+                return (currentFrame: number) => {            
+                    const frameOffset = (startOffset || 0) + (currentFrame - time);
+                    sound.play(frameOffset);
+                };
+            } else if (action == _AnimationEventAction.stop) {
+                return (currentFrame: number) => {
+                    sound.stop();
+                };
+            } else if (action == _AnimationEventAction.pause) {
+                return (currentFrame: number) => {   
+                    sound.pause();
+                };
+            } else {
+                throw new Error(`${context}: Unsupported action ${action}`);
+            }
+        }
+
+        private _loadAnimationEventAsync(context: string, animationContext: string, animation: _ILoaderAnimation, event: _ILoaderAnimationEvent, babylonAnimationGroup: AnimationGroup): Promise<void> {
+            if (babylonAnimationGroup.targetedAnimations.length == 0) {
+                return Promise.resolve();
+            }
+            const babylonAnimation = babylonAnimationGroup.targetedAnimations[0];
+            const emitterIndex = event.emitter;
+            const emitter = GLTFLoader._GetProperty(`#/extensions/${NAME}/emitters`, this._emitters, emitterIndex);
+            return this._loadEmitterAsync(context, emitter).then(()=> {
+                const sound = emitter._babylonData!.sound;
+                if (sound) {
+                    var babylonAnimationEvent = new AnimationEvent(event.time, this._getEventAction(context, sound, event.action, event.time, event.startOffset));
+                    babylonAnimation.animation.addEvent(babylonAnimationEvent);
+                    // Make sure all started audio stops when this animation is terminated.
+                    babylonAnimationGroup.onAnimationGroupEndObservable.add(() => { 
+                        sound.stop();
+                    });
+                    babylonAnimationGroup.onAnimationGroupPauseObservable.add(() => { 
+                        sound.pause();
+                    });
+                }
+            });
+        }
+
+        private get _extension(): _IMSFTAudioEmitter {
+            const extensions = this._loader._gltf.extensions;
+            if (!extensions || !extensions[this.name]) {
+                throw new Error(`#/extensions: '${this.name}' not found`);
+            }
+
+            return extensions[this.name] as _IMSFTAudioEmitter;
+        }
+
+        private get _clips(): Array<_ILoaderClip> {
+            return this._extension.clips;
+        }
+
+        private get _emitters(): Array<_ILoaderEmitter> {
+            return this._extension.emitters;
+        }
+    }
+
+    GLTFLoader._Register(NAME, loader => new MSFT_audio_emitter(loader));
+}

loaders/src/glTF/2.0/babylon.glTFLoader.ts

@@ -875,7 +875,12 @@ module BABYLON.GLTF2 {
             return Promise.all(promises).then(() => {});
         }
 
-        private _loadAnimationAsync(context: string, animation: _ILoaderAnimation): Promise<void> {
+        public _loadAnimationAsync(context: string, animation: _ILoaderAnimation): Promise<void> {
+            const promise = GLTFLoaderExtension._LoadAnimationAsync(this, context, animation);
+            if (promise) {
+                return promise;
+            }
+
             const babylonAnimationGroup = new AnimationGroup(animation.name || `animation${animation._index}`, this._babylonScene);
             animation._babylonAnimationGroup = babylonAnimationGroup;
 

loaders/src/glTF/2.0/babylon.glTFLoaderExtension.ts

@@ -92,6 +92,9 @@ module BABYLON.GLTF2 {
          */
         protected _loadUriAsync(context: string, uri: string): Nullable<Promise<ArrayBufferView>> { return null; }
 
+        /** Override this method to modify the default behavior for loading animations. */
+        protected _loadAnimationAsync(context: string, animation: _ILoaderAnimation): Nullable<Promise<void>> { return null; }
+
         // #endregion
 
         /**
@@ -229,6 +232,14 @@ module BABYLON.GLTF2 {
         public static _LoadUriAsync(loader: GLTFLoader, context: string, uri: string): Nullable<Promise<ArrayBufferView>> {
             return loader._applyExtensions(extension => extension._loadUriAsync(context, uri));
         }
+
+        /** 
+         * Helper method called by the loader to allow extensions to override loading animations.
+         * @hidden
+         */
+        public static _LoadAnimationAsync(loader: GLTFLoader, context: string, animation: _ILoaderAnimation): Nullable<Promise<void>> {
+            return loader._applyExtensions(extension => extension._loadAnimationAsync(context, animation));
+        }
     }
 }
 

src/Animations/babylon.animation.ts

@@ -46,7 +46,7 @@
             /** The frame for which the event is triggered **/
             public frame: number,
             /** The event to perform when triggered **/
-            public action: () => void , 
+            public action: (currentFrame: number) => void , 
             /** Specifies if the event should be triggered only once**/
             public onlyOnce?: boolean ) {
         }
@@ -1058,7 +1058,7 @@
         }
 
         /**
-         * Get the Vectpr2 animation type
+         * Get the Vector2 animation type
          */
         public static get ANIMATIONTYPE_VECTOR2(): number {
             return Animation._ANIMATIONTYPE_VECTOR2;

src/Animations/babylon.animationGroup.ts

@@ -28,6 +28,11 @@ module BABYLON {
         public onAnimationGroupEndObservable = new Observable<AnimationGroup>();
 
         /**
+         * This observable will notify when all animations have paused.
+         */
+        public onAnimationGroupPauseObservable = new Observable<AnimationGroup>();
+
+        /**
          * Gets the first frame
          */
         public get from(): number {
@@ -204,6 +209,8 @@ module BABYLON {
                 animatable.pause();
             }
 
+            this.onAnimationGroupPauseObservable.notifyObservers(this);
+
             return this;
         }
 

src/Animations/babylon.runtimeAnimation.ts

@@ -560,7 +560,7 @@
                             index--;
                         }
                         event.isDone = true;
-                        event.action();
+                        event.action(currentFrame);
                     } // Don't do anything if the event has already be done.
                 }
             }

src/Audio/babylon.sound.ts

@@ -12,11 +12,17 @@ module BABYLON {
         public distanceModel: string = "linear";
         private _panningModel: string = "equalpower";
         public onended: () => any;
+        /**
+         * Observable event when the current playing sound finishes.
+         */
+        public onEndedObservable = new Observable<Sound>();
         private _playbackRate: number = 1;
         private _streaming: boolean = false;
         private _startTime: number = 0;
         private _startOffset: number = 0;
         private _position: Vector3 = Vector3.Zero();
+        /** @hidden */ 
+        public _positionInEmitterSpace: boolean = false;
         private _localDirection: Vector3 = new Vector3(1, 0, 0);
         private _volume: number = 1;
         private _isReadyToPlay: boolean = false;
@@ -30,7 +36,7 @@ module BABYLON {
         private _soundPanner: Nullable<PannerNode>;
         private _soundGain: Nullable<GainNode>;
         private _inputAudioNode: AudioNode;
-        private _ouputAudioNode: AudioNode;
+        private _outputAudioNode: AudioNode;
         // Used if you'd like to create a directional sound.
         // If not set, the sound will be omnidirectional
         private _coneInnerAngle: number = 360;
@@ -85,7 +91,7 @@ module BABYLON {
                 this._soundGain = Engine.audioEngine.audioContext.createGain();
                 this._soundGain.gain.value = this._volume;
                 this._inputAudioNode = this._soundGain;
-                this._ouputAudioNode = this._soundGain;
+                this._outputAudioNode = this._soundGain;
                 if (this.spatialSound) {
                     this._createSpatialParameters();
                 }
@@ -324,7 +330,7 @@ module BABYLON {
                 }
                 this._soundPanner = Engine.audioEngine.audioContext.createPanner();
                 this._updateSpatialParameters();
-                this._soundPanner.connect(this._ouputAudioNode);
+                this._soundPanner.connect(this._outputAudioNode);
                 this._inputAudioNode = this._soundPanner;
             }
         }
@@ -368,9 +374,9 @@ module BABYLON {
         public connectToSoundTrackAudioNode(soundTrackAudioNode: AudioNode) {
             if (Engine.audioEngine.canUseWebAudio) {
                 if (this._isOutputConnected) {
-                    this._ouputAudioNode.disconnect();
+                    this._outputAudioNode.disconnect();
                 }
-                this._ouputAudioNode.connect(soundTrackAudioNode);
+                this._outputAudioNode.connect(soundTrackAudioNode);
                 this._isOutputConnected = true;
             }
         }
@@ -397,10 +403,58 @@ module BABYLON {
             }
         }
 
+        /**
+         * Gets or sets the inner angle for the directional cone.
+         */
+        public get directionalConeInnerAngle(): number {
+            return this._coneInnerAngle;
+        }
+
+        /**
+         * Gets or sets the inner angle for the directional cone.
+         */
+        public set directionalConeInnerAngle(value: number) {
+            if (value != this._coneInnerAngle) {
+                if (this._coneOuterAngle < value) {
+                    Tools.Error("directionalConeInnerAngle: outer angle of the cone must be superior or equal to the inner angle.");
+                    return;
+                }
+
+                this._coneInnerAngle = value;
+                if (Engine.audioEngine.canUseWebAudio && this.spatialSound && this._soundPanner) {
+                    this._soundPanner.coneInnerAngle = this._coneInnerAngle;
+                }
+            }
+        }
+
+        /**
+         * Gets or sets the outer angle for the directional cone.
+         */
+        public get directionalConeOuterAngle(): number {
+            return this._coneOuterAngle;
+        }
+
+        /**
+         * Gets or sets the outer angle for the directional cone.
+         */
+        public set directionalConeOuterAngle(value: number) {
+            if (value != this._coneOuterAngle) {
+                if (value < this._coneInnerAngle) {
+                    Tools.Error("directionalConeOuterAngle: outer angle of the cone must be superior or equal to the inner angle.");
+                    return;
+                }
+
+                this._coneOuterAngle = value;
+                if (Engine.audioEngine.canUseWebAudio && this.spatialSound && this._soundPanner) {
+                    this._soundPanner.coneOuterAngle = this._coneOuterAngle;
+                }
+            }
+        }
+
         public setPosition(newPosition: Vector3) {
             this._position = newPosition;
 
-            if (Engine.audioEngine.canUseWebAudio && this.spatialSound && this._soundPanner) {
+            if (Engine.audioEngine.canUseWebAudio && this.spatialSound && this._soundPanner && !isNaN(this._position.x) && !isNaN(this._position.y) && !isNaN(this._position.z)) {
                 this._soundPanner.setPosition(this._position.x, this._position.y, this._position.z);
             }
         }
@@ -450,7 +504,9 @@ module BABYLON {
                     var startTime = time ? Engine.audioEngine.audioContext.currentTime + time : Engine.audioEngine.audioContext.currentTime;
                     if (!this._soundSource || !this._streamingSource) {
                         if (this.spatialSound && this._soundPanner) {
-                            this._soundPanner.setPosition(this._position.x, this._position.y, this._position.z);
+                            if (!isNaN(this._position.x) && !isNaN(this._position.y) && !isNaN(this._position.z)) {
+                                this._soundPanner.setPosition(this._position.x, this._position.y, this._position.z);
+                            }
                             if (this._isDirectional) {
                                 this._soundPanner.coneInnerAngle = this._coneInnerAngle;
                                 this._soundPanner.coneOuterAngle = this._coneOuterAngle;
@@ -502,6 +558,7 @@ module BABYLON {
             if (this.onended) {
                 this.onended();
             }
+            this.onEndedObservable.notifyObservers(this);
         }
 
         /**
@@ -575,10 +632,10 @@ module BABYLON {
                 }
             }
         }
-
-        public getVolume(): number {
-            return this._volume;
-        }
+         
+        public getVolume(): number { 
+            return this._volume; 
+        } 
 
         public attachToMesh(meshToConnectTo: AbstractMesh) {
             if (this._connectedMesh && this._registerFunc) {
@@ -612,8 +669,15 @@ module BABYLON {
                 return;
             }
             let mesh = node as AbstractMesh;
-            let boundingInfo = mesh.getBoundingInfo();
-            this.setPosition(boundingInfo.boundingSphere.centerWorld);
+            if (this._positionInEmitterSpace) {
+                mesh.worldMatrixFromCache.invertToRef(Tmp.Matrix[0]);
+                this.setPosition(Tmp.Matrix[0].getTranslation());
+            }
+            else 
+            {
+                let boundingInfo = mesh.getBoundingInfo();
+                this.setPosition(boundingInfo.boundingSphere.centerWorld);
+            }
             if (Engine.audioEngine.canUseWebAudio && this._isDirectional && this.isPlaying) {
                 this._updateDirection();
             }

src/Audio/babylon.weightedsound.ts

@@ -0,0 +1,174 @@
+module BABYLON {
+    /**
+     * Wraps one or more Sound objects and selects one with random weight for playback.
+     */
+    export class WeightedSound {
+        /** When true a Sound will be selected and played when the current playing Sound completes. */
+        public loop: boolean = false;
+        private _coneInnerAngle: number = 360;
+        private _coneOuterAngle: number = 360;
+        private _volume: number = 1;
+        /** A Sound is currently playing. */
+        public isPlaying: boolean = false;
+        /** A Sound is currently paused. */
+        public isPaused: boolean = false;
+
+        private _sounds: Sound[] = [];
+        private _weights: number[] = [];
+        private _currentIndex?: number;
+
+        /**
+         * Creates a new WeightedSound from the list of sounds given.
+         * @param loop When true a Sound will be selected and played when the current playing Sound completes.
+         * @param sounds Array of Sounds that will be selected from.
+         * @param weights Array of number values for selection weights; length must equal sounds, values will be normalized to 1
+         */
+        constructor(loop: boolean, sounds: Sound[], weights: number[]) {
+            if (sounds.length !== weights.length) {
+                throw new Error('Sounds length does not equal weights length');
+            }
+
+            this.loop = loop;
+            this._weights = weights;
+            // Normalize the weights
+            let weightSum = 0;
+            for (const weight of weights) {
+                weightSum += weight;
+            }
+            const invWeightSum = weightSum > 0 ? 1 / weightSum : 0;
+            for (let i = 0; i < this._weights.length; i++) {
+                this._weights[i] *= invWeightSum;
+            }
+            this._sounds = sounds;
+            for (let sound of this._sounds) {
+                sound.onEndedObservable.add(() => { this._onended() });
+            }
+        }
+
+        /**
+         * The size of cone in degrees for a directional sound in which there will be no attenuation.
+         */
+        public get directionalConeInnerAngle(): number {
+            return this._coneInnerAngle;
+        }
+
+        /**
+         * The size of cone in degress for a directional sound in which there will be no attenuation.
+         */
+        public set directionalConeInnerAngle(value: number) {
+            if (value !== this._coneInnerAngle) {
+                if (this._coneOuterAngle < value) {
+                    Tools.Error("directionalConeInnerAngle: outer angle of the cone must be superior or equal to the inner angle.");
+                    return;
+                }
+
+                this._coneInnerAngle = value;
+                for (let sound of this._sounds) {
+                    sound.directionalConeInnerAngle = value;
+                }
+            }
+        }
+
+        /**
+         * Size of cone in degrees for a directional sound outside of which there will be no sound.
+         * Listener angles between innerAngle and outerAngle will falloff linearly.
+         */
+        public get directionalConeOuterAngle(): number {
+            return this._coneOuterAngle;
+        }
+
+        /**
+         * Size of cone in degrees for a directional sound outside of which there will be no sound.
+         * Listener angles between innerAngle and outerAngle will falloff linearly.
+         */
+        public set directionalConeOuterAngle(value: number) {
+            if (value !== this._coneOuterAngle) {
+                if (value < this._coneInnerAngle) {
+                    Tools.Error("directionalConeOuterAngle: outer angle of the cone must be superior or equal to the inner angle.");
+                    return;
+                }
+
+                this._coneOuterAngle = value;
+                for (let sound of this._sounds) {
+                    sound.directionalConeOuterAngle = value;
+                }
+            }
+        }
+
+        /**
+         * Playback volume.
+         */
+        public get volume(): number {
+            return this._volume;
+        }
+
+        /**
+         * Playback volume.
+         */
+        public set volume(value: number) {
+            if (value !== this._volume) {
+                for (let sound of this._sounds) {
+                    sound.setVolume(value);
+                }
+            }
+        }
+
+        private _onended() {
+            if (this._currentIndex !== undefined) {
+                this._sounds[this._currentIndex].autoplay = false;
+            }
+            if (this.loop && this.isPlaying) {
+                this.play();
+            } else {
+                this.isPlaying = false;
+            }
+        }
+
+        /**
+         * Suspend playback
+         */
+        public pause() {
+            this.isPaused = true;
+            if (this._currentIndex !== undefined) {
+                this._sounds[this._currentIndex].pause();
+            }
+        }
+
+        /**
+         * Stop playback
+         */
+        public stop() {
+            this.isPlaying = false;
+            if (this._currentIndex !== undefined) {
+                this._sounds[this._currentIndex].stop();
+            }
+        }
+
+        /**
+         * Start playback.
+         * @param startOffset Position the clip head at a specific time in seconds.
+         */
+        public play(startOffset?: number) {
+            if (!this.isPaused) {
+                this.stop();
+                let randomValue = Math.random();
+                let total = 0;
+                for (let i = 0; i < this._weights.length; i++) {
+                    total += this._weights[i];
+                    if (randomValue <= total) {
+                        this._currentIndex = i;
+                        break;
+                    }
+                }
+            }
+            const sound = this._sounds[this._currentIndex!];
+            if (sound.isReady()) {
+                sound.play(0, this.isPaused ? undefined : startOffset);
+            } else {
+                sound.autoplay = true;
+            }
+            this.isPlaying = true;
+            this.isPaused = false;
+        }
+    }
+}

src/Mesh/babylon.transformNode.ts

@@ -82,7 +82,7 @@ module BABYLON {
         }
 
         /**
-         * Gets a string idenfifying the name of the class
+         * Gets a string identifying the name of the class
          * @returns "TransformNode" string
          */
         public getClassName(): string {
@@ -190,7 +190,7 @@ module BABYLON {
         }
 
         /**
-         * Copies the paramater passed Matrix into the mesh Pose matrix.  
+         * Copies the parameter passed Matrix into the mesh Pose matrix.  
          * Returns the TransformNode.  
          */
         public updatePoseMatrix(matrix: Matrix): TransformNode {
@@ -261,7 +261,7 @@ module BABYLON {
 
         /**
          * Returns the current mesh absolute position.
-         * Retuns a Vector3.
+         * Returns a Vector3.
          */
         public get absolutePosition(): Vector3 {
             return this._absolutePosition;

tests/unit/babylon/src/Loading/babylon.sceneLoader.tests.ts

@@ -16,6 +16,7 @@ describe('Babylon Scene Loader', function () {
             .load(function () {
                 // Force apply promise polyfill for consistent behavior between PhantomJS, IE11, and other browsers.
                 BABYLON.PromisePolyfill.Apply(true);
+                BABYLON.Engine.audioEngine = new BABYLON.AudioEngine();
                 done();
             });
     });
@@ -349,8 +350,9 @@ describe('Babylon Scene Loader', function () {
             const promises = new Array<Promise<void>>();
 
             BABYLON.SceneLoader.OnPluginActivatedObservable.addOnce((loader: BABYLON.GLTFFileLoader) => {
-                loader.onExtensionLoadedObservable.addOnce(extension => {
+                const observer = loader.onExtensionLoadedObservable.add(extension => {
                     if (extension instanceof BABYLON.GLTF2.Extensions.MSFT_lod) {
+                        loader.onExtensionLoadedObservable.remove(observer);
                         extension.onMaterialLODsLoadedObservable.add(indexLOD => {
                             const expectedMaterialName = `LOD${2 - indexLOD}`;
                             expect(scene.getMeshByName("node0").material.name, "Material for node 0").to.equal(expectedMaterialName);
@@ -374,8 +376,9 @@ describe('Babylon Scene Loader', function () {
             const promises = new Array<Promise<void>>();
 
             BABYLON.SceneLoader.OnPluginActivatedObservable.addOnce((loader: BABYLON.GLTFFileLoader) => {
-                loader.onExtensionLoadedObservable.addOnce(extension => {
+                const observer = loader.onExtensionLoadedObservable.add(extension => {
                     if (extension instanceof BABYLON.GLTF2.Extensions.MSFT_lod) {
+                        loader.onExtensionLoadedObservable.remove(observer);
                         extension.onMaterialLODsLoadedObservable.add(indexLOD => {
                             expect(indexLOD, "indexLOD").to.equal(0);
                             loader.dispose();
@@ -507,6 +510,18 @@ describe('Babylon Scene Loader', function () {
             });
         });
 
+        it('Load UFO with MSFT_audio_emitter', () => {
+            const scene = new BABYLON.Scene(subject);
+            return BABYLON.SceneLoader.ImportMeshAsync(null, "/Playground/scenes/", "ufo.glb", scene).then(result => {
+                expect(result.meshes.length, "meshes.length").to.equal(scene.meshes.length);
+                expect(result.particleSystems.length, "particleSystems.length").to.equal(0);
+                expect(result.animationGroups.length, "animationGroups.length").to.equal(3);
+                expect(scene.soundTracks.length, "scene.soundTracks.length").to.equal(1);
+                expect(scene.soundTracks[0].soundCollection.length, "scene.soundTracks[0].soundCollection.length").to.equal(3);
+                expect(scene.soundTracks[0].soundCollection[0].onEndedObservable.hasObservers(), "scene.soundTracks[0].soundCollection[0].onEndedObservable.hasObservers()").to.be.true;
+            });
+        });
+
         // TODO: test animation group callback
         // TODO: test material instancing
         // TODO: test KHR_materials_pbrSpecularGlossiness