Merge remote-tracking branch 'origin/gulp-fix' into importer

Tools/Gulp/config.json

@@ -4,160 +4,160 @@
     "minFilename": "babylon.js",
     "minNoWorkerFilename": "babylon.noworker.js",
     "declarationFilename": "babylon.d.ts",
-    "outputDirectory": "../../"
+    "outputDirectory": "../../dist/"
   },
   "core": {
     "typescript": [
-      "../../Babylon/**/*.ts",
-      "../../References/**/*.d.ts"
+      "../../src/**/*.ts",
+      "../../external references/**/*.d.ts"
     ],
     "files": [
-      "../../Babylon/Math/babylon.math.js",
-      "../../Babylon/Tools/babylon.database.js",
-      "../../Babylon/Tools/babylon.tools.tga.js",
-      "../../Babylon/Tools/babylon.tools.dds.js",
-      "../../Babylon/Tools/babylon.smartArray.js",
-      "../../Babylon/Tools/babylon.smartCollection.js",
-      "../../Babylon/Tools/babylon.tools.js",
-      "../../Babylon/babylon.engine.js",
-      "../../Babylon/babylon.node.js",
-      "../../Babylon/Tools/babylon.filesInput.js",
-      "../../Babylon/Collisions/babylon.pickingInfo.js",
-      "../../Babylon/Culling/babylon.boundingSphere.js",
-      "../../Babylon/Culling/babylon.boundingBox.js",
-      "../../Babylon/Culling/babylon.boundingInfo.js",
-      "../../Babylon/Mesh/babylon.abstractMesh.js",
-      "../../Babylon/Lights/babylon.light.js",
-      "../../Babylon/Lights/babylon.pointLight.js",
-      "../../Babylon/Lights/babylon.spotLight.js",
-      "../../Babylon/Lights/babylon.hemisphericLight.js",
-      "../../Babylon/Lights/babylon.directionalLight.js",
-      "../../Babylon/Lights/Shadows/babylon.shadowGenerator.js",
-      "../../Babylon/Collisions/babylon.collider.js",
-      "../../Babylon/Collisions/babylon.collisionCoordinator.js",
-      "../../Babylon/Cameras/babylon.camera.js",
-      "../../Babylon/Cameras/babylon.targetCamera.js",
-      "../../Babylon/Cameras/babylon.freeCamera.js",
-      "../../Babylon/Cameras/babylon.followCamera.js",
-      "../../Babylon/Cameras/babylon.touchCamera.js",
-      "../../Babylon/Cameras/babylon.arcRotateCamera.js",
-      "../../Babylon/Cameras/babylon.deviceOrientationCamera.js",
-      "../../Babylon/Tools/babylon.gamepads.js",
-      "../../Babylon/Cameras/babylon.gamepadCamera.js",
-      "../../Babylon/Rendering/babylon.renderingManager.js",
-      "../../Babylon/Rendering/babylon.renderingGroup.js",
-      "../../Babylon/babylon.scene.js",
-      "../../Babylon/Mesh/babylon.vertexBuffer.js",
-      "../../Babylon/Mesh/babylon.instancedMesh.js",
-      "../../Babylon/Mesh/babylon.mesh.js",
-      "../../Babylon/Mesh/babylon.subMesh.js",
-      "../../Babylon/Materials/Textures/babylon.baseTexture.js",
-      "../../Babylon/Materials/Textures/babylon.texture.js",
-      "../../Babylon/Materials/Textures/babylon.cubeTexture.js",
-      "../../Babylon/Materials/Textures/babylon.renderTargetTexture.js",
-      "../../Babylon/Materials/Textures/Procedurals/babylon.proceduralTexture.js",
-      "../../Babylon/Materials/Textures/babylon.mirrorTexture.js",
-      "../../Babylon/Materials/Textures/babylon.dynamicTexture.js",
-      "../../Babylon/Materials/Textures/babylon.videoTexture.js",
-      "../../Babylon/Materials/Textures/Procedurals/babylon.customProceduralTexture.js",
-      "../../Babylon/Materials/Textures/babylon.proceduralTexture.js",
-      "../../Babylon/Materials/Textures/Procedurals/babylon.standardProceduralTexture.js",
-      "../../Babylon/Materials/babylon.effect.js",
-      "../../Babylon/Materials/babylon.material.js",
-      "../../Babylon/Materials/babylon.standardMaterial.js",
-      "../../Babylon/Materials/babylon.multiMaterial.js",
-      "../../Babylon/Loading/babylon.sceneLoader.js",
-      "../../Babylon/Loading/Plugins/babylon.babylonFileLoader.js",
-      "../../Babylon/Sprites/babylon.spriteManager.js",
-      "../../Babylon/Sprites/babylon.sprite.js",
-      "../../Babylon/Layer/babylon.layer.js",
-      "../../Babylon/Particles/babylon.particle.js",
-      "../../Babylon/Particles/babylon.particleSystem.js",
-      "../../Babylon/Animations/babylon.animation.js",
-      "../../Babylon/Animations/babylon.animatable.js",
-      "../../Babylon/Animations/babylon.easing.js",
-      "../../Babylon/Culling/Octrees/babylon.octree.js",
-      "../../Babylon/Culling/Octrees/babylon.octreeBlock.js",
-      "../../Babylon/Bones/babylon.bone.js",
-      "../../Babylon/Bones/babylon.skeleton.js",
-      "../../Babylon/Bones/babylon.skeleton.js",
-      "../../Babylon/PostProcess/babylon.postProcess.js",
-      "../../Babylon/PostProcess/babylon.postProcessManager.js",
-      "../../Babylon/PostProcess/babylon.passPostProcess.js",
-      "../../Babylon/PostProcess/babylon.blurPostProcess.js",
-      "../../Babylon/PostProcess/babylon.refractionPostProcess.js",
-      "../../Babylon/PostProcess/babylon.blackAndWhitePostProcess.js",
-      "../../Babylon/PostProcess/babylon.convolutionPostProcess.js",
-      "../../Babylon/PostProcess/babylon.filterPostProcess.js",
-      "../../Babylon/PostProcess/babylon.fxaaPostProcess.js",
-      "../../Babylon/PostProcess/babylon.stereoscopicInterlacePostProcess.js",
-      "../../Babylon/LensFlare/babylon.lensFlare.js",
-      "../../Babylon/LensFlare/babylon.lensFlareSystem.js",
-      "../../Babylon/Physics/Plugins/babylon.cannonJSPlugin.js",
-      "../../Babylon/Physics/Plugins/babylon.oimoJSPlugin.js",
-      "../../Babylon/Physics/babylon.physicsEngine.js",
-      "../../Babylon/Tools/babylon.sceneSerializer.js",
-      "../../Babylon/Mesh/babylon.csg.js",
-      "../../Babylon/PostProcess/babylon.vrDistortionCorrectionPostProcess.js",
-      "../../Babylon/Tools/babylon.virtualJoystick.js",
-      "../../Babylon/Cameras/babylon.virtualJoysticksCamera.js",
-      "../../Babylon/Materials/babylon.shaderMaterial.js",
-      "../../Babylon/Mesh/babylon.mesh.vertexData.js",
-      "../../Babylon/PostProcess/babylon.anaglyphPostProcess.js",
-      "../../Babylon/Tools/babylon.tags.js",
-      "../../Babylon/Tools/babylon.andOrNotEvaluator.js",
-      "../../Babylon/PostProcess/RenderPipeline/babylon.postProcessRenderPass.js",
-      "../../Babylon/PostProcess/RenderPipeline/babylon.postProcessRenderEffect.js",
-      "../../Babylon/PostProcess/RenderPipeline/babylon.postProcessRenderPipeline.js",
-      "../../Babylon/PostProcess/RenderPipeline/babylon.postProcessRenderPipelineManager.js",
-      "../../Babylon/PostProcess/babylon.displayPassPostProcess.js",
-      "../../Babylon/Rendering/babylon.boundingBoxRenderer.js",
-      "../../Babylon/Actions/babylon.condition.js",
-      "../../Babylon/Actions/babylon.action.js",
-      "../../Babylon/Actions/babylon.actionManager.js",
-      "../../Babylon/Actions/babylon.interpolateValueAction.js",
-      "../../Babylon/Actions/babylon.directActions.js",
-      "../../Babylon/Mesh/babylon.geometry.js",
-      "../../Babylon/Mesh/babylon.groundMesh.js",
-      "../../Babylon/Mesh/babylon.instancedMesh.js",
-      "../../Babylon/Mesh/babylon.linesMesh.js",
-      "../../Babylon/Rendering/babylon.outlineRenderer.js",
-      "../../Babylon/Tools/babylon.assetsManager.js",
-      "../../Babylon/Cameras/VR/babylon.vrDeviceOrientationCamera.js",
-      "../../Babylon/Cameras/VR/babylon.webVRCamera.js",
-      "../../Babylon/Tools/babylon.sceneOptimizer.js",
-      "../../Babylon/Mesh/babylon.meshLODLevel.js",
-      "../../Babylon/Audio/babylon.audioEngine.js",
-      "../../Babylon/Audio/babylon.sound.js",
-      "../../Babylon/Audio/babylon.soundtrack.js",
-      "../../Babylon/Debug/babylon.debugLayer.js",
-      "../../Babylon/Materials/Textures/babylon.rawTexture.js",
-      "../../Babylon/Mesh/babylon.polygonMesh.js",
-      "../../Babylon/Mesh/babylon.meshSimplification.js",
-      "../../Babylon/Audio/babylon.analyser.js",
-      "../../Babylon/Rendering/babylon.depthRenderer.js",
-      "../../Babylon/PostProcess/babylon.ssaoRenderingPipeline.js",
-      "../../Babylon/PostProcess/babylon.volumetricLightScatteringPostProcess.js",
-      "../../Babylon/PostProcess/babylon.lensRenderingPipeline.js",
-      "../../Babylon/PostProcess/babylon.colorCorrectionPostProcess.js",
-      "../../Babylon/Cameras/babylon.stereoscopicCameras.js",
-      "../../Babylon/PostProcess/babylon.hdrRenderingPipeline.js"
+      "../../src/Math/babylon.math.js",
+      "../../src/Tools/babylon.database.js",
+      "../../src/Tools/babylon.tools.tga.js",
+      "../../src/Tools/babylon.tools.dds.js",
+      "../../src/Tools/babylon.smartArray.js",
+      "../../src/Tools/babylon.smartCollection.js",
+      "../../src/Tools/babylon.tools.js",
+      "../../src/babylon.engine.js",
+      "../../src/babylon.node.js",
+      "../../src/Tools/babylon.filesInput.js",
+      "../../src/Collisions/babylon.pickingInfo.js",
+      "../../src/Culling/babylon.boundingSphere.js",
+      "../../src/Culling/babylon.boundingBox.js",
+      "../../src/Culling/babylon.boundingInfo.js",
+      "../../src/Mesh/babylon.abstractMesh.js",
+      "../../src/Lights/babylon.light.js",
+      "../../src/Lights/babylon.pointLight.js",
+      "../../src/Lights/babylon.spotLight.js",
+      "../../src/Lights/babylon.hemisphericLight.js",
+      "../../src/Lights/babylon.directionalLight.js",
+      "../../src/Lights/Shadows/babylon.shadowGenerator.js",
+      "../../src/Collisions/babylon.collider.js",
+      "../../src/Collisions/babylon.collisionCoordinator.js",
+      "../../src/Cameras/babylon.camera.js",
+      "../../src/Cameras/babylon.targetCamera.js",
+      "../../src/Cameras/babylon.freeCamera.js",
+      "../../src/Cameras/babylon.followCamera.js",
+      "../../src/Cameras/babylon.touchCamera.js",
+      "../../src/Cameras/babylon.arcRotateCamera.js",
+      "../../src/Cameras/babylon.deviceOrientationCamera.js",
+      "../../src/Tools/babylon.gamepads.js",
+      "../../src/Cameras/babylon.gamepadCamera.js",
+      "../../src/Rendering/babylon.renderingManager.js",
+      "../../src/Rendering/babylon.renderingGroup.js",
+      "../../src/babylon.scene.js",
+      "../../src/Mesh/babylon.vertexBuffer.js",
+      "../../src/Mesh/babylon.instancedMesh.js",
+      "../../src/Mesh/babylon.mesh.js",
+      "../../src/Mesh/babylon.subMesh.js",
+      "../../src/Materials/Textures/babylon.baseTexture.js",
+      "../../src/Materials/Textures/babylon.texture.js",
+      "../../src/Materials/Textures/babylon.cubeTexture.js",
+      "../../src/Materials/Textures/babylon.renderTargetTexture.js",
+      "../../src/Materials/Textures/Procedurals/babylon.proceduralTexture.js",
+      "../../src/Materials/Textures/babylon.mirrorTexture.js",
+      "../../src/Materials/Textures/babylon.dynamicTexture.js",
+      "../../src/Materials/Textures/babylon.videoTexture.js",
+      "../../src/Materials/Textures/Procedurals/babylon.customProceduralTexture.js",
+      "../../src/Materials/Textures/babylon.proceduralTexture.js",
+      "../../src/Materials/Textures/Procedurals/babylon.standardProceduralTexture.js",
+      "../../src/Materials/babylon.effect.js",
+      "../../src/Materials/babylon.material.js",
+      "../../src/Materials/babylon.standardMaterial.js",
+      "../../src/Materials/babylon.multiMaterial.js",
+      "../../src/Loading/babylon.sceneLoader.js",
+      "../../src/Loading/Plugins/babylon.babylonFileLoader.js",
+      "../../src/Sprites/babylon.spriteManager.js",
+      "../../src/Sprites/babylon.sprite.js",
+      "../../src/Layer/babylon.layer.js",
+      "../../src/Particles/babylon.particle.js",
+      "../../src/Particles/babylon.particleSystem.js",
+      "../../src/Animations/babylon.animation.js",
+      "../../src/Animations/babylon.animatable.js",
+      "../../src/Animations/babylon.easing.js",
+      "../../src/Culling/Octrees/babylon.octree.js",
+      "../../src/Culling/Octrees/babylon.octreeBlock.js",
+      "../../src/Bones/babylon.bone.js",
+      "../../src/Bones/babylon.skeleton.js",
+      "../../src/Bones/babylon.skeleton.js",
+      "../../src/PostProcess/babylon.postProcess.js",
+      "../../src/PostProcess/babylon.postProcessManager.js",
+      "../../src/PostProcess/babylon.passPostProcess.js",
+      "../../src/PostProcess/babylon.blurPostProcess.js",
+      "../../src/PostProcess/babylon.refractionPostProcess.js",
+      "../../src/PostProcess/babylon.blackAndWhitePostProcess.js",
+      "../../src/PostProcess/babylon.convolutionPostProcess.js",
+      "../../src/PostProcess/babylon.filterPostProcess.js",
+      "../../src/PostProcess/babylon.fxaaPostProcess.js",
+      "../../src/PostProcess/babylon.stereoscopicInterlacePostProcess.js",
+      "../../src/LensFlare/babylon.lensFlare.js",
+      "../../src/LensFlare/babylon.lensFlareSystem.js",
+      "../../src/Physics/Plugins/babylon.cannonJSPlugin.js",
+      "../../src/Physics/Plugins/babylon.oimoJSPlugin.js",
+      "../../src/Physics/babylon.physicsEngine.js",
+      "../../src/Tools/babylon.sceneSerializer.js",
+      "../../src/Mesh/babylon.csg.js",
+      "../../src/PostProcess/babylon.vrDistortionCorrectionPostProcess.js",
+      "../../src/Tools/babylon.virtualJoystick.js",
+      "../../src/Cameras/babylon.virtualJoysticksCamera.js",
+      "../../src/Materials/babylon.shaderMaterial.js",
+      "../../src/Mesh/babylon.mesh.vertexData.js",
+      "../../src/PostProcess/babylon.anaglyphPostProcess.js",
+      "../../src/Tools/babylon.tags.js",
+      "../../src/Tools/babylon.andOrNotEvaluator.js",
+      "../../src/PostProcess/RenderPipeline/babylon.postProcessRenderPass.js",
+      "../../src/PostProcess/RenderPipeline/babylon.postProcessRenderEffect.js",
+      "../../src/PostProcess/RenderPipeline/babylon.postProcessRenderPipeline.js",
+      "../../src/PostProcess/RenderPipeline/babylon.postProcessRenderPipelineManager.js",
+      "../../src/PostProcess/babylon.displayPassPostProcess.js",
+      "../../src/Rendering/babylon.boundingBoxRenderer.js",
+      "../../src/Actions/babylon.condition.js",
+      "../../src/Actions/babylon.action.js",
+      "../../src/Actions/babylon.actionManager.js",
+      "../../src/Actions/babylon.interpolateValueAction.js",
+      "../../src/Actions/babylon.directActions.js",
+      "../../src/Mesh/babylon.geometry.js",
+      "../../src/Mesh/babylon.groundMesh.js",
+      "../../src/Mesh/babylon.instancedMesh.js",
+      "../../src/Mesh/babylon.linesMesh.js",
+      "../../src/Rendering/babylon.outlineRenderer.js",
+      "../../src/Tools/babylon.assetsManager.js",
+      "../../src/Cameras/VR/babylon.vrDeviceOrientationCamera.js",
+      "../../src/Cameras/VR/babylon.webVRCamera.js",
+      "../../src/Tools/babylon.sceneOptimizer.js",
+      "../../src/Mesh/babylon.meshLODLevel.js",
+      "../../src/Audio/babylon.audioEngine.js",
+      "../../src/Audio/babylon.sound.js",
+      "../../src/Audio/babylon.soundtrack.js",
+      "../../src/Debug/babylon.debugLayer.js",
+      "../../src/Materials/Textures/babylon.rawTexture.js",
+      "../../src/Mesh/babylon.polygonMesh.js",
+      "../../src/Mesh/babylon.meshSimplification.js",
+      "../../src/Audio/babylon.analyser.js",
+      "../../src/Rendering/babylon.depthRenderer.js",
+      "../../src/PostProcess/babylon.ssaoRenderingPipeline.js",
+      "../../src/PostProcess/babylon.volumetricLightScatteringPostProcess.js",
+      "../../src/PostProcess/babylon.lensRenderingPipeline.js",
+      "../../src/PostProcess/babylon.colorCorrectionPostProcess.js",
+      "../../src/Cameras/babylon.stereoscopicCameras.js",
+      "../../src/PostProcess/babylon.hdrRenderingPipeline.js"
     ]
   },
   "shadersDirectories": [
     {
       "variable": "BABYLON.Effect.ShadersStore",
-      "files": "../../Babylon/Shaders/*.fx"
+      "files": "../../src/Shaders/*.fx"
     }
   ],
   "workers": [
     {
       "variable": "BABYLON.CollisionWorker",
       "files": [
-        "../../Babylon/Collisions/babylon.collider.js",
-        "../../Babylon/Collisions/babylon.collisionWorker.js",
-        "../../Babylon/Collisions/babylon.collisionCoordinator.js",
-        "../../Babylon/Math/babylon.math.js"
+        "../../src/Collisions/babylon.collider.js",
+        "../../src/Collisions/babylon.collisionWorker.js",
+        "../../src/Collisions/babylon.collisionCoordinator.js",
+        "../../src/Math/babylon.math.js"
       ]
     }
   ],

src/Materials/Textures/babylon.rawTexture.ts

@@ -11,7 +11,7 @@
 
         public update(data: ArrayBufferView): void {
             this.getScene().getEngine().updateRawTexture(this._texture, data, this.format, this._invertY);
-        };
+        }
 
         // Statics
         public static CreateLuminanceTexture(data: ArrayBufferView, width: number, height: number, scene: Scene, generateMipMaps: boolean = true, invertY: boolean = false, samplingMode: number = Texture.TRILINEAR_SAMPLINGMODE): RawTexture {

src/babylon.engine.ts

@@ -1648,7 +1648,7 @@
             this._gl.bindTexture(this._gl.TEXTURE_2D, null);
             this._activeTexturesCache = [];
             texture.isReady = true;
-        };
+        }
 
         public createRawTexture(data: ArrayBufferView, width: number, height: number, format: number, generateMipMaps: boolean, invertY: boolean, samplingMode: number): WebGLTexture {
             var texture = this._gl.createTexture();