merge

Playground/indexStable.html

@@ -40,7 +40,7 @@
         <!-- Monaco -->
         <script src="node_modules/monaco-editor/min/vs/loader.js"></script>
         <!-- Babylon.js -->
-        <script src="https://cdn.babylonjs.com/babylon.js"></script>
+        <script src="https://cdn.babylonjs.com/babylon.max.js"></script>
         <script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
 
         <script src="https://cdn.babylonjs.com/loaders/babylon.glTFFileLoader.js"></script>
@@ -471,4 +471,4 @@
         </script>        
     </body>
 
-</html>
+</html>

dist/preview release/babylon.max.js

@@ -17680,8 +17680,6 @@ var BABYLON;
             this._parentRenderId = -1;
             this._childRenderId = -1;
             /** @hidden */
-            this._worldMatrixWasUpdated = false;
-            /** @hidden */
             this._worldMatrix = BABYLON.Matrix.Zero();
             /** @hidden */
             this._worldMatrixDeterminant = 0;
@@ -17954,23 +17952,17 @@ var BABYLON;
             return this._parentNode.isSynchronized();
         };
         /** @hidden */
-        Node.prototype.isSynchronized = function (useWasUpdatedFlag) {
-            var check = this.hasNewParent();
-            if (!useWasUpdatedFlag) {
-                check = check || !this.isSynchronizedWithParent();
+        Node.prototype.isSynchronized = function () {
+            if (this._cache.parent != this._parentNode) {
+                this._cache.parent = this._parentNode;
+                return false;
             }
-            else if (this._parentNode) {
-                check = this._parentNode._worldMatrixWasUpdated;
+            if (this._parentNode) {
+                if (!this.isSynchronizedWithParent()) {
+                    return false;
+                }
             }
-            check = check || !this._isSynchronized();
-            return !check;
-        };
-        /** @hidden */
-        Node.prototype.hasNewParent = function () {
-            if (this._cache.parent === this._parentNode)
-                return false;
-            this._cache.parent = this._parentNode;
-            return true;
+            return this._isSynchronized();
         };
         /**
          * Is this node ready to be used/rendered
@@ -18190,10 +18182,9 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        Node.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        Node.prototype.computeWorldMatrix = function (force) {
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }
@@ -19378,14 +19369,13 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        TransformNode.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        TransformNode.prototype.computeWorldMatrix = function (force) {
             if (this._isWorldMatrixFrozen) {
                 return this._worldMatrix;
             }
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
@@ -19397,7 +19387,6 @@ var BABYLON;
             this._currentRenderId = this.getScene().getRenderId();
             this._childRenderId = this.getScene().getRenderId();
             this._isDirty = false;
-            this._worldMatrixWasUpdated = true;
             // Scaling
             BABYLON.Matrix.ScalingToRef(this.scaling.x * this.scalingDeterminant, this.scaling.y * this.scalingDeterminant, this.scaling.z * this.scalingDeterminant, BABYLON.Tmp.Matrix[1]);
             // Rotation
@@ -27521,26 +27510,6 @@ var BABYLON;
             this._activeMeshesFrozen = false;
             return this;
         };
-        Scene.prototype._computeAllWorldMatricesforBranch = function (node) {
-            node.computeWorldMatrix(false, true);
-            var children = node.getChildren();
-            if (children) {
-                for (var _i = 0, children_2 = children; _i < children_2.length; _i++) {
-                    var child = children_2[_i];
-                    this._computeAllWorldMatricesforBranch(child);
-                }
-            }
-            node._worldMatrixWasUpdated = false;
-        };
-        /**
-         * This function will traverse the scene graph and makes sure that all worldMatrix are up to date
-         */
-        Scene.prototype.computeAllWorldMatrices = function () {
-            for (var _i = 0, _a = this.rootNodes; _i < _a.length; _i++) {
-                var node = _a[_i];
-                this._computeAllWorldMatricesforBranch(node);
-            }
-        };
         Scene.prototype._evaluateActiveMeshes = function () {
             if (this._activeMeshesFrozen && this._activeMeshes.length) {
                 return;
@@ -27560,8 +27529,6 @@ var BABYLON;
                 var step = _a[_i];
                 step.action();
             }
-            // World matrices
-            this.computeAllWorldMatrices();
             // Determine mesh candidates
             var meshes = this.getActiveMeshCandidates();
             // Check each mesh
@@ -27575,6 +27542,7 @@ var BABYLON;
                 if (!mesh.isReady() || !mesh.isEnabled()) {
                     continue;
                 }
+                mesh.computeWorldMatrix();
                 // Intersections
                 if (mesh.actionManager && mesh.actionManager.hasSpecificTriggers2(BABYLON.ActionManager.OnIntersectionEnterTrigger, BABYLON.ActionManager.OnIntersectionExitTrigger)) {
                     this._meshesForIntersections.pushNoDuplicate(mesh);
@@ -48950,17 +48918,15 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        ShadowLight.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+        ShadowLight.prototype.computeWorldMatrix = function (force) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
             this._updateCache();
             this._cache.position.copyFrom(this.position);
-            this._worldMatrixWasUpdated = true;
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }

dist/preview release/babylon.no-module.max.js

@@ -17647,8 +17647,6 @@ var BABYLON;
             this._parentRenderId = -1;
             this._childRenderId = -1;
             /** @hidden */
-            this._worldMatrixWasUpdated = false;
-            /** @hidden */
             this._worldMatrix = BABYLON.Matrix.Zero();
             /** @hidden */
             this._worldMatrixDeterminant = 0;
@@ -17921,23 +17919,17 @@ var BABYLON;
             return this._parentNode.isSynchronized();
         };
         /** @hidden */
-        Node.prototype.isSynchronized = function (useWasUpdatedFlag) {
-            var check = this.hasNewParent();
-            if (!useWasUpdatedFlag) {
-                check = check || !this.isSynchronizedWithParent();
+        Node.prototype.isSynchronized = function () {
+            if (this._cache.parent != this._parentNode) {
+                this._cache.parent = this._parentNode;
+                return false;
             }
-            else if (this._parentNode) {
-                check = this._parentNode._worldMatrixWasUpdated;
+            if (this._parentNode) {
+                if (!this.isSynchronizedWithParent()) {
+                    return false;
+                }
             }
-            check = check || !this._isSynchronized();
-            return !check;
-        };
-        /** @hidden */
-        Node.prototype.hasNewParent = function () {
-            if (this._cache.parent === this._parentNode)
-                return false;
-            this._cache.parent = this._parentNode;
-            return true;
+            return this._isSynchronized();
         };
         /**
          * Is this node ready to be used/rendered
@@ -18157,10 +18149,9 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        Node.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        Node.prototype.computeWorldMatrix = function (force) {
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }
@@ -19345,14 +19336,13 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        TransformNode.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        TransformNode.prototype.computeWorldMatrix = function (force) {
             if (this._isWorldMatrixFrozen) {
                 return this._worldMatrix;
             }
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
@@ -19364,7 +19354,6 @@ var BABYLON;
             this._currentRenderId = this.getScene().getRenderId();
             this._childRenderId = this.getScene().getRenderId();
             this._isDirty = false;
-            this._worldMatrixWasUpdated = true;
             // Scaling
             BABYLON.Matrix.ScalingToRef(this.scaling.x * this.scalingDeterminant, this.scaling.y * this.scalingDeterminant, this.scaling.z * this.scalingDeterminant, BABYLON.Tmp.Matrix[1]);
             // Rotation
@@ -27488,26 +27477,6 @@ var BABYLON;
             this._activeMeshesFrozen = false;
             return this;
         };
-        Scene.prototype._computeAllWorldMatricesforBranch = function (node) {
-            node.computeWorldMatrix(false, true);
-            var children = node.getChildren();
-            if (children) {
-                for (var _i = 0, children_2 = children; _i < children_2.length; _i++) {
-                    var child = children_2[_i];
-                    this._computeAllWorldMatricesforBranch(child);
-                }
-            }
-            node._worldMatrixWasUpdated = false;
-        };
-        /**
-         * This function will traverse the scene graph and makes sure that all worldMatrix are up to date
-         */
-        Scene.prototype.computeAllWorldMatrices = function () {
-            for (var _i = 0, _a = this.rootNodes; _i < _a.length; _i++) {
-                var node = _a[_i];
-                this._computeAllWorldMatricesforBranch(node);
-            }
-        };
         Scene.prototype._evaluateActiveMeshes = function () {
             if (this._activeMeshesFrozen && this._activeMeshes.length) {
                 return;
@@ -27527,8 +27496,6 @@ var BABYLON;
                 var step = _a[_i];
                 step.action();
             }
-            // World matrices
-            this.computeAllWorldMatrices();
             // Determine mesh candidates
             var meshes = this.getActiveMeshCandidates();
             // Check each mesh
@@ -27542,6 +27509,7 @@ var BABYLON;
                 if (!mesh.isReady() || !mesh.isEnabled()) {
                     continue;
                 }
+                mesh.computeWorldMatrix();
                 // Intersections
                 if (mesh.actionManager && mesh.actionManager.hasSpecificTriggers2(BABYLON.ActionManager.OnIntersectionEnterTrigger, BABYLON.ActionManager.OnIntersectionExitTrigger)) {
                     this._meshesForIntersections.pushNoDuplicate(mesh);
@@ -48917,17 +48885,15 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        ShadowLight.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+        ShadowLight.prototype.computeWorldMatrix = function (force) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
             this._updateCache();
             this._cache.position.copyFrom(this.position);
-            this._worldMatrixWasUpdated = true;
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }

dist/preview release/es6.js

@@ -17647,8 +17647,6 @@ var BABYLON;
             this._parentRenderId = -1;
             this._childRenderId = -1;
             /** @hidden */
-            this._worldMatrixWasUpdated = false;
-            /** @hidden */
             this._worldMatrix = BABYLON.Matrix.Zero();
             /** @hidden */
             this._worldMatrixDeterminant = 0;
@@ -17921,23 +17919,17 @@ var BABYLON;
             return this._parentNode.isSynchronized();
         };
         /** @hidden */
-        Node.prototype.isSynchronized = function (useWasUpdatedFlag) {
-            var check = this.hasNewParent();
-            if (!useWasUpdatedFlag) {
-                check = check || !this.isSynchronizedWithParent();
+        Node.prototype.isSynchronized = function () {
+            if (this._cache.parent != this._parentNode) {
+                this._cache.parent = this._parentNode;
+                return false;
             }
-            else if (this._parentNode) {
-                check = this._parentNode._worldMatrixWasUpdated;
+            if (this._parentNode) {
+                if (!this.isSynchronizedWithParent()) {
+                    return false;
+                }
             }
-            check = check || !this._isSynchronized();
-            return !check;
-        };
-        /** @hidden */
-        Node.prototype.hasNewParent = function () {
-            if (this._cache.parent === this._parentNode)
-                return false;
-            this._cache.parent = this._parentNode;
-            return true;
+            return this._isSynchronized();
         };
         /**
          * Is this node ready to be used/rendered
@@ -18157,10 +18149,9 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        Node.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        Node.prototype.computeWorldMatrix = function (force) {
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }
@@ -19345,14 +19336,13 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        TransformNode.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
+        TransformNode.prototype.computeWorldMatrix = function (force) {
             if (this._isWorldMatrixFrozen) {
                 return this._worldMatrix;
             }
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
@@ -19364,7 +19354,6 @@ var BABYLON;
             this._currentRenderId = this.getScene().getRenderId();
             this._childRenderId = this.getScene().getRenderId();
             this._isDirty = false;
-            this._worldMatrixWasUpdated = true;
             // Scaling
             BABYLON.Matrix.ScalingToRef(this.scaling.x * this.scalingDeterminant, this.scaling.y * this.scalingDeterminant, this.scaling.z * this.scalingDeterminant, BABYLON.Tmp.Matrix[1]);
             // Rotation
@@ -27488,26 +27477,6 @@ var BABYLON;
             this._activeMeshesFrozen = false;
             return this;
         };
-        Scene.prototype._computeAllWorldMatricesforBranch = function (node) {
-            node.computeWorldMatrix(false, true);
-            var children = node.getChildren();
-            if (children) {
-                for (var _i = 0, children_2 = children; _i < children_2.length; _i++) {
-                    var child = children_2[_i];
-                    this._computeAllWorldMatricesforBranch(child);
-                }
-            }
-            node._worldMatrixWasUpdated = false;
-        };
-        /**
-         * This function will traverse the scene graph and makes sure that all worldMatrix are up to date
-         */
-        Scene.prototype.computeAllWorldMatrices = function () {
-            for (var _i = 0, _a = this.rootNodes; _i < _a.length; _i++) {
-                var node = _a[_i];
-                this._computeAllWorldMatricesforBranch(node);
-            }
-        };
         Scene.prototype._evaluateActiveMeshes = function () {
             if (this._activeMeshesFrozen && this._activeMeshes.length) {
                 return;
@@ -27527,8 +27496,6 @@ var BABYLON;
                 var step = _a[_i];
                 step.action();
             }
-            // World matrices
-            this.computeAllWorldMatrices();
             // Determine mesh candidates
             var meshes = this.getActiveMeshCandidates();
             // Check each mesh
@@ -27542,6 +27509,7 @@ var BABYLON;
                 if (!mesh.isReady() || !mesh.isEnabled()) {
                     continue;
                 }
+                mesh.computeWorldMatrix();
                 // Intersections
                 if (mesh.actionManager && mesh.actionManager.hasSpecificTriggers2(BABYLON.ActionManager.OnIntersectionEnterTrigger, BABYLON.ActionManager.OnIntersectionExitTrigger)) {
                     this._meshesForIntersections.pushNoDuplicate(mesh);
@@ -48917,17 +48885,15 @@ var BABYLON;
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        ShadowLight.prototype.computeWorldMatrix = function (force, useWasUpdatedFlag) {
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+        ShadowLight.prototype.computeWorldMatrix = function (force) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
             this._updateCache();
             this._cache.position.copyFrom(this.position);
-            this._worldMatrixWasUpdated = true;
             if (!this._worldMatrix) {
                 this._worldMatrix = BABYLON.Matrix.Identity();
             }

dist/preview release/gui/babylon.gui.d.ts

@@ -1,6 +1,6 @@
 /*BabylonJS GUI*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 declare module BABYLON.GUI {
 }
 declare module BABYLON.GUI {

dist/preview release/gui/babylon.gui.module.d.ts

@@ -1,6 +1,6 @@
 /*BabylonJS GUI*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 
 declare module 'babylonjs-gui' {
     export * from "babylonjs-gui/2D";
@@ -2812,7 +2812,7 @@ declare module 'babylonjs-gui/3D/materials/fluentMaterial' {
 
 /*BabylonJS GUI*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 declare module BABYLON.GUI {
 }
 declare module BABYLON.GUI {

dist/preview release/inspector/babylon.inspector.d.ts

@@ -1,6 +1,6 @@
 /*BabylonJS Inspector*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 declare module INSPECTOR {
 }
 declare module INSPECTOR {

dist/preview release/inspector/babylon.inspector.module.d.ts

@@ -1,6 +1,6 @@
 /*BabylonJS Inspector*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 
 declare module 'babylonjs-inspector' {
     export * from 'babylonjs-inspector/adapters';
@@ -1340,7 +1340,7 @@ declare module 'babylonjs-inspector/treetools/SoundInteractions' {
 
 /*BabylonJS Inspector*/
 // Dependencies for this module:
-//   ../../../../Tools/Gulp/babylonjs
+//   ../../../../Tools/gulp/babylonjs
 declare module INSPECTOR {
 }
 declare module INSPECTOR {

dist/preview release/viewer/babylon.viewer.d.ts

@@ -4,8 +4,8 @@
 declare module "babylonjs-loaders"{ export=BABYLON;}
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../../../../Tools/Gulp/babylonjs
-//   ../../../../../Tools/Gulp/babylonjs-loaders
+//   ../../../../../Tools/gulp/babylonjs
+//   ../../../../../Tools/gulp/babylonjs-loaders
 declare module BabylonViewer {
     /**
         * BabylonJS Viewer
@@ -515,167 +515,10 @@ declare module BabylonViewer {
     }
 }
 declare module BabylonViewer {
-    /**
-        * The current state of the model
-        */
-    export enum ModelState {
-            INIT = 0,
-            LOADING = 1,
-            LOADED = 2,
-            ENTRY = 3,
-            ENTRYDONE = 4,
-            COMPLETE = 5,
-            CANCELED = 6,
-            ERROR = 7
-    }
-    /**
-        * The viewer model is a container for all assets representing a sngle loaded model.
-        */
-    export class ViewerModel implements BABYLON.IDisposable {
-            /**
-                * The loader used to load this model.
-                */
-            loader: BABYLON.ISceneLoaderPlugin | BABYLON.ISceneLoaderPluginAsync;
-            /**
-                * This model's root mesh (the parent of all other meshes).
-                * This mesh does not(!) exist in the meshes array.
-                */
-            rootMesh: BABYLON.AbstractMesh;
-            /**
-                * ParticleSystems connected to this model
-                */
-            particleSystems: Array<BABYLON.IParticleSystem>;
-            /**
-                * Skeletons defined in this model
-                */
-            skeletons: Array<BABYLON.Skeleton>;
-            /**
-                * The current model animation.
-                * On init, this will be undefined.
-                */
-            currentAnimation: IModelAnimation;
-            /**
-                * Observers registered here will be executed when the model is done loading
-                */
-            onLoadedObservable: BABYLON.Observable<ViewerModel>;
-            /**
-                * Observers registered here will be executed when the loader notified of a progress event
-                */
-            onLoadProgressObservable: BABYLON.Observable<BABYLON.SceneLoaderProgressEvent>;
-            /**
-                * Observers registered here will be executed when the loader notified of an error.
-                */
-            onLoadErrorObservable: BABYLON.Observable<{
-                    message: string;
-                    exception: any;
-            }>;
-            /**
-                * Will be executed after the model finished loading and complete, including entry animation and lod
-                */
-            onCompleteObservable: BABYLON.Observable<ViewerModel>;
-            /**
-                * Observers registered here will be executed every time the model is being configured.
-                * This can be used to extend the model's configuration without extending the class itself
-                */
-            onAfterConfigure: BABYLON.Observable<ViewerModel>;
-            /**
-                * The current model state (loaded, error, etc)
-                */
-            state: ModelState;
-            /**
-                * A loadID provided by the modelLoader, unique to ths (Abstract)Viewer instance.
-                */
-            loadId: number;
-            loadInfo: BABYLON.GLTF2.IAsset;
-            constructor(_observablesManager: ObservablesManager, modelConfiguration: IModelConfiguration, _configurationContainer?: ConfigurationContainer | undefined);
-            shadowsRenderedAfterLoad: boolean;
-            getViewerId(): string | undefined;
-            /**
-             * Set whether this model is enabled or not.
-             */
-            enabled: boolean;
-            loaderDone: boolean;
-            /**
-                * Add a mesh to this model.
-                * Any mesh that has no parent will be provided with the root mesh as its new parent.
-                *
-                * @param mesh the new mesh to add
-                * @param triggerLoaded should this mesh trigger the onLoaded observable. Used when adding meshes manually.
-                */
-            addMesh(mesh: BABYLON.AbstractMesh, triggerLoaded?: boolean): Promise<ViewerModel> | undefined;
-            /**
-                * get the list of meshes (excluding the root mesh)
-                */
-            readonly meshes: BABYLON.AbstractMesh[];
-            /**
-             * (Re-)set the model's entire configuration
-             * @param newConfiguration the new configuration to replace the new one
-             */
-            configuration: IModelConfiguration;
-            /**
-                * Update the current configuration with new values.
-                * Configuration will not be overwritten, but merged with the new configuration.
-                * Priority is to the new configuration
-                * @param newConfiguration the configuration to be merged into the current configuration;
-                */
-            updateConfiguration(newConfiguration: Partial<IModelConfiguration>): void;
-            /**
-                * Add a new animation group to this model.
-                * @param animationGroup the new animation group to be added
-                */
-            addAnimationGroup(animationGroup: BABYLON.AnimationGroup): void;
-            /**
-                * Get the ModelAnimation array
-                */
-            getAnimations(): Array<IModelAnimation>;
-            /**
-                * Get the animations' names. Using the names you can play a specific animation.
-                */
-            getAnimationNames(): Array<string>;
-            /**
-                * Get an animation by the provided name. Used mainly when playing n animation.
-                * @param name the name of the animation to find
-                */
-            protected _getAnimationByName(name: string): BABYLON.Nullable<IModelAnimation>;
-            /**
-                * Choose an initialized animation using its name and start playing it
-                * @param name the name of the animation to play
-                * @returns The model aniamtion to be played.
-                */
-            playAnimation(name: string): IModelAnimation;
-            setCurrentAnimationByName(name: string): IModelAnimation;
-            /**
-                * Apply a material configuration to a material
-                * @param material BABYLON.Material to apply configuration to
-                * @hidden
-                */
-            _applyModelMaterialConfiguration(material: BABYLON.Material): void;
-            /**
-             * Begin @animations with the specified @easingFunction
-             * @param animations The BABYLON Animations to begin
-             * @param duration of transition, in seconds
-             * @param easingFunction An easing function to apply
-             * @param easingMode A easing mode to apply to the easingFunction
-             * @param onAnimationEnd Call back trigger at the end of the animation.
-             */
-            transitionTo(animations: BABYLON.Animation[], duration: number, easingFunction: any, easingMode: number | undefined, onAnimationEnd: () => void): void;
-            /**
-                * Stops and removes all animations that have been applied to the model
-                */
-            stopAllAnimations(): void;
-            /**
-                * Will remove this model from the viewer (but NOT dispose it).
-                */
-            remove(): void;
-            /**
-                * Dispose this model, including all of its associated assets.
-                */
-            dispose(): void;
-    }
 }
 declare module BabylonViewer {
     /**
-        * BABYLON.Animation play mode enum - is the animation looping or playing once
+        * Animation play mode enum - is the animation looping or playing once
         */
     export const enum AnimationPlayMode {
             ONCE = 0,
@@ -757,7 +600,7 @@ declare module BabylonViewer {
                 */
             readonly currentFrame: number;
             /**
-                * BABYLON.Animation's FPS value
+                * Animation's FPS value
                 */
             readonly fps: number;
             /**

dist/preview release/viewer/babylon.viewer.module.d.ts

@@ -5,8 +5,8 @@ declare module "babylonjs-loaders"{ export=BABYLON;}
 
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
-//   ../../../../../Tools/Gulp/babylonjs
-//   ../../../../../Tools/Gulp/babylonjs-loaders
+//   ../../../../../Tools/gulp/babylonjs
+//   ../../../../../Tools/gulp/babylonjs-loaders
 
 declare module 'babylonjs-viewer' {
     import { mapperManager } from 'babylonjs-viewer/configuration/mappers';
@@ -566,169 +566,7 @@ declare module 'babylonjs-viewer/loader/modelLoader' {
 }
 
 declare module 'babylonjs-viewer/model/viewerModel' {
-    import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, AnimationGroup, AbstractMesh, Observable, SceneLoaderProgressEvent, IParticleSystem, Skeleton, IDisposable, Nullable, Animation, Material } from "babylonjs";
-    import { GLTF2 } from "babylonjs-loaders";
-    import { IModelConfiguration } from "babylonjs-viewer/configuration/interfaces/modelConfiguration";
-    import { IModelAnimation } from "babylonjs-viewer/model/modelAnimation";
-    import { ObservablesManager } from "babylonjs-viewer/managers/observablesManager";
-    import { ConfigurationContainer } from "babylonjs-viewer/configuration/configurationContainer";
-    /**
-        * The current state of the model
-        */
-    export enum ModelState {
-            INIT = 0,
-            LOADING = 1,
-            LOADED = 2,
-            ENTRY = 3,
-            ENTRYDONE = 4,
-            COMPLETE = 5,
-            CANCELED = 6,
-            ERROR = 7
-    }
-    /**
-        * The viewer model is a container for all assets representing a sngle loaded model.
-        */
-    export class ViewerModel implements IDisposable {
-            /**
-                * The loader used to load this model.
-                */
-            loader: ISceneLoaderPlugin | ISceneLoaderPluginAsync;
-            /**
-                * This model's root mesh (the parent of all other meshes).
-                * This mesh does not(!) exist in the meshes array.
-                */
-            rootMesh: AbstractMesh;
-            /**
-                * ParticleSystems connected to this model
-                */
-            particleSystems: Array<IParticleSystem>;
-            /**
-                * Skeletons defined in this model
-                */
-            skeletons: Array<Skeleton>;
-            /**
-                * The current model animation.
-                * On init, this will be undefined.
-                */
-            currentAnimation: IModelAnimation;
-            /**
-                * Observers registered here will be executed when the model is done loading
-                */
-            onLoadedObservable: Observable<ViewerModel>;
-            /**
-                * Observers registered here will be executed when the loader notified of a progress event
-                */
-            onLoadProgressObservable: Observable<SceneLoaderProgressEvent>;
-            /**
-                * Observers registered here will be executed when the loader notified of an error.
-                */
-            onLoadErrorObservable: Observable<{
-                    message: string;
-                    exception: any;
-            }>;
-            /**
-                * Will be executed after the model finished loading and complete, including entry animation and lod
-                */
-            onCompleteObservable: Observable<ViewerModel>;
-            /**
-                * Observers registered here will be executed every time the model is being configured.
-                * This can be used to extend the model's configuration without extending the class itself
-                */
-            onAfterConfigure: Observable<ViewerModel>;
-            /**
-                * The current model state (loaded, error, etc)
-                */
-            state: ModelState;
-            /**
-                * A loadID provided by the modelLoader, unique to ths (Abstract)Viewer instance.
-                */
-            loadId: number;
-            loadInfo: GLTF2.IAsset;
-            constructor(_observablesManager: ObservablesManager, modelConfiguration: IModelConfiguration, _configurationContainer?: ConfigurationContainer | undefined);
-            shadowsRenderedAfterLoad: boolean;
-            getViewerId(): string | undefined;
-            /**
-             * Set whether this model is enabled or not.
-             */
-            enabled: boolean;
-            loaderDone: boolean;
-            /**
-                * Add a mesh to this model.
-                * Any mesh that has no parent will be provided with the root mesh as its new parent.
-                *
-                * @param mesh the new mesh to add
-                * @param triggerLoaded should this mesh trigger the onLoaded observable. Used when adding meshes manually.
-                */
-            addMesh(mesh: AbstractMesh, triggerLoaded?: boolean): Promise<ViewerModel> | undefined;
-            /**
-                * get the list of meshes (excluding the root mesh)
-                */
-            readonly meshes: AbstractMesh[];
-            /**
-             * (Re-)set the model's entire configuration
-             * @param newConfiguration the new configuration to replace the new one
-             */
-            configuration: IModelConfiguration;
-            /**
-                * Update the current configuration with new values.
-                * Configuration will not be overwritten, but merged with the new configuration.
-                * Priority is to the new configuration
-                * @param newConfiguration the configuration to be merged into the current configuration;
-                */
-            updateConfiguration(newConfiguration: Partial<IModelConfiguration>): void;
-            /**
-                * Add a new animation group to this model.
-                * @param animationGroup the new animation group to be added
-                */
-            addAnimationGroup(animationGroup: AnimationGroup): void;
-            /**
-                * Get the ModelAnimation array
-                */
-            getAnimations(): Array<IModelAnimation>;
-            /**
-                * Get the animations' names. Using the names you can play a specific animation.
-                */
-            getAnimationNames(): Array<string>;
-            /**
-                * Get an animation by the provided name. Used mainly when playing n animation.
-                * @param name the name of the animation to find
-                */
-            protected _getAnimationByName(name: string): Nullable<IModelAnimation>;
-            /**
-                * Choose an initialized animation using its name and start playing it
-                * @param name the name of the animation to play
-                * @returns The model aniamtion to be played.
-                */
-            playAnimation(name: string): IModelAnimation;
-            setCurrentAnimationByName(name: string): IModelAnimation;
-            /**
-                * Apply a material configuration to a material
-                * @param material Material to apply configuration to
-                * @hidden
-                */
-            _applyModelMaterialConfiguration(material: Material): void;
-            /**
-             * Begin @animations with the specified @easingFunction
-             * @param animations The BABYLON Animations to begin
-             * @param duration of transition, in seconds
-             * @param easingFunction An easing function to apply
-             * @param easingMode A easing mode to apply to the easingFunction
-             * @param onAnimationEnd Call back trigger at the end of the animation.
-             */
-            transitionTo(animations: Animation[], duration: number, easingFunction: any, easingMode: number | undefined, onAnimationEnd: () => void): void;
-            /**
-                * Stops and removes all animations that have been applied to the model
-                */
-            stopAllAnimations(): void;
-            /**
-                * Will remove this model from the viewer (but NOT dispose it).
-                */
-            remove(): void;
-            /**
-                * Dispose this model, including all of its associated assets.
-                */
-            dispose(): void;
-    }
+    
 }
 
 declare module 'babylonjs-viewer/model/modelAnimation' {

src/Lights/babylon.shadowLight.ts

@@ -318,18 +318,16 @@
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        public computeWorldMatrix(force?: boolean, useWasUpdatedFlag?: boolean): Matrix {
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+        public computeWorldMatrix(force?: boolean): Matrix {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
 
             this._updateCache();
             this._cache.position.copyFrom(this.position);
-            this._worldMatrixWasUpdated = true;
 
             if (!this._worldMatrix) {
                 this._worldMatrix = Matrix.Identity();

src/Mesh/babylon.transformNode.ts

@@ -735,15 +735,14 @@ module BABYLON {
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        public computeWorldMatrix(force?: boolean, useWasUpdatedFlag?: boolean): Matrix {
+        public computeWorldMatrix(force?: boolean): Matrix {
             if (this._isWorldMatrixFrozen) {
                 return this._worldMatrix;
             }
 
-            if (!force && this.isSynchronized(useWasUpdatedFlag)) {
+            if (!force && this.isSynchronized()) {
                 this._currentRenderId = this.getScene().getRenderId();
                 return this._worldMatrix;
             }
@@ -756,7 +755,6 @@ module BABYLON {
             this._currentRenderId = this.getScene().getRenderId();
             this._childRenderId = this.getScene().getRenderId();
             this._isDirty = false;
-            this._worldMatrixWasUpdated = true;
 
             // Scaling
             Matrix.ScalingToRef(this.scaling.x * this.scalingDeterminant, this.scaling.y * this.scalingDeterminant, this.scaling.z * this.scalingDeterminant, Tmp.Matrix[1]);

src/babylon.node.ts

@@ -105,9 +105,6 @@
         private _children: Node[];
 
         /** @hidden */
-        public _worldMatrixWasUpdated = false;
-
-        /** @hidden */
         public _worldMatrix = Matrix.Zero();
         /** @hidden */
         public _worldMatrixDeterminant = 0;        
@@ -318,7 +315,7 @@
          * @returns a Matrix
          */
         public getWorldMatrix(): Matrix {
-            if (this._currentRenderId !== this.getScene().getRenderId()) {
+            if (this._currentRenderId !== this._scene.getRenderId()) {
                 this.computeWorldMatrix();
             }
             return this._worldMatrix;
@@ -389,28 +386,17 @@
         }
 
         /** @hidden */
-        public isSynchronized(useWasUpdatedFlag?: boolean): boolean {
-            var check = this.hasNewParent();
-
-            if (!useWasUpdatedFlag) {
-                check = check || !this.isSynchronizedWithParent();
-            } else if (this._parentNode) {
-                check = this._parentNode._worldMatrixWasUpdated; 
+        public isSynchronized(): boolean {
+            if (this._cache.parent != this._parentNode) {
+                this._cache.parent = this._parentNode;
+                return false;
             }
 
-            check = check || !this._isSynchronized();
-
-            return !check;
-        }
-
-        /** @hidden */
-        public hasNewParent(): boolean {
-            if (this._cache.parent === this._parentNode)
+            if (!this.isSynchronizedWithParent()) {
                 return false;
+            }
 
-            this._cache.parent = this._parentNode;
-
-            return true;
+            return this._isSynchronized();
         }
 
         /**
@@ -659,10 +645,9 @@
         /**
          * Computes the world matrix of the node
          * @param force defines if the cache version should be invalidated forcing the world matrix to be created from scratch
-         * @param useWasUpdatedFlag defines a reserved property
          * @returns the world matrix
          */
-        public computeWorldMatrix(force?: boolean, useWasUpdatedFlag?: boolean): Matrix {
+        public computeWorldMatrix(force?: boolean): Matrix {
             if (!this._worldMatrix) {
                 this._worldMatrix = Matrix.Identity();
             }

src/babylon.scene.ts

@@ -4067,28 +4067,6 @@
             return this;
         }
 
-        private _computeAllWorldMatricesforBranch(node: Node) {
-            node.computeWorldMatrix(false, true);
-            const children = node.getChildren();
-
-            if (children) {
-                for (var child of children) {
-                    this._computeAllWorldMatricesforBranch(child);
-                }
-            }
-            
-            node._worldMatrixWasUpdated = false;
-        }
-
-        /**
-         * This function will traverse the scene graph and makes sure that all worldMatrix are up to date
-         */
-        public computeAllWorldMatrices() {
-            for (var node of this.rootNodes) {
-                this._computeAllWorldMatricesforBranch(node);
-            }
-        }
-
         private _evaluateActiveMeshes(): void {
             if (this._activeMeshesFrozen && this._activeMeshes.length) {
                 return;
@@ -4111,9 +4089,6 @@
                 step.action();
             }
 
-            // World matrices
-            this.computeAllWorldMatrices();
-
             // Determine mesh candidates
             const meshes = this.getActiveMeshCandidates();
             
@@ -4131,6 +4106,8 @@
                     continue;
                 }
 
+                mesh.computeWorldMatrix();
+
                 // Intersections
                 if (mesh.actionManager && mesh.actionManager.hasSpecificTriggers2(ActionManager.OnIntersectionEnterTrigger, ActionManager.OnIntersectionExitTrigger)) {
                     this._meshesForIntersections.pushNoDuplicate(mesh);