Merge

Tools/Gulp/config.json

@@ -14,7 +14,7 @@
       "!../../src/**/*.d.ts",
       "../../external references/**/*.d.ts"
     ],
-    "files": [
+   "files": [
       "../../src/Math/babylon.math.js",
       "../../src/Tools/babylon.decorators.js",
       "../../src/Tools/babylon.observable.js",
@@ -43,19 +43,18 @@
       "../../src/Collisions/babylon.collider.js",
       "../../src/Collisions/babylon.collisionCoordinator.js",
       "../../src/Cameras/babylon.camera.js",
-      "../../src/Cameras/babylon.cameraInputsManager.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.mouse.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.keyboard.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.touch.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.deviceorientation.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.vrdeviceorientation.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.gamepad.js",
-      "../../src/Cameras/Inputs/babylon.freecamera.input.virtualjoystick.js",
-      "../../src/Cameras/Inputs/babylon.arcrotatecamera.input.keyboard.js",
-      "../../src/Cameras/Inputs/babylon.arcrotatecamera.input.mousewheel.js",
-      "../../src/Cameras/Inputs/babylon.arcrotatecamera.input.pointers.js",
-      "../../src/Cameras/Inputs/babylon.arcrotatecamera.input.gamepad.js",
-      "../../src/Cameras/Inputs/babylon.arcrotatecamera.input.vrdeviceorientation.js",
+      "../../src/cameras/babylon.camerainputsmanager.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.mouse.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.keyboard.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.touch.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.deviceorientation.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.vrdeviceorientation.js",
+      "../../src/cameras/inputs/babylon.freecamera.input.gamepad.js",
+      "../../src/cameras/inputs/babylon.arcrotatecamera.input.keyboard.js",
+      "../../src/cameras/inputs/babylon.arcrotatecamera.input.mousewheel.js",
+      "../../src/cameras/inputs/babylon.arcrotatecamera.input.pointers.js",
+      "../../src/cameras/inputs/babylon.arcrotatecamera.input.gamepad.js",
+      "../../src/cameras/inputs/babylon.arcrotatecamera.input.vrdeviceorientation.js",
       "../../src/Cameras/babylon.targetCamera.js",
       "../../src/Cameras/babylon.freeCamera.js",
       "../../src/Cameras/babylon.freeCameraInputsManager.js",
@@ -122,11 +121,10 @@
       "../../src/Mesh/babylon.groundMesh.js",
       "../../src/Mesh/babylon.instancedMesh.js",
       "../../src/Mesh/babylon.linesMesh.js",
-      "../../src/Debug/babylon.debugLayer.js",
       "../../src/Tools/babylon.loadingScreen.js",
       "../../src/Audio/babylon.audioEngine.js",
       "../../src/Audio/babylon.sound.js",
-      "../../src/Audio/babylon.soundtrack.js"
+      "../../src/Audio/babylon.soundtrack.js"
     ]
   },
   "shadersDirectories": [
@@ -182,7 +180,8 @@
       "../../src/Mesh/babylon.csg.js",
       "../../src/PostProcess/babylon.vrDistortionCorrectionPostProcess.js",
       "../../src/Tools/babylon.virtualJoystick.js",
-      "../../src/Cameras/babylon.virtualJoysticksCamera.js",
+      "../../src/Cameras/babylon.virtualJoysticksCamera.js",      
+      "../../src/cameras/inputs/babylon.freecamera.input.virtualjoystick.js",
       "../../src/PostProcess/babylon.anaglyphPostProcess.js",
       "../../src/Rendering/babylon.outlineRenderer.js",
       "../../src/Tools/babylon.assetsManager.js",
@@ -226,9 +225,10 @@
       "../../src/tools/hdr/babylon.tools.hdr.js",
       "../../src/tools/hdr/babylon.tools.pmremGenerator.js",
       "../../src/materials/textures/babylon.hdrcubetexture.js",
-      "../../src/Materials/Textures/babylon.colorGradingTexture.js",
       "../../src/debug/babylon.skeletonViewer.js",
-      "../../src/materials/babylon.pbrmaterial.js"
+      "../../src/Materials/Textures/babylon.colorGradingTexture.js",
+      "../../src/materials/babylon.pbrmaterial.js",      
+      "../../src/Debug/babylon.debugLayer.js"
     ]
   }
 }

src/Cameras/babylon.deviceOrientationCamera.js

