Merge remote-tracking branch 'upstream/master' into gltf-logging

inspector/src/Inspector.ts

@@ -44,7 +44,7 @@ module INSPECTOR {
                     //Load properties of GUI objects now as BABYLON.GUI has to be declared before 
                     loadGUIProperties();
                 }, () => {
-                    console.warn("Please add script https://preview.babylonjs.com/gui/babylon.gui.js to the HTML file")
+                    console.warn('Error : loading "babylon.gui.js". Please add script https://preview.babylonjs.com/gui/babylon.gui.js to the HTML file.');
                 });
             }
             else {

inspector/src/details/Property.ts

@@ -28,7 +28,7 @@ module INSPECTOR {
         public set value(newValue: any) {
             if (newValue != undefined && this._obj[this._property] != undefined) {
                 if (this._obj instanceof BABYLON.Scene) {
-                    (<BABYLON.Scene>this._obj).debugLayer.onGlobalPropertyChangeCallback({
+                    (<BABYLON.Scene>this._obj).debugLayer.onPropertyChangedObservable.notifyObservers({
                         object: this._obj,
                         property: this._property,
                         value: newValue,
@@ -40,7 +40,7 @@ module INSPECTOR {
                         // Object that have "children" properties : Color, Vector, imageProcessingConfiguration
 
                         if (this._parentObj instanceof BABYLON.Scene) {
-                            (<BABYLON.Scene>this._parentObj).debugLayer.onGlobalPropertyChangeCallback({
+                            (<BABYLON.Scene>this._parentObj).debugLayer.onPropertyChangedObservable.notifyObservers({
                                 object: this._parentObj,
                                 property: this._property,
                                 value: newValue,
@@ -48,7 +48,7 @@ module INSPECTOR {
                             });
                         }
                         else {
-                            this._parentObj.getScene().debugLayer.onGlobalPropertyChangeCallback({
+                            this._parentObj.getScene().debugLayer.onPropertyChangedObservable.notifyObservers({
                                 object: this._parentObj,
                                 property: this._property,
                                 value: newValue,
@@ -57,7 +57,7 @@ module INSPECTOR {
                         }
                     }
                     else {
-                        this._obj.getScene().debugLayer.onGlobalPropertyChangeCallback({
+                        this._obj.getScene().debugLayer.onPropertyChangedObservable.notifyObservers({
                             object: this._obj,
                             property: this._property,
                             value: newValue,

inspector/src/details/PropertyLine.ts

@@ -293,10 +293,8 @@ module INSPECTOR {
          * Dispose all viewer element (color, texture...)
          */
         public dispose() {
-            // console.log('delete properties', this.name);
             Scheduler.getInstance().remove(this);
             for (let child of this._children) {
-                // console.log('delete properties', child.name);
                 Scheduler.getInstance().remove(child);
             }
             for (let elem of this._elements) {

inspector/src/helpers/Helpers.ts

@@ -172,11 +172,11 @@ module INSPECTOR {
                         style.textContent = elem as string;
                     });
                 }, undefined, undefined, undefined, () => {
-                    console.log("erreur");
+                    console.log('Error : LoadFile "glsl.min.js"');
                 });
 
             }, undefined, undefined, undefined, () => {
-                console.log("erreur");
+                console.log('Error : LoadFile "highlight.min.js"')
             });
 
         }

inspector/src/tabs/ConsoleTab.ts

@@ -92,10 +92,10 @@ module INSPECTOR {
 
         private _message(type:string, message:any, caller:string) {
             let callerLine = Helpers.CreateDiv('caller', this._consolePanelContent);
-            callerLine.textContent = caller;
+            callerLine.textContent = caller.replace(' ', '\u00A0');
 
             let line = Helpers.CreateDiv(type, this._consolePanelContent); 
-            line.textContent += message ; 
+            line.textContent = message.replace(' ', '\u00A0');
 
             this._consolePanelContent.scrollTop = this._consolePanelContent.scrollHeight; 
         }

inspector/test/index.js

@@ -85,7 +85,7 @@ var Test = (function () {
         scene.createDefaultCameraOrLight(true);
         scene.activeCamera.attachControl(canvas);
         scene.debugLayer.show();
-        scene.debugLayer.onGlobalPropertyChange.push((result) => {
+        scene.debugLayer.onPropertyChangedObservable.add((result) => {
             console.log(result.object);
             console.log("Property : " + result.property);
             console.log("New value : " + result.value);

src/Debug/babylon.debugLayer.ts

@@ -12,13 +12,11 @@ module BABYLON {
 
         private BJSINSPECTOR = typeof INSPECTOR !== 'undefined' ? INSPECTOR : undefined;
 
-        public onGlobalPropertyChange: Array<Function>;
+        public onPropertyChangedObservable: BABYLON.Observable<{ object: any, property: string, value: any, initialValue: any }>;
 
         constructor(scene: Scene) {
             this._scene = scene;
             // load inspector using require, if it doesn't exist on the global namespace.
-
-            this.onGlobalPropertyChange = new Array<Function>();
         }
 
         /** Creates the inspector window. */
@@ -60,6 +58,7 @@ module BABYLON {
                 } catch (e) {
                     // If the inspector has been removed directly from the inspector tool
                 }
+                this.onPropertyChangedObservable.clear();
                 this._inspector = null;
             }
         }
@@ -106,6 +105,7 @@ module BABYLON {
             } else {
                 // Otherwise creates the inspector
                 this._createInspector(config);
+                this.onPropertyChangedObservable = new BABYLON.Observable<{ object: any, property: string, value: any, initialValue: any }>();
             }
         }
 
@@ -116,11 +116,5 @@ module BABYLON {
         public getActiveTab(): number {
             return this._inspector ? this._inspector.getActiveTabIndex() : -1;
         }
-
-        public onGlobalPropertyChangeCallback(result: {}) {
-            this.onGlobalPropertyChange.forEach((callback) => {
-                callback(result);
-            });
-        }
     }
 }