@@ -16,28 +16,28 @@ var BABYLON;
         Object.defineProperty(DeviceOrientationCamera.prototype, "angularSensibility", {
             //-- Begin properties for backward compatibility for inputs
             get: function () {
-                var gamepad = this.inputs.attached["deviceOrientation"];
-                if (gamepad)
-                    return gamepad.angularSensibility;
+                var deviceOrientation = this.inputs.attached["deviceOrientation"];
+                if (deviceOrientation)
+                    return deviceOrientation.angularSensibility;
             },
             set: function (value) {
-                var gamepad = this.inputs.attached["deviceOrientation"];
-                if (gamepad)
-                    gamepad.angularSensibility = value;
+                var deviceOrientation = this.inputs.attached["deviceOrientation"];
+                if (deviceOrientation)
+                    deviceOrientation.angularSensibility = value;
             },
             enumerable: true,
             configurable: true
         });
         Object.defineProperty(DeviceOrientationCamera.prototype, "moveSensibility", {
             get: function () {
-                var gamepad = this.inputs.attached["deviceOrientation"];
-                if (gamepad)
-                    return gamepad.moveSensibility;
+                var deviceOrientation = this.inputs.attached["deviceOrientation"];
+                if (deviceOrientation)
+                    return deviceOrientation.moveSensibility;
             },
             set: function (value) {
-                var gamepad = this.inputs.attached["deviceOrientation"];
-                if (gamepad)
-                    gamepad.moveSensibility = value;
+                var deviceOrientation = this.inputs.attached["deviceOrientation"];
+                if (deviceOrientation)
+                    deviceOrientation.moveSensibility = value;
             },
             enumerable: true,
             configurable: true

src/Cameras/babylon.deviceOrientationCamera.ts

@@ -3,27 +3,27 @@ module BABYLON {
     export class DeviceOrientationCamera extends FreeCamera {
         //-- Begin properties for backward compatibility for inputs
         public get angularSensibility() {
-            var gamepad = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
-            if (gamepad)
-                return gamepad.angularSensibility;
+            var deviceOrientation = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
+            if (deviceOrientation)
+                return deviceOrientation.angularSensibility;
         }
         
         public set angularSensibility(value) {
-            var gamepad = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
-            if (gamepad)
-                gamepad.angularSensibility = value;
+            var deviceOrientation = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
+            if (deviceOrientation)
+                deviceOrientation.angularSensibility = value;
         }
         
         public get moveSensibility() {
-            var gamepad = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
-            if (gamepad)
-                return gamepad.moveSensibility;
+            var deviceOrientation = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
+            if (deviceOrientation)
+                return deviceOrientation.moveSensibility;
         }
         
         public set moveSensibility(value) {
-            var gamepad = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
-            if (gamepad)
-                gamepad.moveSensibility = value;
+            var deviceOrientation = <FreeCameraDeviceOrientationInput>this.inputs.attached["deviceOrientation"];
+            if (deviceOrientation)
+                deviceOrientation.moveSensibility = value;
         }
         //-- end properties for backward compatibility for inputs
         

src/Canvas2d/babylon.canvas2d.js

@@ -194,7 +194,7 @@ var BABYLON;
                     return;
                 }
                 this._background.fill = value;
-                this._background.isVisible = true;
+                this._background.levelVisible = true;
             },
             enumerable: true,
             configurable: true
@@ -216,7 +216,7 @@ var BABYLON;
                     return;
                 }
                 this._background.border = value;
-                this._background.isVisible = true;
+                this._background.levelVisible = true;
             },
             enumerable: true,
             configurable: true
@@ -234,7 +234,7 @@ var BABYLON;
                     return;
                 }
                 this._background.roundRadius = value;
-                this._background.isVisible = true;
+                this._background.levelVisible = true;
             },
             enumerable: true,
             configurable: true

src/babylon.scene.js

@@ -281,7 +281,6 @@ var BABYLON;
                 this._outlineRenderer = new BABYLON.OutlineRenderer(this);
             }
             this.attachControl();
-            this._debugLayer = new BABYLON.DebugLayer(this);
             if (BABYLON.SoundTrack) {
                 this.mainSoundTrack = new BABYLON.SoundTrack(this, { mainTrack: true });
             }
@@ -373,6 +372,9 @@ var BABYLON;
         Object.defineProperty(Scene.prototype, "debugLayer", {
             // Properties
             get: function () {
+                if (!this._debugLayer) {
+                    this._debugLayer = new BABYLON.DebugLayer(this);
+                }
                 return this._debugLayer;
             },
             enumerable: true,
@@ -1944,7 +1946,9 @@ var BABYLON;
                 this._depthRenderer.dispose();
             }
             // Debug layer
-            this.debugLayer.hide();
+            if (this._debugLayer) {
+                this._debugLayer.hide();
+            }
             // Events
             this.onDisposeObservable.notifyObservers(this);
             this.onDisposeObservable.clear();

src/babylon.scene.ts

@@ -468,8 +468,6 @@
 
             this.attachControl();
 
-            this._debugLayer = new DebugLayer(this);
-
             if (SoundTrack) {
                 this.mainSoundTrack = new SoundTrack(this, { mainTrack: true });
             }
@@ -485,6 +483,9 @@
 
         // Properties
         public get debugLayer(): DebugLayer {
+            if (!this._debugLayer) {
+                this._debugLayer = new DebugLayer(this);
+            }
             return this._debugLayer;
         }
 
@@ -2358,7 +2359,9 @@
             }
 
             // Debug layer
-            this.debugLayer.hide();
+            if (this._debugLayer) {
+                this._debugLayer.hide();
+            }
 
             // Events
             this.onDisposeObservable.notifyObservers(this);