8 년 전 · 719626a2ac
--- a/Max/BabylonExport.Entities/BabylonShadowGenerator.cs
+++ b/Max/BabylonExport.Entities/BabylonShadowGenerator.cs
@@ -24,6 +24,9 @@ namespace BabylonExport.Entities
 
				         public bool useBlurExponentialShadowMap { get; set; }

			
 
				 

			
 
				         [DataMember]

			
 
				+        public float? depthScale { get; set; }

			
 
				+

			
 
				+        [DataMember]

			
 
				         public float darkness { get; set; }

			
 
				 

			
 
				         [DataMember]

			
@@ -44,6 +47,7 @@ namespace BabylonExport.Entities
 
				             blurScale = 2;

			
 
				             blurBoxOffset = 0;

			
 
				             bias = 0.00005f;

			
 
				+            depthScale = null;

			
 
				             forceBackFacesOnly = false;

			
 
				         }

			
 
				     }

			
--- a/Exporters/Maya/Tools/babylonReskinTool.mel
+++ b/Exporters/Maya/Tools/babylonReskinTool.mel
@@ -1,9 +1,10 @@
 
				 global proc reskinSelectedMeshes() {
			
 
				-    $influencers = `intSliderGrp -q -value myReskinInfluencers`;
			
 
				     $selection = `ls -sl`;
			
 
				     $selected = size($selection);
			
 
				     if ($selected > 0) {
			
 
				         $skinName = `textFieldGrp -q -text myReskinName`;
			
 
				+        $regenerate = `radioButtonGrp -q -select myReskinGenerate`;
			
 
				+        $influencers = `intSliderGrp -q -value myReskinInfluencers`;
			
 
				         if ($skinName != "") {
			
 
				             $textField_exists = `objExists $skinName`;
			
 
				             if ($textField_exists == 0) {
			
@@ -13,7 +14,8 @@ global proc reskinSelectedMeshes() {
 
				                 if ($selected > 1) {
			
 
				                     $duplicateObj = `duplicate $selection`;
			
 
				                     $createGrp = `group -n tempGroup`;
			
 
				-                    $combine = `polyUnite -n $skinName $createGrp`;
			
 
				+                    $mergeType = ($regenerate - 1);
			
 
				+                    $combine = `polyUnite -muv $mergeType -n $skinName $createGrp`;
			
 
				                     $deleteHistory = `delete -ch $combine`;
			
 
				                     delete $createGrp;
			
 
				                 } else {
			
@@ -26,7 +28,7 @@ global proc reskinSelectedMeshes() {
 
				                 $transfer = `copySkinWeights -nm -sa "closestPoint" -ia "closestJoint"`;
			
 
				                 $cleared = `textFieldGrp -edit -text "" myReskinName`;
			
 
				                 $deleted = `delete $selection`;
			
 
				-                $deselect = `select -cl`;
			
 
				+                select -cl;
			
 
				                 waitCursor -state 0;
			
 
				             } else {
			
 
				                 error ("Skin name is already in use: " + $skinName);
			
@@ -42,8 +44,9 @@ global proc reskinSelectedMeshes() {
 
				 global proc babylonReskinTool() {
			
 
				     string $window = `window -title "Reskin Geometry Tool"`;
			
 
				     columnLayout -adjustableColumn true;
			
 
				-    textFieldGrp -label "New Skin Name" -text "" myReskinName;
			
 
				-    intSliderGrp -label "Max Influencers" -field true -minValue 1 -maxValue 8 -fieldMinValue 1 -fieldMaxValue 8 -value 4 myReskinInfluencers;
			
 
				+    textFieldGrp -label "Skin Name" -text "" myReskinName;
			
 
				+    intSliderGrp -label "Max Influencers" -field true -minValue 1 -maxValue 4 -fieldMinValue 1 -fieldMaxValue 4 -value 4 myReskinInfluencers;
			
 
				+    radioButtonGrp -label "UV Map Generation" -numberOfRadioButtons 3 -labelArray3 "No Merge" "Same Name" "Set Links" -select 2 myReskinGenerate;
			
 
				     button -label "Reskin Selected Meshes" -command "reskinSelectedMeshes()" myReskinButton; 
			
 
				     showWindow $window;
			
 
				-}
			
 
				+}
			
--- a/Playground/debug.html
+++ b/Playground/debug.html
@@ -50,6 +50,7 @@
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.objFileLoader.js"></script>

			
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.stlFileLoader.js"></script>

			
 
				 

			
 
				+    <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

			
 
				     <link href="index.css" rel="stylesheet" />

			
 
				 </head>

			
 
				 <body>

			
--- a/Playground/frame.html
+++ b/Playground/frame.html
@@ -39,6 +39,7 @@
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.objFileLoader.js"></script>

			
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.stlFileLoader.js"></script>

			
 
				     

			
 
				+    <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

			
 
				     <link href="frame.css" rel="stylesheet" />

			
 
				 </head>

			
 
				 <body>

			
--- a/Playground/frame.js
+++ b/Playground/frame.js
@@ -1,5 +1,5 @@
 
				 (function () {

			
 
				-    var snippetUrl = "//babylonjs-api.azurewebsites.net/api/snippet";

			
 
				+    var snippetUrl = "https://babylonjs-api.azurewebsites.net/api/snippet";

			
 
				     var currentSnippetToken;

			
 
				     var engine;

			
 
				     var fpsLabel = document.getElementById("fpsLabel");

			
--- a/Playground/index.html
+++ b/Playground/index.html
@@ -50,6 +50,8 @@
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.glTFFileLoader.js"></script>

			
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.objFileLoader.js"></script>

			
 
				     <script src="https://babylonjs.azurewebsites.net/lib/babylon.stlFileLoader.js"></script>

			
 
				+    

			
 
				+    <script src="https://rawgit.com/BabylonJS/Extensions/master/ClonerSystem/src/babylonx.cloner.js"></script>

			
 
				     <link href="index.css" rel="stylesheet" />

			
 
				 </head>

			
 
				 <body>

			
--- a/Tools/Gulp/config.json
+++ b/Tools/Gulp/config.json
@@ -87,6 +87,7 @@
 
				             "../../src/Materials/babylon.materialHelper.js",
			
 
				             "../../src/Materials/babylon.fresnelParameters.js",
			
 
				             "../../src/Materials/babylon.material.js",
			
 
				+            "../../src/Materials/babylon.pushMaterial.js",
			
 
				             "../../src/Materials/babylon.standardMaterial.js",
			
 
				             "../../src/Materials/babylon.multiMaterial.js",
			
 
				             "../../src/Materials/babylon.uniformBuffer.js",
			
--- a/Tools/Gulp/custom.config.json
+++ b/Tools/Gulp/custom.config.json
@@ -82,6 +82,7 @@
 
				       "../../src/Materials/babylon.materialHelper.js",
			
 
				       "../../src/Materials/babylon.fresnelParameters.js",
			
 
				       "../../src/Materials/babylon.material.js",
			
 
				+      "../../src/Materials/babylon.pushMaterial.js",
			
 
				       "../../src/Materials/babylon.standardMaterial.js",
			
 
				       "../../src/Materials/babylon.multiMaterial.js",
			
 
				       "../../src/Loading/babylon.sceneLoader.js",
			
--- a/Tools/Gulp/gulp-addModuleExports.js
+++ b/Tools/Gulp/gulp-addModuleExports.js
@@ -10,19 +10,24 @@ module.exports = function (varName) {
 
				           '};\n';

			
 
				 

			
 
				         var extendsAddition =

			
 
				-        'var __extends = (this && this.__extends) || function (d, b) {\n' +

			
 
				-          'for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n' +

			
 
				-          'function __() { this.constructor = d; }\n' +

			
 
				-          '__.prototype = b.prototype;\n' +

			
 
				-          'd.prototype = new __();\n' +

			
 
				-        '};\n';

			
 
				+        `var __extends = (this && this.__extends) || (function () {

			
 
				+            var extendStatics = Object.setPrototypeOf ||

			
 
				+                ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||

			
 
				+                function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };

			
 
				+            return function (d, b) {

			
 
				+                extendStatics(d, b);

			
 
				+                function __() { this.constructor = d; }

			
 
				+                d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());

			
 
				+            };

			
 
				+        })();

			
 
				+        `;

			
 
				 

			
 
				         var decorateAddition =

			
 
				-        'var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n' +
			
 
				-            'var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n' +
			
 
				-            'if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);\n' +
			
 
				-            'else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n' +
			
 
				-            'return c > 3 && r && Object.defineProperty(target, key, r), r;\n' +
			
 
				+        'var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n' +

			
 
				+            'var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n' +

			
 
				+            'if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);\n' +

			
 
				+            'else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n' +

			
 
				+            'return c > 3 && r && Object.defineProperty(target, key, r), r;\n' +

			
 
				         '};\n';

			
 
				 

			
 
				         if (file.isNull()) {

			
--- a/Tools/Gulp/gulpfile.js
+++ b/Tools/Gulp/gulpfile.js
@@ -31,7 +31,7 @@ var includeShadersStream;
 
				 var shadersStream;
			
 
				 var workersStream;
			
 
				 
			
 
				-var extendsSearchRegex = /var\s__extends[\s\S]+?\};/g;
			
 
				+var extendsSearchRegex = /var\s__extends[\s\S]+?\}\)\(\);/g;
			
 
				 var decorateSearchRegex = /var\s__decorate[\s\S]+?\};/g;
			
 
				 
			
 
				 /**
			
--- a/Tools/Gulp/package.json
+++ b/Tools/Gulp/package.json
@@ -1,6 +1,6 @@
 
				 {

			
 
				   "name": "BabylonJS",

			
 
				-  "version": "2.5.0",

			
 
				+  "version": "3.0.0",

			
 
				   "description": "Babylon.js is a 3D engine based on webgl and javascript",

			
 
				   "main": "",

			
 
				   "repository": { "url": "https://github.com/BabylonJS/Babylon.js/" },

			
@@ -8,10 +8,10 @@
 
				   "license": "(Apache-2.0)",

			
 
				   "devDependencies": {

			
 
				     "gulp": "^3.8.11",

			
 
				-    "gulp-uglify": "^2.0.1",

			
 
				+    "gulp-uglify": "^2.1.2",

			
 
				     "gulp-sourcemaps": "~1.9.1",

			
 
				-    "typescript": "~2.1.4",

			
 
				-    "gulp-typescript": "^3.1.5",

			
 
				+    "typescript": "~2.2.2",

			
 
				+    "gulp-typescript": "^3.1.6",

			
 
				     "through2": "~0.6.5",

			
 
				     "gulp-util": "~3.0.4",

			
 
				     "gulp-concat": "~2.5.2",

			
--- a/canvas2D/src/Engine/babylon.canvas2d.ts
+++ b/canvas2D/src/Engine/babylon.canvas2d.ts
@@ -1474,12 +1474,12 @@
 
				             }

			
 
				 

			
 
				             // Clip values if needed

			
 
				-            edge = Math.min(edge, this._maxAdaptiveWorldSpaceCanvasSize);

			
 
				+            edge = Math.min(edge, this._maxAdaptiveWorldSpaceCanvasSize-4); // -4 is to consider the border of 2 pixels, other we couldn't allocate a rect

			
 
				 

			
 
				             let newScale = edge / ((isW) ? this.size.width : this.size.height);

			
 
				-            if (newScale !== this.scale) {

			
 
				+            if (newScale !== this._renderableData._renderingScale) {

			
 
				                 let scale = newScale;

			
 
				-//                console.log(`New adaptive scale for Canvas ${this.id}, w: ${w}, h: ${h}, scale: ${scale}, edge: ${edge}, isW: ${isW}`);

			
 
				+                //console.log(`New adaptive scale for Canvas ${this.id}, w: ${w}, h: ${h}, scale: ${scale}, edge: ${edge}, isW: ${isW}`);

			
 
				                 this._setRenderingScale(scale);

			
 
				             }

			
 
				         }

			
@@ -1625,6 +1625,7 @@
 
				             let key = `${useMipMap ? "MipMap" : "NoMipMap"}_${anisotropicLevel}`;

			
 
				 

			
 
				             let rd = group._renderableData;

			
 
				+            let rs = rd._renderingScale;

			
 
				             let noResizeScale = rd._noResizeOnScale;

			
 
				             let isCanvas = parent == null;

			
 
				             let scale: Vector2;

			
@@ -1633,6 +1634,8 @@
 
				             } else {

			
 
				                 scale = group.actualScale.multiply(this._canvasLevelScale);

			
 
				             }

			
 
				+            scale.x *= rs;

			
 
				+            scale.y *= rs;

			
 
				 

			
 
				             // Determine size

			
 
				             let size = group.actualSize;

			
--- a/canvas2D/src/Engine/babylon.canvas2dLayoutEngine.ts
+++ b/canvas2D/src/Engine/babylon.canvas2dLayoutEngine.ts
@@ -95,6 +95,7 @@
 
				                     prim.layoutArea = contentArea;

			
 
				                 }

			
 
				             }

			
 
				+            C2DLogging.setPostMessage(() => `Prim: ${prim.id} has layoutArea: ${prim.layoutArea}`);

			
 
				         }

			
 
				 

			
 
				         get isChildPositionAllowed(): boolean {

			
--- a/canvas2D/src/Engine/babylon.group2d.ts
+++ b/canvas2D/src/Engine/babylon.group2d.ts
@@ -350,8 +350,15 @@
 
				 

			
 
				             // Update the Global Transformation and visibility status of the changed primitives

			
 
				             let rd = this._renderableData;

			
 
				-            if ((rd._primDirtyList.length > 0) || context.forceRefreshPrimitive) {

			
 
				-                sortedDirtyList = rd._primDirtyList.sort((a, b) => a.hierarchyDepth - b.hierarchyDepth);

			
 
				+            let curPrimDirtyList = rd._primDirtyList;

			
 
				+            if ((curPrimDirtyList.length > 0) || context.forceRefreshPrimitive) {

			
 
				+                // From now on we use the 'curPrimDirtyList' variable to process the primitives that was marked as dirty

			
 
				+                // But we also allocate a new array in the object's member to get the prim that will be dirty again during the process

			
 
				+                //  and that would need another process next time.

			
 
				+                rd._primDirtyList = new Array<Prim2DBase>();

			
 
				+

			
 
				+                // Sort the primitives to process them from the highest in the tree to the lowest

			
 
				+                sortedDirtyList = curPrimDirtyList.sort((a, b) => a.hierarchyDepth - b.hierarchyDepth);

			
 
				                 this.updateCachedStatesOf(sortedDirtyList, true);

			
 
				             }

			
 
				 

			
@@ -394,7 +401,7 @@
 
				                 this._viewportSize.height = sh;

			
 
				             }

			
 
				 

			
 
				-            if ((rd._primDirtyList.length > 0) || context.forceRefreshPrimitive) {

			
 
				+            if ((curPrimDirtyList.length > 0) || context.forceRefreshPrimitive) {

			
 
				                 // If the group is cached, set the dirty flag to true because of the incoming changes

			
 
				                 this._cacheGroupDirty = this._isCachedGroup;

			
 
				 

			
@@ -411,7 +418,7 @@
 
				                     // Each primitive that changed at least once was added into the primDirtyList, we have to sort this level using

			
 
				                     //  the hierarchyDepth in order to prepare primitives from top to bottom

			
 
				                     if (!sortedDirtyList) {

			
 
				-                        sortedDirtyList = rd._primDirtyList.sort((a, b) => a.hierarchyDepth - b.hierarchyDepth);

			
 
				+                        sortedDirtyList = curPrimDirtyList.sort((a, b) => a.hierarchyDepth - b.hierarchyDepth);

			
 
				                     }

			
 
				 

			
 
				                     sortedDirtyList.forEach(p => {

			
@@ -425,15 +432,14 @@
 
				                 }

			
 
				 

			
 
				                 // Everything is updated, clear the dirty list

			
 
				-                rd._primDirtyList.forEach(p => {

			
 
				+                curPrimDirtyList.forEach(p => {

			
 
				                     if (rd._primNewDirtyList.indexOf(p) === -1) {

			
 
				                         p._resetPropertiesDirty();

			
 
				                     } else {

			
 
				                         p._setFlags(SmartPropertyPrim.flagNeedRefresh);

			
 
				                     }

			
 
				                 });

			
 
				-                rd._primDirtyList.splice(0);

			
 
				-                rd._primDirtyList = rd._primDirtyList.concat(rd._primNewDirtyList);

			
 
				+                rd._primDirtyList = curPrimDirtyList.concat(rd._primNewDirtyList);

			
 
				             }

			
 
				 

			
 
				             // A renderable group has a list of direct children that are also renderable groups, we recurse on them to also prepare them

			
@@ -839,7 +845,7 @@
 
				             let sizeChanged = !Group2D._s.equals(rd._cacheSize);

			
 
				 

			
 
				             if (rd._cacheNode) {

			
 
				-                let size = Group2D._s;

			
 
				+                let size = Group2D._s2;

			
 
				                 rd._cacheNode.getInnerSizeToRef(size);

			
 
				 

			
 
				                 // Check if we have to deallocate because the size is too small

			
--- a/canvas2D/src/Engine/babylon.prim2dBase.ts
+++ b/canvas2D/src/Engine/babylon.prim2dBase.ts
@@ -2529,7 +2529,10 @@
 
				                         return null;

			
 
				                     }

			
 
				                     return this.parent.margin;

			
 
				-                }, () => this._positioningDirty());

			
 
				+                }, () => {

			
 
				+                    this._positioningDirty();

			
 
				+                    this._updatePositioningState();

			
 
				+                });

			
 
				                 this._updatePositioningState();

			
 
				             }

			
 
				             return this._margin;

			
@@ -2607,7 +2610,10 @@
 
				          */

			
 
				         public get marginAlignment(): PrimitiveAlignment {

			
 
				             if (!this._marginAlignment) {

			
 
				-                this._marginAlignment = new PrimitiveAlignment(() => this._positioningDirty());

			
 
				+                this._marginAlignment = new PrimitiveAlignment(() => {

			
 
				+                    this._positioningDirty();

			
 
				+                    this._updatePositioningState();

			
 
				+                });

			
 
				                 this._updatePositioningState();

			
 
				             }

			
 
				             return this._marginAlignment;

			
@@ -4114,7 +4120,7 @@
 
				                 let primNewSize: Size = Prim2DBase._size;

			
 
				                 let hasH = false;

			
 
				                 let hasV = false;

			
 
				-                let paddingApplied = false;

			
 
				+                //let paddingApplied = false;

			
 
				                 let hasPadding = this._hasPadding;

			
 
				 

			
 
				                 // Compute the size

			
@@ -4155,39 +4161,35 @@
 
				                     }

			
 
				                 }

			
 
				 

			
 
				-                if (!isVSizeAuto || !isHSizeAuto) {

			
 
				-                    Prim2DBase._curContentArea.copyFrom(this._contentArea);

			
 
				+                Prim2DBase._curContentArea.copyFrom(this._contentArea);

			
 
				 

			
 
				-                    if (hasPadding) {

			
 
				-                        let area = Prim2DBase._icArea;

			
 
				-                        let zone = Prim2DBase._icZone;

			
 
				+                if (hasPadding) {

			
 
				+                    let area = Prim2DBase._icArea;

			
 
				+                    let zone = Prim2DBase._icZone;

			
 
				 

			
 
				-                        this._getInitialContentAreaToRef(primNewSize, zone, area);

			
 
				-                        area.width = Math.max(0, area.width);

			
 
				-                        area.height = Math.max(0, area.height);

			
 
				+                    this._getInitialContentAreaToRef(primNewSize, zone, area);

			
 
				+                    area.width = Math.max(0, area.width);

			
 
				+                    area.height = Math.max(0, area.height);

			
 
				 

			
 
				-                        this.padding.compute(area, this._paddingOffset, Prim2DBase._size2);

			
 
				+                    this.padding.compute(area, this._paddingOffset, Prim2DBase._size2);

			
 
				 

			
 
				-                        if (!isHSizeAuto) {

			
 
				-                            this._paddingOffset.x += zone.x;

			
 
				-                            this._paddingOffset.z -= zone.z;

			
 
				-                            this._contentArea.width = Prim2DBase._size2.width;

			
 
				-                        }

			
 
				-

			
 
				-                        if (!isVSizeAuto) {

			
 
				-                            this._paddingOffset.y += zone.y;

			
 
				-                            this._paddingOffset.w -= zone.w;

			
 
				-                            this._contentArea.height = Prim2DBase._size2.height;

			
 
				-                        }

			
 
				-                    } else {

			
 
				-                        this._contentArea.copyFrom(primNewSize);

			
 
				+                    if (!isHSizeAuto) {

			
 
				+                        this._paddingOffset.x += zone.x;

			
 
				+                        this._paddingOffset.z -= zone.z;

			
 
				+                        this._contentArea.width = Prim2DBase._size2.width;

			
 
				                     }

			
 
				 

			
 
				-                    if (!Prim2DBase._curContentArea.equals(this._contentArea)) {

			
 
				-                        this._setLayoutDirty();

			
 
				+                    if (!isVSizeAuto) {

			
 
				+                        this._paddingOffset.y += zone.y;

			
 
				+                        this._paddingOffset.w -= zone.w;

			
 
				+                        this._contentArea.height = Prim2DBase._size2.height;

			
 
				                     }

			
 
				+                } else {

			
 
				+                    this._contentArea.copyFrom(primNewSize);

			
 
				+                }

			
 
				 

			
 
				-                    paddingApplied = true;

			
 
				+                if (!Prim2DBase._curContentArea.equals(this._contentArea)) {

			
 
				+                    this._setLayoutDirty();

			
 
				                 }

			
 
				 

			
 
				                 // Finally we apply margin to determine the position

			
@@ -4196,10 +4198,10 @@
 
				                     let mo = this._marginOffset;

			
 
				                     let margin = this.margin;

			
 
				 

			
 
				-                    // We compute margin only if the layoutArea is as big as the contentSize, sometime this code is triggered when the layoutArea is

			
 
				-                    //  not yet set and computing alignment would result into a bad size.

			
 
				+                    // We compute margin only if the layoutArea is "real": a valid object with dimensions greater than 0

			
 
				+                    //  otherwise sometimes this code would be triggered with and invalid layoutArea, resulting to an invalid positioning

			
 
				                     // So we make sure with compute alignment only if the layoutArea is good

			
 
				-                    if (layoutArea && layoutArea.width >= transformedBSize.width && layoutArea.height >= transformedBSize.height) {

			
 
				+                    if (layoutArea && layoutArea.width > 0 && layoutArea.height > 0) {

			
 
				                         margin.computeWithAlignment(layoutArea, transformedBSize, ma, levelScale, mo, Prim2DBase._size2);

			
 
				                     } else {

			
 
				                         mo.copyFromFloats(0, 0, 0, 0);

			
--- a/canvas2D/src/shaders/text2d.fragment.fx
+++ b/canvas2D/src/shaders/text2d.fragment.fx
@@ -26,7 +26,7 @@ void main(void) {
 
				 		discard;

			
 
				 	}

			
 
				 #ifdef FontTexture

			
 
				-	gl_FragColor = vec4(color.xxx*vColor.xyz*vColor.a, vColor.a);

			
 
				+	gl_FragColor = vec4(color.xxx*vColor.xyz*vColor.a, color.x*vColor.a);

			
 
				 #else

			
 
				 	gl_FragColor = color*vColor;

			
 
				 #endif

			
--- a/release/babylon.core.js
+++ b/release/babylon.core.js
--- a/release/babylon.d.ts
+++ b/release/babylon.d.ts
@@ -41,7 +41,6 @@ declare module BABYLON {
 
				         etc1: any;
			
 
				         etc2: any;
			
 
				         astc: any;
			
 
				-        atc: any;
			
 
				         textureFloat: boolean;
			
 
				         vertexArrayObject: boolean;
			
 
				         textureAnisotropicFilterExtension: EXT_texture_filter_anisotropic;
			
@@ -72,6 +71,10 @@ declare module BABYLON {
 
				         static Instances: Engine[];
			
 
				         static readonly LastCreatedEngine: Engine;
			
 
				         static readonly LastCreatedScene: Scene;
			
 
				+        /**
			
 
				+         * Will flag all materials in all scenes in all engines as dirty to trigger new shader compilation
			
 
				+         */
			
 
				+        static MarkAllMaterialsAsDirty(flag: number, predicate?: (mat: Material) => boolean): void;
			
 
				         private static _ALPHA_DISABLE;
			
 
				         private static _ALPHA_ADD;
			
 
				         private static _ALPHA_COMBINE;
			
@@ -339,9 +342,6 @@ declare module BABYLON {
 
				         generateMipMapsForCubemap(texture: WebGLTexture): void;
			
 
				         flushFramebuffer(): void;
			
 
				         restoreDefaultFramebuffer(): void;
			
 
				-        createUniformBuffer(elements: number[] | Float32Array): WebGLBuffer;
			
 
				-        createDynamicUniformBuffer(elements: number[] | Float32Array): WebGLBuffer;
			
 
				-        updateUniformBuffer(uniformBuffer: WebGLBuffer, elements: number[] | Float32Array, offset?: number, count?: number): void;
			
 
				         private _resetVertexBufferBinding();
			
 
				         createVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
			
 
				         createDynamicVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
			
@@ -349,8 +349,6 @@ declare module BABYLON {
 
				         private _resetIndexBufferBinding();
			
 
				         createIndexBuffer(indices: IndicesArray): WebGLBuffer;
			
 
				         bindArrayBuffer(buffer: WebGLBuffer): void;
			
 
				-        bindUniformBuffer(buffer?: WebGLBuffer): void;
			
 
				-        bindUniformBufferBase(buffer: WebGLBuffer, location: number): void;
			
 
				         private bindIndexBuffer(buffer);
			
 
				         private bindBuffer(buffer, target);
			
 
				         updateArrayBuffer(data: Float32Array): void;
			
@@ -381,7 +379,6 @@ declare module BABYLON {
 
				         createEffectForParticles(fragmentName: string, uniformsNames?: string[], samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
			
 
				         createShaderProgram(vertexCode: string, fragmentCode: string, defines: string, context?: WebGLRenderingContext): WebGLProgram;
			
 
				         getUniforms(shaderProgram: WebGLProgram, uniformsNames: string[]): WebGLUniformLocation[];
			
 
				-        bindUniformBlock(shaderProgram: WebGLProgram, blockName: string, index: number): void;
			
 
				         getAttributes(shaderProgram: WebGLProgram, attributesNames: string[]): number[];
			
 
				         enableEffect(effect: Effect): void;
			
 
				         setIntArray(uniform: WebGLUniformLocation, array: Int32Array): void;
			
@@ -434,11 +431,30 @@ declare module BABYLON {
 
				          * @param {Array<string>} formatsAvailable- The list of those format families you have created
			
 
				          * on your server.  Syntax: '-' + format family + '.ktx'.  (Case and order do not matter.)
			
 
				          *
			
 
				-         * Current families are astc, dxt, pvrtc, etc2, atc, & etc1.
			
 
				+         * Current families are astc, dxt, pvrtc, etc2, & etc1.
			
 
				          * @returns The extension selected.
			
 
				          */
			
 
				         setTextureFormatToUse(formatsAvailable: Array<string>): string;
			
 
				-        createTexture(urlArg: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any, fallBack?: WebGLTexture, format?: number): WebGLTexture;
			
 
				+        /**
			
 
				+         * Usually called from BABYLON.Texture.ts.  Passed information to create a WebGLTexture.
			
 
				+         * @param {string} urlArg- This contains one of the following:
			
 
				+         *                         1. A conventional http URL, e.g. 'http://...' or 'file://...'
			
 
				+         *                         2. A base64 string of in-line texture data, e.g. 'data:image/jpg;base64,/...'
			
 
				+         *                         3. An indicator that data being passed using the buffer parameter, e.g. 'data:mytexture.jpg'
			
 
				+         *
			
 
				+         * @param {boolean} noMipmap- When true, no mipmaps shall be generated.  Ignored for compressed textures.  They must be in the file.
			
 
				+         * @param {boolean} invertY- When true, image is flipped when loaded.  You probably want true. Ignored for compressed textures.  Must be flipped in the file.
			
 
				+         * @param {Scene} scene- Needed for loading to the correct scene.
			
 
				+         * @param {number} samplingMode- Mode with should be used sample / access the texture.  Default: TRILINEAR
			
 
				+         * @param {callback} onLoad- Optional callback to be called upon successful completion.
			
 
				+         * @param {callback} onError- Optional callback to be called upon failure.
			
 
				+         * @param {ArrayBuffer | HTMLImageElement} buffer- A source of a file previously fetched as either an ArrayBuffer (compressed or image format) or HTMLImageElement (image format)
			
 
				+         * @param {WebGLTexture} fallback- An internal argument in case the function must be called again, due to etc1 not having alpha capabilities.
			
 
				+         * @param {number} format-  Internal format.  Default: RGB when extension is '.jpg' else RGBA.  Ignored for compressed textures.
			
 
				+         *
			
 
				+         * @returns {WebGLTexture} for assignment back into BABYLON.Texture
			
 
				+         */
			
 
				+        createTexture(urlArg: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: ArrayBuffer | HTMLImageElement, fallBack?: WebGLTexture, format?: number): WebGLTexture;
			
 
				         private _getInternalFormat(format);
			
 
				         updateRawTexture(texture: WebGLTexture, data: ArrayBufferView, format: number, invertY: boolean, compression?: string): void;
			
 
				         createRawTexture(data: ArrayBufferView, width: number, height: number, format: number, generateMipMaps: boolean, invertY: boolean, samplingMode: number, compression?: string): WebGLTexture;
			
@@ -1284,6 +1300,7 @@ declare module BABYLON {
 
				         clearColor: Color4;
			
 
				         ambientColor: Color3;
			
 
				         forceWireframe: boolean;
			
 
				+        private _forcePointsCloud;
			
 
				         forcePointsCloud: boolean;
			
 
				         forceShowBoundingBoxes: boolean;
			
 
				         clipPlane: Plane;
			
@@ -1431,7 +1448,9 @@ declare module BABYLON {
 
				         * is fog enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _fogEnabled;
			
 
				         fogEnabled: boolean;
			
 
				+        private _fogMode;
			
 
				         fogMode: number;
			
 
				         fogColor: Color3;
			
 
				         fogDensity: number;
			
@@ -1441,11 +1460,13 @@ declare module BABYLON {
 
				         * is shadow enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _shadowsEnabled;
			
 
				         shadowsEnabled: boolean;
			
 
				         /**
			
 
				         * is light enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _lightsEnabled;
			
 
				         lightsEnabled: boolean;
			
 
				         /**
			
 
				         * All of the lights added to this scene.
			
@@ -1472,6 +1493,7 @@ declare module BABYLON {
 
				         multiMaterials: MultiMaterial[];
			
 
				         private _defaultMaterial;
			
 
				         readonly defaultMaterial: StandardMaterial;
			
 
				+        private _texturesEnabled;
			
 
				         texturesEnabled: boolean;
			
 
				         textures: BaseTexture[];
			
 
				         particlesEnabled: boolean;
			
@@ -1480,6 +1502,7 @@ declare module BABYLON {
 
				         spriteManagers: SpriteManager[];
			
 
				         layers: Layer[];
			
 
				         highlightLayers: HighlightLayer[];
			
 
				+        private _skeletonsEnabled;
			
 
				         skeletonsEnabled: boolean;
			
 
				         skeletons: Skeleton[];
			
 
				         lensFlaresEnabled: boolean;
			
@@ -1533,6 +1556,7 @@ declare module BABYLON {
 
				         private _animationTime;
			
 
				         animationTimeScale: number;
			
 
				         _cachedMaterial: Material;
			
 
				+        _cachedEffect: Effect;
			
 
				         private _renderId;
			
 
				         private _executeWhenReadyTimeoutId;
			
 
				         private _intermediateRendering;
			
@@ -1574,7 +1598,7 @@ declare module BABYLON {
 
				         constructor(engine: Engine);
			
 
				         readonly debugLayer: DebugLayer;
			
 
				         workerCollisions: boolean;
			
 
				-        readonly SelectionOctree: Octree<AbstractMesh>;
			
 
				+        readonly selectionOctree: Octree<AbstractMesh>;
			
 
				         /**
			
 
				          * The mesh that is currently under the pointer.
			
 
				          * @return {BABYLON.AbstractMesh} mesh under the pointer/mouse cursor or null if none.
			
@@ -1591,6 +1615,7 @@ declare module BABYLON {
 
				          */
			
 
				         readonly pointerY: number;
			
 
				         getCachedMaterial(): Material;
			
 
				+        getCachedEffect(): Effect;
			
 
				         getBoundingBoxRenderer(): BoundingBoxRenderer;
			
 
				         getOutlineRenderer(): OutlineRenderer;
			
 
				         getEngine(): Engine;
			
@@ -1924,6 +1949,11 @@ declare module BABYLON {
 
				          * @param stencil Automatically clears stencil between groups if true and autoClear is true.
			
 
				          */
			
 
				         setRenderingAutoClearDepthStencil(renderingGroupId: number, autoClearDepthStencil: boolean, depth?: boolean, stencil?: boolean): void;
			
 
				+        /**
			
 
				+         * Will flag all materials as dirty to trigger new shader compilation
			
 
				+         * @param predicate If not null, it will be used to specifiy if a material has to be marked as dirty
			
 
				+         */
			
 
				+        markAllMaterialsAsDirty(flag: number, predicate?: (mat: Material) => boolean): void;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -4004,6 +4034,15 @@ declare module BABYLON {
 
				             popup?: boolean;
			
 
				             initialTab?: number;
			
 
				             parentElement?: HTMLElement;
			
 
				+            newColors?: {
			
 
				+                backgroundColor?: string;
			
 
				+                backgroundColorLighter?: string;
			
 
				+                backgroundColorLighter2?: string;
			
 
				+                backgroundColorLighter3?: string;
			
 
				+                color?: string;
			
 
				+                colorTop?: string;
			
 
				+                colorBot?: string;
			
 
				+            };
			
 
				         }): void;
			
 
				     }
			
 
				 }
			
@@ -4379,7 +4418,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, direction: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "DirectionalLight".
			
 
				          */
			
@@ -4443,7 +4481,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, direction: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "HemisphericLight".
			
 
				          */
			
@@ -4468,7 +4505,7 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				-    interface IShadowLight {
			
 
				+    interface IShadowLight extends Light {
			
 
				         id: string;
			
 
				         position: Vector3;
			
 
				         transformedPosition: Vector3;
			
@@ -4512,23 +4549,26 @@ declare module BABYLON {
 
				         specular: Color3;
			
 
				         intensity: number;
			
 
				         range: number;
			
 
				-        includeOnlyWithLayerMask: number;
			
 
				+        private _includedOnlyMeshes;
			
 
				         includedOnlyMeshes: AbstractMesh[];
			
 
				+        private _excludedMeshes;
			
 
				         excludedMeshes: AbstractMesh[];
			
 
				+        private _excludeWithLayerMask;
			
 
				         excludeWithLayerMask: number;
			
 
				+        private _includeOnlyWithLayerMask;
			
 
				+        includeOnlyWithLayerMask: number;
			
 
				+        private _lightmapMode;
			
 
				         lightmapMode: number;
			
 
				         radius: number;
			
 
				         _shadowGenerator: IShadowGenerator;
			
 
				         private _parentedWorldMatrix;
			
 
				         _excludedMeshesIds: string[];
			
 
				         _includedOnlyMeshesIds: string[];
			
 
				-        _uniformBuffer: UniformBuffer;
			
 
				         /**
			
 
				          * Creates a Light object in the scene.
			
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "Light".
			
 
				          */
			
@@ -4538,6 +4578,12 @@ declare module BABYLON {
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				         /**
			
 
				+         * Set the enabled state of this node.
			
 
				+         * @param {boolean} value - the new enabled state
			
 
				+         * @see isEnabled
			
 
				+         */
			
 
				+        setEnabled(value: boolean): void;
			
 
				+        /**
			
 
				          * Returns the Light associated shadow generator.
			
 
				          */
			
 
				         getShadowGenerator(): IShadowGenerator;
			
@@ -4581,6 +4627,10 @@ declare module BABYLON {
 
				          * Parses the passed "parsedLight" and returns a new instanced Light from this parsing.
			
 
				          */
			
 
				         static Parse(parsedLight: any, scene: Scene): Light;
			
 
				+        private _hookArrayForExcluded(array);
			
 
				+        private _hookArrayForIncludedOnly(array);
			
 
				+        private _resyncMeshes();
			
 
				+        _markMeshesAsLightDirty(): void;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -4603,7 +4653,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, position: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "PointLight"
			
 
				          */
			
@@ -4676,7 +4725,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, position: Vector3, direction: Vector3, angle: number, exponent: number, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "SpotLight".
			
 
				          */
			
@@ -5041,9 +5089,7 @@ declare module BABYLON {
 
				         uniqueId: number;
			
 
				         private static _uniqueIdSeed;
			
 
				         private _engine;
			
 
				-        private _uniformBuffersNames;
			
 
				         private _uniformsNames;
			
 
				-        private _uniformOrder;
			
 
				         private _samplers;
			
 
				         private _isReady;
			
 
				         private _compilationError;
			
@@ -5084,8 +5130,6 @@ declare module BABYLON {
 
				         _cacheFloat2(uniformName: string, x: number, y: number): boolean;
			
 
				         _cacheFloat3(uniformName: string, x: number, y: number, z: number): boolean;
			
 
				         _cacheFloat4(uniformName: string, x: number, y: number, z: number, w: number): boolean;
			
 
				-        bindUniformBuffer(buffer: WebGLBuffer, name: string): void;
			
 
				-        bindUniformBlock(blockName: string, index: number): void;
			
 
				         setIntArray(uniformName: string, array: Int32Array): Effect;
			
 
				         setIntArray2(uniformName: string, array: Int32Array): Effect;
			
 
				         setIntArray3(uniformName: string, array: Int32Array): Effect;
			
@@ -5121,6 +5165,7 @@ declare module BABYLON {
 
				 
			
 
				 declare module BABYLON {
			
 
				     class FresnelParameters {
			
 
				+        private _isEnabled;
			
 
				         isEnabled: boolean;
			
 
				         leftColor: Color3;
			
 
				         rightColor: Color3;
			
@@ -5135,6 +5180,18 @@ declare module BABYLON {
 
				 declare module BABYLON {
			
 
				     class MaterialDefines {
			
 
				         _keys: string[];
			
 
				+        _isDirty: boolean;
			
 
				+        _trackIsDirty: boolean;
			
 
				+        _renderId: number;
			
 
				+        _areLightsDirty: boolean;
			
 
				+        _areAttributesDirty: boolean;
			
 
				+        _areTexturesDirty: boolean;
			
 
				+        _areFresnelDirty: boolean;
			
 
				+        _areMiscDirty: boolean;
			
 
				+        _needNormals: boolean;
			
 
				+        _needUVs: boolean;
			
 
				+        constructor(trackIsDirty?: boolean);
			
 
				+        private _reBind(key);
			
 
				         rebuild(): void;
			
 
				         isEqual(other: MaterialDefines): boolean;
			
 
				         cloneTo(other: MaterialDefines): void;
			
@@ -5152,18 +5209,30 @@ declare module BABYLON {
 
				         private static _CounterClockWiseSideOrientation;
			
 
				         static readonly ClockWiseSideOrientation: number;
			
 
				         static readonly CounterClockWiseSideOrientation: number;
			
 
				+        private static _TextureDirtyFlag;
			
 
				+        private static _LightDirtyFlag;
			
 
				+        private static _FresnelDirtyFlag;
			
 
				+        private static _AttributesDirtyFlag;
			
 
				+        private static _MiscDirtyFlag;
			
 
				+        static readonly TextureDirtyFlag: number;
			
 
				+        static readonly LightDirtyFlag: number;
			
 
				+        static readonly FresnelDirtyFlag: number;
			
 
				+        static readonly AttributesDirtyFlag: number;
			
 
				+        static readonly MiscDirtyFlag: number;
			
 
				         id: string;
			
 
				         name: string;
			
 
				         checkReadyOnEveryCall: boolean;
			
 
				         checkReadyOnlyOnce: boolean;
			
 
				         state: string;
			
 
				         alpha: number;
			
 
				+        protected _backFaceCulling: boolean;
			
 
				         backFaceCulling: boolean;
			
 
				         sideOrientation: number;
			
 
				         onCompiled: (effect: Effect) => void;
			
 
				         onError: (effect: Effect, errors: string) => void;
			
 
				         getRenderTargetTextures: () => SmartArray<RenderTargetTexture>;
			
 
				         doNotSerialize: boolean;
			
 
				+        storeEffectOnSubMeshes: boolean;
			
 
				         /**
			
 
				         * An event triggered when the material is disposed.
			
 
				         * @type {BABYLON.Observable}
			
@@ -5185,6 +5254,7 @@ declare module BABYLON {
 
				         onUnBindObservable: Observable<Material>;
			
 
				         alphaMode: number;
			
 
				         disableDepthWrite: boolean;
			
 
				+        private _fogEnabled;
			
 
				         fogEnabled: boolean;
			
 
				         pointSize: number;
			
 
				         zOffset: number;
			
@@ -5196,27 +5266,33 @@ declare module BABYLON {
 
				         private _scene;
			
 
				         private _fillMode;
			
 
				         private _cachedDepthWriteState;
			
 
				-        protected _uniformBuffer: UniformBuffer;
			
 
				         constructor(name: string, scene: Scene, doNotAdd?: boolean);
			
 
				         /**
			
 
				          * @param {boolean} fullDetails - support for multiple levels of logging within scene loading
			
 
				          * subclasses should override adding information pertainent to themselves
			
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				+        /**
			
 
				+         * Child classes can use it to update shaders
			
 
				+         */
			
 
				+        markAsDirty(flag: number): void;
			
 
				         getClassName(): string;
			
 
				         readonly isFrozen: boolean;
			
 
				         freeze(): void;
			
 
				         unfreeze(): void;
			
 
				         isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				+        isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean;
			
 
				         getEffect(): Effect;
			
 
				         getScene(): Scene;
			
 
				         needAlphaBlending(): boolean;
			
 
				         needAlphaTesting(): boolean;
			
 
				         getAlphaTestTexture(): BaseTexture;
			
 
				         markDirty(): void;
			
 
				-        _preBind(): void;
			
 
				+        _preBind(effect?: Effect): void;
			
 
				         bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void;
			
 
				         bindOnlyWorldMatrix(world: Matrix): void;
			
 
				+        protected _afterBind(mesh: Mesh): void;
			
 
				         unbind(): void;
			
 
				         clone(name: string): Material;
			
 
				         getBindedMeshes(): AbstractMesh[];
			
@@ -5229,7 +5305,8 @@ declare module BABYLON {
 
				 
			
 
				 declare module BABYLON {
			
 
				     class MaterialHelper {
			
 
				-        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines, maxSimultaneousLights?: number): boolean;
			
 
				+        static PrepareDefinesForAttributes(mesh: AbstractMesh, defines: MaterialDefines, useInstances: boolean): void;
			
 
				+        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines, maxSimultaneousLights?: number, disableLighting?: boolean): boolean;
			
 
				         static PrepareUniformsAndSamplersList(uniformsList: string[], samplersList: string[], defines: MaterialDefines, maxSimultaneousLights?: number): void;
			
 
				         static HandleFallbacksForShadows(defines: MaterialDefines, fallbacks: EffectFallbacks, maxSimultaneousLights?: number): void;
			
 
				         static PrepareAttributesForBones(attribs: string[], mesh: AbstractMesh, defines: MaterialDefines, fallbacks: EffectFallbacks): void;
			
@@ -5576,6 +5653,26 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				+    class PushMaterial extends Material {
			
 
				+        protected _activeEffect: Effect;
			
 
				+        constructor(name: string, scene: Scene);
			
 
				+        getEffect(): Effect;
			
 
				+        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				+        bindOnlyWorldMatrix(world: Matrix): void;
			
 
				+        bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        protected _afterBind(mesh: Mesh, effect?: Effect): void;
			
 
				+        protected _mustRebind(scene: Scene, effect: Effect): boolean;
			
 
				+        markAsDirty(flag: number): void;
			
 
				+        protected _markAllSubMeshesAsDirty(func: (defines: MaterialDefines) => void): void;
			
 
				+        protected _markAllSubMeshesAsTexturesDirty(): void;
			
 
				+        protected _markAllSubMeshesAsFresnelDirty(): void;
			
 
				+        protected _markAllSubMeshesAsLightsDirty(): void;
			
 
				+        protected _markAllSubMeshesAsAttributesDirty(): void;
			
 
				+        protected _markAllSubMeshesAsMiscDirty(): void;
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+declare module BABYLON {
			
 
				     class ShaderMaterial extends Material {
			
 
				         private _shaderPath;
			
 
				         private _options;
			
@@ -5685,59 +5782,91 @@ declare module BABYLON {
 
				         CAMERACOLORGRADING: boolean;
			
 
				         CAMERACOLORCURVES: boolean;
			
 
				         constructor();
			
 
				+        setReflectionMode(modeToEnable: string): void;
			
 
				     }
			
 
				-    class StandardMaterial extends Material {
			
 
				+    class StandardMaterial extends PushMaterial {
			
 
				+        private _diffuseTexture;
			
 
				         diffuseTexture: BaseTexture;
			
 
				+        private _ambientTexture;
			
 
				         ambientTexture: BaseTexture;
			
 
				+        private _opacityTexture;
			
 
				         opacityTexture: BaseTexture;
			
 
				+        private _reflectionTexture;
			
 
				         reflectionTexture: BaseTexture;
			
 
				+        private _emissiveTexture;
			
 
				         emissiveTexture: BaseTexture;
			
 
				+        private _specularTexture;
			
 
				         specularTexture: BaseTexture;
			
 
				+        private _bumpTexture;
			
 
				         bumpTexture: BaseTexture;
			
 
				+        private _lightmapTexture;
			
 
				         lightmapTexture: BaseTexture;
			
 
				+        private _refractionTexture;
			
 
				         refractionTexture: BaseTexture;
			
 
				         ambientColor: Color3;
			
 
				         diffuseColor: Color3;
			
 
				         specularColor: Color3;
			
 
				         emissiveColor: Color3;
			
 
				         specularPower: number;
			
 
				+        private _useAlphaFromDiffuseTexture;
			
 
				         useAlphaFromDiffuseTexture: boolean;
			
 
				+        private _useEmissiveAsIllumination;
			
 
				         useEmissiveAsIllumination: boolean;
			
 
				+        private _linkEmissiveWithDiffuse;
			
 
				         linkEmissiveWithDiffuse: boolean;
			
 
				-        useReflectionFresnelFromSpecular: boolean;
			
 
				+        private _useSpecularOverAlpha;
			
 
				         useSpecularOverAlpha: boolean;
			
 
				+        private _useReflectionOverAlpha;
			
 
				         useReflectionOverAlpha: boolean;
			
 
				+        private _disableLighting;
			
 
				         disableLighting: boolean;
			
 
				+        private _useParallax;
			
 
				         useParallax: boolean;
			
 
				+        private _useParallaxOcclusion;
			
 
				         useParallaxOcclusion: boolean;
			
 
				         parallaxScaleBias: number;
			
 
				+        private _roughness;
			
 
				         roughness: number;
			
 
				         indexOfRefraction: number;
			
 
				         invertRefractionY: boolean;
			
 
				+        private _useLightmapAsShadowmap;
			
 
				         useLightmapAsShadowmap: boolean;
			
 
				+        private _diffuseFresnelParameters;
			
 
				         diffuseFresnelParameters: FresnelParameters;
			
 
				+        private _opacityFresnelParameters;
			
 
				         opacityFresnelParameters: FresnelParameters;
			
 
				+        private _reflectionFresnelParameters;
			
 
				         reflectionFresnelParameters: FresnelParameters;
			
 
				+        private _refractionFresnelParameters;
			
 
				         refractionFresnelParameters: FresnelParameters;
			
 
				+        private _emissiveFresnelParameters;
			
 
				         emissiveFresnelParameters: FresnelParameters;
			
 
				+        private _useReflectionFresnelFromSpecular;
			
 
				+        useReflectionFresnelFromSpecular: boolean;
			
 
				+        private _useGlossinessFromSpecularMapAlpha;
			
 
				         useGlossinessFromSpecularMapAlpha: boolean;
			
 
				+        private _maxSimultaneousLights;
			
 
				         maxSimultaneousLights: number;
			
 
				         /**
			
 
				          * If sets to true, x component of normal map value will invert (x = 1.0 - x).
			
 
				          */
			
 
				+        private _invertNormalMapX;
			
 
				         invertNormalMapX: boolean;
			
 
				         /**
			
 
				          * If sets to true, y component of normal map value will invert (y = 1.0 - y).
			
 
				          */
			
 
				+        private _invertNormalMapY;
			
 
				         invertNormalMapY: boolean;
			
 
				         /**
			
 
				          * If sets to true and backfaceCulling is false, normals will be flipped on the backside.
			
 
				          */
			
 
				+        private _twoSidedLighting;
			
 
				         twoSidedLighting: boolean;
			
 
				         /**
			
 
				          * Color Grading 2D Lookup Texture.
			
 
				          * This allows special effects like sepia, black and white to sixties rendering style.
			
 
				          */
			
 
				+        private _cameraColorGradingTexture;
			
 
				         cameraColorGradingTexture: BaseTexture;
			
 
				         /**
			
 
				          * The color grading curves provide additional color adjustmnent that is applied after any color grading transform (3D LUT).
			
@@ -5745,13 +5874,12 @@ declare module BABYLON {
 
				          * These are similar to controls found in many professional imaging or colorist software. The global controls are applied to the entire image. For advanced tuning, extra controls are provided to adjust the shadow, midtone and highlight areas of the image;
			
 
				          * corresponding to low luminance, medium luminance, and high luminance areas respectively.
			
 
				          */
			
 
				+        private _cameraColorCurves;
			
 
				         cameraColorCurves: ColorCurves;
			
 
				+        customShaderNameResolve: (shaderName: string) => string;
			
 
				         protected _renderTargets: SmartArray<RenderTargetTexture>;
			
 
				         protected _worldViewProjectionMatrix: Matrix;
			
 
				         protected _globalAmbientColor: Color3;
			
 
				-        protected _renderId: number;
			
 
				-        protected _defines: StandardMaterialDefines;
			
 
				-        protected _cachedDefines: StandardMaterialDefines;
			
 
				         protected _useLogarithmicDepth: boolean;
			
 
				         constructor(name: string, scene: Scene);
			
 
				         getClassName(): string;
			
@@ -5760,69 +5888,39 @@ declare module BABYLON {
 
				         needAlphaTesting(): boolean;
			
 
				         protected _shouldUseAlphaFromDiffuseTexture(): boolean;
			
 
				         getAlphaTestTexture(): BaseTexture;
			
 
				-        protected _checkCache(scene: Scene, mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				-        buildUniformLayout(): void;
			
 
				+        /**
			
 
				+         * Child classes can use it to update shaders
			
 
				+         */
			
 
				+        isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean;
			
 
				         unbind(): void;
			
 
				-        bindOnlyWorldMatrix(world: Matrix): void;
			
 
				-        bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void;
			
 
				         getAnimatables(): IAnimatable[];
			
 
				         dispose(forceDisposeEffect?: boolean, forceDisposeTextures?: boolean): void;
			
 
				         clone(name: string): StandardMaterial;
			
 
				         serialize(): any;
			
 
				         static Parse(source: any, scene: Scene, rootUrl: string): StandardMaterial;
			
 
				+        static _DiffuseTextureEnabled: boolean;
			
 
				         static DiffuseTextureEnabled: boolean;
			
 
				+        static _AmbientTextureEnabled: boolean;
			
 
				         static AmbientTextureEnabled: boolean;
			
 
				+        static _OpacityTextureEnabled: boolean;
			
 
				         static OpacityTextureEnabled: boolean;
			
 
				+        static _ReflectionTextureEnabled: boolean;
			
 
				         static ReflectionTextureEnabled: boolean;
			
 
				+        static _EmissiveTextureEnabled: boolean;
			
 
				         static EmissiveTextureEnabled: boolean;
			
 
				+        static _SpecularTextureEnabled: boolean;
			
 
				         static SpecularTextureEnabled: boolean;
			
 
				+        static _BumpTextureEnabled: boolean;
			
 
				         static BumpTextureEnabled: boolean;
			
 
				-        static FresnelEnabled: boolean;
			
 
				+        static _LightmapTextureEnabled: boolean;
			
 
				         static LightmapTextureEnabled: boolean;
			
 
				+        static _RefractionTextureEnabled: boolean;
			
 
				         static RefractionTextureEnabled: boolean;
			
 
				+        static _ColorGradingTextureEnabled: boolean;
			
 
				         static ColorGradingTextureEnabled: boolean;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-declare module BABYLON {
			
 
				-    class UniformBuffer {
			
 
				-        private _engine;
			
 
				-        private _buffer;
			
 
				-        private _data;
			
 
				-        private _dynamic;
			
 
				-        private _uniformName;
			
 
				-        private _uniformNames;
			
 
				-        private _uniformLocations;
			
 
				-        private _uniformSizes;
			
 
				-        private _uniformLocationPointer;
			
 
				-        private _needSync;
			
 
				-        constructor(engine: Engine, data?: number[], dynamic?: boolean);
			
 
				-        readonly isSync: boolean;
			
 
				-        isDynamic(): boolean;
			
 
				-        getData(): number[];
			
 
				-        getBuffer(): WebGLBuffer;
			
 
				-        private _fillAlignment(size);
			
 
				-        addUniform(name: string, size: number | number[]): void;
			
 
				-        addMatrix(name: string, mat: Matrix): void;
			
 
				-        addFloat2(name: string, x: number, y: number): void;
			
 
				-        addFloat3(name: string, x: number, y: number, z: number): void;
			
 
				-        addColor3(name: string, color: Color3): void;
			
 
				-        addColor4(name: string, color: Color3, alpha: number): void;
			
 
				-        addVector3(name: string, vector: Vector3): void;
			
 
				-        create(): void;
			
 
				-        update(): void;
			
 
				-        updateUniform(uniformName: string, data: number[] | Float32Array): void;
			
 
				-        updateFloat(name: string, x: number): void;
			
 
				-        updateFloat2(name: string, x: number, y: number): void;
			
 
				-        updateFloat3(name: string, x: number, y: number, z: number): void;
			
 
				-        updateFloat4(name: string, x: number, y: number, z: number, w: number): void;
			
 
				-        updateMatrix(name: string, mat: Matrix): void;
			
 
				-        updateVector3(name: string, vector: Vector3): void;
			
 
				-        updateColor3(name: string, color: Color3): void;
			
 
				-        updateColor4(name: string, color: Color3, alpha: number): void;
			
 
				-        updateUniformDirectly(uniformName: string, data: number[]): void;
			
 
				-        dispose(): void;
			
 
				+        static _FresnelEnabled: boolean;
			
 
				+        static FresnelEnabled: boolean;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -5884,7 +5982,7 @@ declare module BABYLON {
 
				          * Stores in the passed array from the passed starting index the red, green, blue values as successive elements.
			
 
				          * Returns the Color3.
			
 
				          */
			
 
				-        toArray(array: number[] | Float32Array, index?: number): Color3;
			
 
				+        toArray(array: number[], index?: number): Color3;
			
 
				         /**
			
 
				          * Returns a new Color4 object from the current Color3 and the passed alpha.
			
 
				          */
			
@@ -6692,7 +6790,7 @@ declare module BABYLON {
 
				          * Populates the passed array from the passed index with the Vector4 coordinates.
			
 
				          * Returns the Vector4.
			
 
				          */
			
 
				-        toArray(array: number[] | Float32Array, index?: number): Vector4;
			
 
				+        toArray(array: number[], index?: number): Vector4;
			
 
				         /**
			
 
				          * Adds the passed vector to the current Vector4.
			
 
				          * Returns the updated Vector4.
			
@@ -7912,7 +8010,9 @@ declare module BABYLON {
 
				         showSubMeshesBoundingBox: boolean;
			
 
				         isBlocker: boolean;
			
 
				         renderingGroupId: number;
			
 
				+        private _material;
			
 
				         material: Material;
			
 
				+        private _receiveShadows;
			
 
				         receiveShadows: boolean;
			
 
				         renderOutline: boolean;
			
 
				         outlineColor: Color3;
			
@@ -7920,12 +8020,17 @@ declare module BABYLON {
 
				         renderOverlay: boolean;
			
 
				         overlayColor: Color3;
			
 
				         overlayAlpha: number;
			
 
				+        private _hasVertexAlpha;
			
 
				         hasVertexAlpha: boolean;
			
 
				+        private _useVertexColors;
			
 
				         useVertexColors: boolean;
			
 
				-        applyFog: boolean;
			
 
				+        private _computeBonesUsingShaders;
			
 
				         computeBonesUsingShaders: boolean;
			
 
				-        scalingDeterminant: number;
			
 
				+        private _numBoneInfluencers;
			
 
				         numBoneInfluencers: number;
			
 
				+        private _applyFog;
			
 
				+        applyFog: boolean;
			
 
				+        scalingDeterminant: number;
			
 
				         useOctreeForRenderingSelection: boolean;
			
 
				         useOctreeForPicking: boolean;
			
 
				         useOctreeForCollisions: boolean;
			
@@ -7963,7 +8068,6 @@ declare module BABYLON {
 
				         _positions: Vector3[];
			
 
				         private _isDirty;
			
 
				         _masterMesh: AbstractMesh;
			
 
				-        _materialDefines: MaterialDefines;
			
 
				         _boundingInfo: BoundingInfo;
			
 
				         private _pivotMatrix;
			
 
				         _isDisposed: boolean;
			
@@ -7974,6 +8078,7 @@ declare module BABYLON {
 
				         private _isWorldMatrixFrozen;
			
 
				         _unIndexed: boolean;
			
 
				         _poseMatrix: Matrix;
			
 
				+        _lightSources: Light[];
			
 
				         _waitingActions: any;
			
 
				         _waitingFreezeWorldMatrix: boolean;
			
 
				         private _skeleton;
			
@@ -7988,6 +8093,13 @@ declare module BABYLON {
 
				          * @param {boolean} fullDetails - support for multiple levels of logging within scene loading
			
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				+        _resyncLightSources(): void;
			
 
				+        _resyncLighSource(light: Light): void;
			
 
				+        _removeLightSource(light: Light): void;
			
 
				+        private _markSubMeshesAsDirty(func);
			
 
				+        _markSubMeshesAsLightDirty(): void;
			
 
				+        _markSubMeshesAsAttributesDirty(): void;
			
 
				+        _markSubMeshesAsMiscDirty(): void;
			
 
				         /**
			
 
				          * Rotation property : a Vector3 depicting the rotation value in radians around each local axis X, Y, Z.
			
 
				          * If rotation quaternion is set, this Vector3 will (almost always) be the Zero vector!
			
@@ -10738,6 +10850,10 @@ declare module BABYLON {
 
				         _alphaIndex: number;
			
 
				         _distanceToCamera: number;
			
 
				         _id: number;
			
 
				+        _materialDefines: MaterialDefines;
			
 
				+        private _materialEffect;
			
 
				+        readonly effect: Effect;
			
 
				+        setEffect(effect: Effect, defines?: MaterialDefines): void;
			
 
				         constructor(materialIndex: number, verticesStart: number, verticesCount: number, indexStart: any, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh, createBoundingBox?: boolean);
			
 
				         readonly IsGlobal: boolean;
			
 
				         /**
			
@@ -12968,6 +13084,7 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				+    function expandToProperty(callback: string): (target: any, propertyKey: string) => void;
			
 
				     function serialize(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
 
				     function serializeAsTexture(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
 
				     function serializeAsColor3(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
@@ -13656,7 +13773,8 @@ declare module BABYLON {
 
				         dispose(): void;
			
 
				         concat(array: any): void;
			
 
				         concatWithNoDuplicate(array: any): void;
			
 
				-        indexOf(value: any): number;
			
 
				+        indexOf(value: T): number;
			
 
				+        contains(value: T): boolean;
			
 
				         private static _GlobalId;
			
 
				     }
			
 
				 }
			
@@ -14621,10 +14739,12 @@ declare module BABYLON.Internals {
 
				 declare module BABYLON {
			
 
				     class BaseTexture {
			
 
				         name: string;
			
 
				+        private _hasAlpha;
			
 
				         hasAlpha: boolean;
			
 
				         getAlphaFromRGB: boolean;
			
 
				         level: number;
			
 
				         coordinatesIndex: number;
			
 
				+        private _coordinatesMode;
			
 
				         coordinatesMode: number;
			
 
				         wrapU: number;
			
 
				         wrapV: number;
			
--- a/release/babylon.js
+++ b/release/babylon.js
--- a/release/babylon.max.js
+++ b/release/babylon.max.js
--- a/release/babylon.module.d.ts
+++ b/release/babylon.module.d.ts
@@ -41,7 +41,6 @@ declare module BABYLON {
 
				         etc1: any;
			
 
				         etc2: any;
			
 
				         astc: any;
			
 
				-        atc: any;
			
 
				         textureFloat: boolean;
			
 
				         vertexArrayObject: boolean;
			
 
				         textureAnisotropicFilterExtension: EXT_texture_filter_anisotropic;
			
@@ -72,6 +71,10 @@ declare module BABYLON {
 
				         static Instances: Engine[];
			
 
				         static readonly LastCreatedEngine: Engine;
			
 
				         static readonly LastCreatedScene: Scene;
			
 
				+        /**
			
 
				+         * Will flag all materials in all scenes in all engines as dirty to trigger new shader compilation
			
 
				+         */
			
 
				+        static MarkAllMaterialsAsDirty(flag: number, predicate?: (mat: Material) => boolean): void;
			
 
				         private static _ALPHA_DISABLE;
			
 
				         private static _ALPHA_ADD;
			
 
				         private static _ALPHA_COMBINE;
			
@@ -339,9 +342,6 @@ declare module BABYLON {
 
				         generateMipMapsForCubemap(texture: WebGLTexture): void;
			
 
				         flushFramebuffer(): void;
			
 
				         restoreDefaultFramebuffer(): void;
			
 
				-        createUniformBuffer(elements: number[] | Float32Array): WebGLBuffer;
			
 
				-        createDynamicUniformBuffer(elements: number[] | Float32Array): WebGLBuffer;
			
 
				-        updateUniformBuffer(uniformBuffer: WebGLBuffer, elements: number[] | Float32Array, offset?: number, count?: number): void;
			
 
				         private _resetVertexBufferBinding();
			
 
				         createVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
			
 
				         createDynamicVertexBuffer(vertices: number[] | Float32Array): WebGLBuffer;
			
@@ -349,8 +349,6 @@ declare module BABYLON {
 
				         private _resetIndexBufferBinding();
			
 
				         createIndexBuffer(indices: IndicesArray): WebGLBuffer;
			
 
				         bindArrayBuffer(buffer: WebGLBuffer): void;
			
 
				-        bindUniformBuffer(buffer?: WebGLBuffer): void;
			
 
				-        bindUniformBufferBase(buffer: WebGLBuffer, location: number): void;
			
 
				         private bindIndexBuffer(buffer);
			
 
				         private bindBuffer(buffer, target);
			
 
				         updateArrayBuffer(data: Float32Array): void;
			
@@ -381,7 +379,6 @@ declare module BABYLON {
 
				         createEffectForParticles(fragmentName: string, uniformsNames?: string[], samplers?: string[], defines?: string, fallbacks?: EffectFallbacks, onCompiled?: (effect: Effect) => void, onError?: (effect: Effect, errors: string) => void): Effect;
			
 
				         createShaderProgram(vertexCode: string, fragmentCode: string, defines: string, context?: WebGLRenderingContext): WebGLProgram;
			
 
				         getUniforms(shaderProgram: WebGLProgram, uniformsNames: string[]): WebGLUniformLocation[];
			
 
				-        bindUniformBlock(shaderProgram: WebGLProgram, blockName: string, index: number): void;
			
 
				         getAttributes(shaderProgram: WebGLProgram, attributesNames: string[]): number[];
			
 
				         enableEffect(effect: Effect): void;
			
 
				         setIntArray(uniform: WebGLUniformLocation, array: Int32Array): void;
			
@@ -434,11 +431,30 @@ declare module BABYLON {
 
				          * @param {Array<string>} formatsAvailable- The list of those format families you have created
			
 
				          * on your server.  Syntax: '-' + format family + '.ktx'.  (Case and order do not matter.)
			
 
				          *
			
 
				-         * Current families are astc, dxt, pvrtc, etc2, atc, & etc1.
			
 
				+         * Current families are astc, dxt, pvrtc, etc2, & etc1.
			
 
				          * @returns The extension selected.
			
 
				          */
			
 
				         setTextureFormatToUse(formatsAvailable: Array<string>): string;
			
 
				-        createTexture(urlArg: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: any, fallBack?: WebGLTexture, format?: number): WebGLTexture;
			
 
				+        /**
			
 
				+         * Usually called from BABYLON.Texture.ts.  Passed information to create a WebGLTexture.
			
 
				+         * @param {string} urlArg- This contains one of the following:
			
 
				+         *                         1. A conventional http URL, e.g. 'http://...' or 'file://...'
			
 
				+         *                         2. A base64 string of in-line texture data, e.g. 'data:image/jpg;base64,/...'
			
 
				+         *                         3. An indicator that data being passed using the buffer parameter, e.g. 'data:mytexture.jpg'
			
 
				+         *
			
 
				+         * @param {boolean} noMipmap- When true, no mipmaps shall be generated.  Ignored for compressed textures.  They must be in the file.
			
 
				+         * @param {boolean} invertY- When true, image is flipped when loaded.  You probably want true. Ignored for compressed textures.  Must be flipped in the file.
			
 
				+         * @param {Scene} scene- Needed for loading to the correct scene.
			
 
				+         * @param {number} samplingMode- Mode with should be used sample / access the texture.  Default: TRILINEAR
			
 
				+         * @param {callback} onLoad- Optional callback to be called upon successful completion.
			
 
				+         * @param {callback} onError- Optional callback to be called upon failure.
			
 
				+         * @param {ArrayBuffer | HTMLImageElement} buffer- A source of a file previously fetched as either an ArrayBuffer (compressed or image format) or HTMLImageElement (image format)
			
 
				+         * @param {WebGLTexture} fallback- An internal argument in case the function must be called again, due to etc1 not having alpha capabilities.
			
 
				+         * @param {number} format-  Internal format.  Default: RGB when extension is '.jpg' else RGBA.  Ignored for compressed textures.
			
 
				+         *
			
 
				+         * @returns {WebGLTexture} for assignment back into BABYLON.Texture
			
 
				+         */
			
 
				+        createTexture(urlArg: string, noMipmap: boolean, invertY: boolean, scene: Scene, samplingMode?: number, onLoad?: () => void, onError?: () => void, buffer?: ArrayBuffer | HTMLImageElement, fallBack?: WebGLTexture, format?: number): WebGLTexture;
			
 
				         private _getInternalFormat(format);
			
 
				         updateRawTexture(texture: WebGLTexture, data: ArrayBufferView, format: number, invertY: boolean, compression?: string): void;
			
 
				         createRawTexture(data: ArrayBufferView, width: number, height: number, format: number, generateMipMaps: boolean, invertY: boolean, samplingMode: number, compression?: string): WebGLTexture;
			
@@ -1284,6 +1300,7 @@ declare module BABYLON {
 
				         clearColor: Color4;
			
 
				         ambientColor: Color3;
			
 
				         forceWireframe: boolean;
			
 
				+        private _forcePointsCloud;
			
 
				         forcePointsCloud: boolean;
			
 
				         forceShowBoundingBoxes: boolean;
			
 
				         clipPlane: Plane;
			
@@ -1431,7 +1448,9 @@ declare module BABYLON {
 
				         * is fog enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _fogEnabled;
			
 
				         fogEnabled: boolean;
			
 
				+        private _fogMode;
			
 
				         fogMode: number;
			
 
				         fogColor: Color3;
			
 
				         fogDensity: number;
			
@@ -1441,11 +1460,13 @@ declare module BABYLON {
 
				         * is shadow enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _shadowsEnabled;
			
 
				         shadowsEnabled: boolean;
			
 
				         /**
			
 
				         * is light enabled on this scene.
			
 
				         * @type {boolean}
			
 
				         */
			
 
				+        private _lightsEnabled;
			
 
				         lightsEnabled: boolean;
			
 
				         /**
			
 
				         * All of the lights added to this scene.
			
@@ -1472,6 +1493,7 @@ declare module BABYLON {
 
				         multiMaterials: MultiMaterial[];
			
 
				         private _defaultMaterial;
			
 
				         readonly defaultMaterial: StandardMaterial;
			
 
				+        private _texturesEnabled;
			
 
				         texturesEnabled: boolean;
			
 
				         textures: BaseTexture[];
			
 
				         particlesEnabled: boolean;
			
@@ -1480,6 +1502,7 @@ declare module BABYLON {
 
				         spriteManagers: SpriteManager[];
			
 
				         layers: Layer[];
			
 
				         highlightLayers: HighlightLayer[];
			
 
				+        private _skeletonsEnabled;
			
 
				         skeletonsEnabled: boolean;
			
 
				         skeletons: Skeleton[];
			
 
				         lensFlaresEnabled: boolean;
			
@@ -1533,6 +1556,7 @@ declare module BABYLON {
 
				         private _animationTime;
			
 
				         animationTimeScale: number;
			
 
				         _cachedMaterial: Material;
			
 
				+        _cachedEffect: Effect;
			
 
				         private _renderId;
			
 
				         private _executeWhenReadyTimeoutId;
			
 
				         private _intermediateRendering;
			
@@ -1574,7 +1598,7 @@ declare module BABYLON {
 
				         constructor(engine: Engine);
			
 
				         readonly debugLayer: DebugLayer;
			
 
				         workerCollisions: boolean;
			
 
				-        readonly SelectionOctree: Octree<AbstractMesh>;
			
 
				+        readonly selectionOctree: Octree<AbstractMesh>;
			
 
				         /**
			
 
				          * The mesh that is currently under the pointer.
			
 
				          * @return {BABYLON.AbstractMesh} mesh under the pointer/mouse cursor or null if none.
			
@@ -1591,6 +1615,7 @@ declare module BABYLON {
 
				          */
			
 
				         readonly pointerY: number;
			
 
				         getCachedMaterial(): Material;
			
 
				+        getCachedEffect(): Effect;
			
 
				         getBoundingBoxRenderer(): BoundingBoxRenderer;
			
 
				         getOutlineRenderer(): OutlineRenderer;
			
 
				         getEngine(): Engine;
			
@@ -1924,6 +1949,11 @@ declare module BABYLON {
 
				          * @param stencil Automatically clears stencil between groups if true and autoClear is true.
			
 
				          */
			
 
				         setRenderingAutoClearDepthStencil(renderingGroupId: number, autoClearDepthStencil: boolean, depth?: boolean, stencil?: boolean): void;
			
 
				+        /**
			
 
				+         * Will flag all materials as dirty to trigger new shader compilation
			
 
				+         * @param predicate If not null, it will be used to specifiy if a material has to be marked as dirty
			
 
				+         */
			
 
				+        markAllMaterialsAsDirty(flag: number, predicate?: (mat: Material) => boolean): void;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -4004,6 +4034,15 @@ declare module BABYLON {
 
				             popup?: boolean;
			
 
				             initialTab?: number;
			
 
				             parentElement?: HTMLElement;
			
 
				+            newColors?: {
			
 
				+                backgroundColor?: string;
			
 
				+                backgroundColorLighter?: string;
			
 
				+                backgroundColorLighter2?: string;
			
 
				+                backgroundColorLighter3?: string;
			
 
				+                color?: string;
			
 
				+                colorTop?: string;
			
 
				+                colorBot?: string;
			
 
				+            };
			
 
				         }): void;
			
 
				     }
			
 
				 }
			
@@ -4379,7 +4418,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, direction: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "DirectionalLight".
			
 
				          */
			
@@ -4443,7 +4481,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, direction: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "HemisphericLight".
			
 
				          */
			
@@ -4468,7 +4505,7 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				-    interface IShadowLight {
			
 
				+    interface IShadowLight extends Light {
			
 
				         id: string;
			
 
				         position: Vector3;
			
 
				         transformedPosition: Vector3;
			
@@ -4512,23 +4549,26 @@ declare module BABYLON {
 
				         specular: Color3;
			
 
				         intensity: number;
			
 
				         range: number;
			
 
				-        includeOnlyWithLayerMask: number;
			
 
				+        private _includedOnlyMeshes;
			
 
				         includedOnlyMeshes: AbstractMesh[];
			
 
				+        private _excludedMeshes;
			
 
				         excludedMeshes: AbstractMesh[];
			
 
				+        private _excludeWithLayerMask;
			
 
				         excludeWithLayerMask: number;
			
 
				+        private _includeOnlyWithLayerMask;
			
 
				+        includeOnlyWithLayerMask: number;
			
 
				+        private _lightmapMode;
			
 
				         lightmapMode: number;
			
 
				         radius: number;
			
 
				         _shadowGenerator: IShadowGenerator;
			
 
				         private _parentedWorldMatrix;
			
 
				         _excludedMeshesIds: string[];
			
 
				         _includedOnlyMeshesIds: string[];
			
 
				-        _uniformBuffer: UniformBuffer;
			
 
				         /**
			
 
				          * Creates a Light object in the scene.
			
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "Light".
			
 
				          */
			
@@ -4538,6 +4578,12 @@ declare module BABYLON {
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				         /**
			
 
				+         * Set the enabled state of this node.
			
 
				+         * @param {boolean} value - the new enabled state
			
 
				+         * @see isEnabled
			
 
				+         */
			
 
				+        setEnabled(value: boolean): void;
			
 
				+        /**
			
 
				          * Returns the Light associated shadow generator.
			
 
				          */
			
 
				         getShadowGenerator(): IShadowGenerator;
			
@@ -4581,6 +4627,10 @@ declare module BABYLON {
 
				          * Parses the passed "parsedLight" and returns a new instanced Light from this parsing.
			
 
				          */
			
 
				         static Parse(parsedLight: any, scene: Scene): Light;
			
 
				+        private _hookArrayForExcluded(array);
			
 
				+        private _hookArrayForIncludedOnly(array);
			
 
				+        private _resyncMeshes();
			
 
				+        _markMeshesAsLightDirty(): void;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -4603,7 +4653,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, position: Vector3, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "PointLight"
			
 
				          */
			
@@ -4676,7 +4725,6 @@ declare module BABYLON {
 
				          * Documentation : http://doc.babylonjs.com/tutorials/lights
			
 
				          */
			
 
				         constructor(name: string, position: Vector3, direction: Vector3, angle: number, exponent: number, scene: Scene);
			
 
				-        protected _buildUniformLayout(): void;
			
 
				         /**
			
 
				          * Returns the string "SpotLight".
			
 
				          */
			
@@ -5041,9 +5089,7 @@ declare module BABYLON {
 
				         uniqueId: number;
			
 
				         private static _uniqueIdSeed;
			
 
				         private _engine;
			
 
				-        private _uniformBuffersNames;
			
 
				         private _uniformsNames;
			
 
				-        private _uniformOrder;
			
 
				         private _samplers;
			
 
				         private _isReady;
			
 
				         private _compilationError;
			
@@ -5084,8 +5130,6 @@ declare module BABYLON {
 
				         _cacheFloat2(uniformName: string, x: number, y: number): boolean;
			
 
				         _cacheFloat3(uniformName: string, x: number, y: number, z: number): boolean;
			
 
				         _cacheFloat4(uniformName: string, x: number, y: number, z: number, w: number): boolean;
			
 
				-        bindUniformBuffer(buffer: WebGLBuffer, name: string): void;
			
 
				-        bindUniformBlock(blockName: string, index: number): void;
			
 
				         setIntArray(uniformName: string, array: Int32Array): Effect;
			
 
				         setIntArray2(uniformName: string, array: Int32Array): Effect;
			
 
				         setIntArray3(uniformName: string, array: Int32Array): Effect;
			
@@ -5121,6 +5165,7 @@ declare module BABYLON {
 
				 
			
 
				 declare module BABYLON {
			
 
				     class FresnelParameters {
			
 
				+        private _isEnabled;
			
 
				         isEnabled: boolean;
			
 
				         leftColor: Color3;
			
 
				         rightColor: Color3;
			
@@ -5135,6 +5180,18 @@ declare module BABYLON {
 
				 declare module BABYLON {
			
 
				     class MaterialDefines {
			
 
				         _keys: string[];
			
 
				+        _isDirty: boolean;
			
 
				+        _trackIsDirty: boolean;
			
 
				+        _renderId: number;
			
 
				+        _areLightsDirty: boolean;
			
 
				+        _areAttributesDirty: boolean;
			
 
				+        _areTexturesDirty: boolean;
			
 
				+        _areFresnelDirty: boolean;
			
 
				+        _areMiscDirty: boolean;
			
 
				+        _needNormals: boolean;
			
 
				+        _needUVs: boolean;
			
 
				+        constructor(trackIsDirty?: boolean);
			
 
				+        private _reBind(key);
			
 
				         rebuild(): void;
			
 
				         isEqual(other: MaterialDefines): boolean;
			
 
				         cloneTo(other: MaterialDefines): void;
			
@@ -5152,18 +5209,30 @@ declare module BABYLON {
 
				         private static _CounterClockWiseSideOrientation;
			
 
				         static readonly ClockWiseSideOrientation: number;
			
 
				         static readonly CounterClockWiseSideOrientation: number;
			
 
				+        private static _TextureDirtyFlag;
			
 
				+        private static _LightDirtyFlag;
			
 
				+        private static _FresnelDirtyFlag;
			
 
				+        private static _AttributesDirtyFlag;
			
 
				+        private static _MiscDirtyFlag;
			
 
				+        static readonly TextureDirtyFlag: number;
			
 
				+        static readonly LightDirtyFlag: number;
			
 
				+        static readonly FresnelDirtyFlag: number;
			
 
				+        static readonly AttributesDirtyFlag: number;
			
 
				+        static readonly MiscDirtyFlag: number;
			
 
				         id: string;
			
 
				         name: string;
			
 
				         checkReadyOnEveryCall: boolean;
			
 
				         checkReadyOnlyOnce: boolean;
			
 
				         state: string;
			
 
				         alpha: number;
			
 
				+        protected _backFaceCulling: boolean;
			
 
				         backFaceCulling: boolean;
			
 
				         sideOrientation: number;
			
 
				         onCompiled: (effect: Effect) => void;
			
 
				         onError: (effect: Effect, errors: string) => void;
			
 
				         getRenderTargetTextures: () => SmartArray<RenderTargetTexture>;
			
 
				         doNotSerialize: boolean;
			
 
				+        storeEffectOnSubMeshes: boolean;
			
 
				         /**
			
 
				         * An event triggered when the material is disposed.
			
 
				         * @type {BABYLON.Observable}
			
@@ -5185,6 +5254,7 @@ declare module BABYLON {
 
				         onUnBindObservable: Observable<Material>;
			
 
				         alphaMode: number;
			
 
				         disableDepthWrite: boolean;
			
 
				+        private _fogEnabled;
			
 
				         fogEnabled: boolean;
			
 
				         pointSize: number;
			
 
				         zOffset: number;
			
@@ -5196,27 +5266,33 @@ declare module BABYLON {
 
				         private _scene;
			
 
				         private _fillMode;
			
 
				         private _cachedDepthWriteState;
			
 
				-        protected _uniformBuffer: UniformBuffer;
			
 
				         constructor(name: string, scene: Scene, doNotAdd?: boolean);
			
 
				         /**
			
 
				          * @param {boolean} fullDetails - support for multiple levels of logging within scene loading
			
 
				          * subclasses should override adding information pertainent to themselves
			
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				+        /**
			
 
				+         * Child classes can use it to update shaders
			
 
				+         */
			
 
				+        markAsDirty(flag: number): void;
			
 
				         getClassName(): string;
			
 
				         readonly isFrozen: boolean;
			
 
				         freeze(): void;
			
 
				         unfreeze(): void;
			
 
				         isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				+        isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean;
			
 
				         getEffect(): Effect;
			
 
				         getScene(): Scene;
			
 
				         needAlphaBlending(): boolean;
			
 
				         needAlphaTesting(): boolean;
			
 
				         getAlphaTestTexture(): BaseTexture;
			
 
				         markDirty(): void;
			
 
				-        _preBind(): void;
			
 
				+        _preBind(effect?: Effect): void;
			
 
				         bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void;
			
 
				         bindOnlyWorldMatrix(world: Matrix): void;
			
 
				+        protected _afterBind(mesh: Mesh): void;
			
 
				         unbind(): void;
			
 
				         clone(name: string): Material;
			
 
				         getBindedMeshes(): AbstractMesh[];
			
@@ -5229,7 +5305,8 @@ declare module BABYLON {
 
				 
			
 
				 declare module BABYLON {
			
 
				     class MaterialHelper {
			
 
				-        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines, maxSimultaneousLights?: number): boolean;
			
 
				+        static PrepareDefinesForAttributes(mesh: AbstractMesh, defines: MaterialDefines, useInstances: boolean): void;
			
 
				+        static PrepareDefinesForLights(scene: Scene, mesh: AbstractMesh, defines: MaterialDefines, maxSimultaneousLights?: number, disableLighting?: boolean): boolean;
			
 
				         static PrepareUniformsAndSamplersList(uniformsList: string[], samplersList: string[], defines: MaterialDefines, maxSimultaneousLights?: number): void;
			
 
				         static HandleFallbacksForShadows(defines: MaterialDefines, fallbacks: EffectFallbacks, maxSimultaneousLights?: number): void;
			
 
				         static PrepareAttributesForBones(attribs: string[], mesh: AbstractMesh, defines: MaterialDefines, fallbacks: EffectFallbacks): void;
			
@@ -5576,6 +5653,26 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				+    class PushMaterial extends Material {
			
 
				+        protected _activeEffect: Effect;
			
 
				+        constructor(name: string, scene: Scene);
			
 
				+        getEffect(): Effect;
			
 
				+        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				+        bindOnlyWorldMatrix(world: Matrix): void;
			
 
				+        bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        protected _afterBind(mesh: Mesh, effect?: Effect): void;
			
 
				+        protected _mustRebind(scene: Scene, effect: Effect): boolean;
			
 
				+        markAsDirty(flag: number): void;
			
 
				+        protected _markAllSubMeshesAsDirty(func: (defines: MaterialDefines) => void): void;
			
 
				+        protected _markAllSubMeshesAsTexturesDirty(): void;
			
 
				+        protected _markAllSubMeshesAsFresnelDirty(): void;
			
 
				+        protected _markAllSubMeshesAsLightsDirty(): void;
			
 
				+        protected _markAllSubMeshesAsAttributesDirty(): void;
			
 
				+        protected _markAllSubMeshesAsMiscDirty(): void;
			
 
				+    }
			
 
				+}
			
 
				+
			
 
				+declare module BABYLON {
			
 
				     class ShaderMaterial extends Material {
			
 
				         private _shaderPath;
			
 
				         private _options;
			
@@ -5685,59 +5782,91 @@ declare module BABYLON {
 
				         CAMERACOLORGRADING: boolean;
			
 
				         CAMERACOLORCURVES: boolean;
			
 
				         constructor();
			
 
				+        setReflectionMode(modeToEnable: string): void;
			
 
				     }
			
 
				-    class StandardMaterial extends Material {
			
 
				+    class StandardMaterial extends PushMaterial {
			
 
				+        private _diffuseTexture;
			
 
				         diffuseTexture: BaseTexture;
			
 
				+        private _ambientTexture;
			
 
				         ambientTexture: BaseTexture;
			
 
				+        private _opacityTexture;
			
 
				         opacityTexture: BaseTexture;
			
 
				+        private _reflectionTexture;
			
 
				         reflectionTexture: BaseTexture;
			
 
				+        private _emissiveTexture;
			
 
				         emissiveTexture: BaseTexture;
			
 
				+        private _specularTexture;
			
 
				         specularTexture: BaseTexture;
			
 
				+        private _bumpTexture;
			
 
				         bumpTexture: BaseTexture;
			
 
				+        private _lightmapTexture;
			
 
				         lightmapTexture: BaseTexture;
			
 
				+        private _refractionTexture;
			
 
				         refractionTexture: BaseTexture;
			
 
				         ambientColor: Color3;
			
 
				         diffuseColor: Color3;
			
 
				         specularColor: Color3;
			
 
				         emissiveColor: Color3;
			
 
				         specularPower: number;
			
 
				+        private _useAlphaFromDiffuseTexture;
			
 
				         useAlphaFromDiffuseTexture: boolean;
			
 
				+        private _useEmissiveAsIllumination;
			
 
				         useEmissiveAsIllumination: boolean;
			
 
				+        private _linkEmissiveWithDiffuse;
			
 
				         linkEmissiveWithDiffuse: boolean;
			
 
				-        useReflectionFresnelFromSpecular: boolean;
			
 
				+        private _useSpecularOverAlpha;
			
 
				         useSpecularOverAlpha: boolean;
			
 
				+        private _useReflectionOverAlpha;
			
 
				         useReflectionOverAlpha: boolean;
			
 
				+        private _disableLighting;
			
 
				         disableLighting: boolean;
			
 
				+        private _useParallax;
			
 
				         useParallax: boolean;
			
 
				+        private _useParallaxOcclusion;
			
 
				         useParallaxOcclusion: boolean;
			
 
				         parallaxScaleBias: number;
			
 
				+        private _roughness;
			
 
				         roughness: number;
			
 
				         indexOfRefraction: number;
			
 
				         invertRefractionY: boolean;
			
 
				+        private _useLightmapAsShadowmap;
			
 
				         useLightmapAsShadowmap: boolean;
			
 
				+        private _diffuseFresnelParameters;
			
 
				         diffuseFresnelParameters: FresnelParameters;
			
 
				+        private _opacityFresnelParameters;
			
 
				         opacityFresnelParameters: FresnelParameters;
			
 
				+        private _reflectionFresnelParameters;
			
 
				         reflectionFresnelParameters: FresnelParameters;
			
 
				+        private _refractionFresnelParameters;
			
 
				         refractionFresnelParameters: FresnelParameters;
			
 
				+        private _emissiveFresnelParameters;
			
 
				         emissiveFresnelParameters: FresnelParameters;
			
 
				+        private _useReflectionFresnelFromSpecular;
			
 
				+        useReflectionFresnelFromSpecular: boolean;
			
 
				+        private _useGlossinessFromSpecularMapAlpha;
			
 
				         useGlossinessFromSpecularMapAlpha: boolean;
			
 
				+        private _maxSimultaneousLights;
			
 
				         maxSimultaneousLights: number;
			
 
				         /**
			
 
				          * If sets to true, x component of normal map value will invert (x = 1.0 - x).
			
 
				          */
			
 
				+        private _invertNormalMapX;
			
 
				         invertNormalMapX: boolean;
			
 
				         /**
			
 
				          * If sets to true, y component of normal map value will invert (y = 1.0 - y).
			
 
				          */
			
 
				+        private _invertNormalMapY;
			
 
				         invertNormalMapY: boolean;
			
 
				         /**
			
 
				          * If sets to true and backfaceCulling is false, normals will be flipped on the backside.
			
 
				          */
			
 
				+        private _twoSidedLighting;
			
 
				         twoSidedLighting: boolean;
			
 
				         /**
			
 
				          * Color Grading 2D Lookup Texture.
			
 
				          * This allows special effects like sepia, black and white to sixties rendering style.
			
 
				          */
			
 
				+        private _cameraColorGradingTexture;
			
 
				         cameraColorGradingTexture: BaseTexture;
			
 
				         /**
			
 
				          * The color grading curves provide additional color adjustmnent that is applied after any color grading transform (3D LUT).
			
@@ -5745,13 +5874,12 @@ declare module BABYLON {
 
				          * These are similar to controls found in many professional imaging or colorist software. The global controls are applied to the entire image. For advanced tuning, extra controls are provided to adjust the shadow, midtone and highlight areas of the image;
			
 
				          * corresponding to low luminance, medium luminance, and high luminance areas respectively.
			
 
				          */
			
 
				+        private _cameraColorCurves;
			
 
				         cameraColorCurves: ColorCurves;
			
 
				+        customShaderNameResolve: (shaderName: string) => string;
			
 
				         protected _renderTargets: SmartArray<RenderTargetTexture>;
			
 
				         protected _worldViewProjectionMatrix: Matrix;
			
 
				         protected _globalAmbientColor: Color3;
			
 
				-        protected _renderId: number;
			
 
				-        protected _defines: StandardMaterialDefines;
			
 
				-        protected _cachedDefines: StandardMaterialDefines;
			
 
				         protected _useLogarithmicDepth: boolean;
			
 
				         constructor(name: string, scene: Scene);
			
 
				         getClassName(): string;
			
@@ -5760,69 +5888,39 @@ declare module BABYLON {
 
				         needAlphaTesting(): boolean;
			
 
				         protected _shouldUseAlphaFromDiffuseTexture(): boolean;
			
 
				         getAlphaTestTexture(): BaseTexture;
			
 
				-        protected _checkCache(scene: Scene, mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				-        buildUniformLayout(): void;
			
 
				+        /**
			
 
				+         * Child classes can use it to update shaders
			
 
				+         */
			
 
				+        isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean;
			
 
				         unbind(): void;
			
 
				-        bindOnlyWorldMatrix(world: Matrix): void;
			
 
				-        bind(world: Matrix, mesh?: Mesh): void;
			
 
				+        bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void;
			
 
				         getAnimatables(): IAnimatable[];
			
 
				         dispose(forceDisposeEffect?: boolean, forceDisposeTextures?: boolean): void;
			
 
				         clone(name: string): StandardMaterial;
			
 
				         serialize(): any;
			
 
				         static Parse(source: any, scene: Scene, rootUrl: string): StandardMaterial;
			
 
				+        static _DiffuseTextureEnabled: boolean;
			
 
				         static DiffuseTextureEnabled: boolean;
			
 
				+        static _AmbientTextureEnabled: boolean;
			
 
				         static AmbientTextureEnabled: boolean;
			
 
				+        static _OpacityTextureEnabled: boolean;
			
 
				         static OpacityTextureEnabled: boolean;
			
 
				+        static _ReflectionTextureEnabled: boolean;
			
 
				         static ReflectionTextureEnabled: boolean;
			
 
				+        static _EmissiveTextureEnabled: boolean;
			
 
				         static EmissiveTextureEnabled: boolean;
			
 
				+        static _SpecularTextureEnabled: boolean;
			
 
				         static SpecularTextureEnabled: boolean;
			
 
				+        static _BumpTextureEnabled: boolean;
			
 
				         static BumpTextureEnabled: boolean;
			
 
				-        static FresnelEnabled: boolean;
			
 
				+        static _LightmapTextureEnabled: boolean;
			
 
				         static LightmapTextureEnabled: boolean;
			
 
				+        static _RefractionTextureEnabled: boolean;
			
 
				         static RefractionTextureEnabled: boolean;
			
 
				+        static _ColorGradingTextureEnabled: boolean;
			
 
				         static ColorGradingTextureEnabled: boolean;
			
 
				-    }
			
 
				-}
			
 
				-
			
 
				-declare module BABYLON {
			
 
				-    class UniformBuffer {
			
 
				-        private _engine;
			
 
				-        private _buffer;
			
 
				-        private _data;
			
 
				-        private _dynamic;
			
 
				-        private _uniformName;
			
 
				-        private _uniformNames;
			
 
				-        private _uniformLocations;
			
 
				-        private _uniformSizes;
			
 
				-        private _uniformLocationPointer;
			
 
				-        private _needSync;
			
 
				-        constructor(engine: Engine, data?: number[], dynamic?: boolean);
			
 
				-        readonly isSync: boolean;
			
 
				-        isDynamic(): boolean;
			
 
				-        getData(): number[];
			
 
				-        getBuffer(): WebGLBuffer;
			
 
				-        private _fillAlignment(size);
			
 
				-        addUniform(name: string, size: number | number[]): void;
			
 
				-        addMatrix(name: string, mat: Matrix): void;
			
 
				-        addFloat2(name: string, x: number, y: number): void;
			
 
				-        addFloat3(name: string, x: number, y: number, z: number): void;
			
 
				-        addColor3(name: string, color: Color3): void;
			
 
				-        addColor4(name: string, color: Color3, alpha: number): void;
			
 
				-        addVector3(name: string, vector: Vector3): void;
			
 
				-        create(): void;
			
 
				-        update(): void;
			
 
				-        updateUniform(uniformName: string, data: number[] | Float32Array): void;
			
 
				-        updateFloat(name: string, x: number): void;
			
 
				-        updateFloat2(name: string, x: number, y: number): void;
			
 
				-        updateFloat3(name: string, x: number, y: number, z: number): void;
			
 
				-        updateFloat4(name: string, x: number, y: number, z: number, w: number): void;
			
 
				-        updateMatrix(name: string, mat: Matrix): void;
			
 
				-        updateVector3(name: string, vector: Vector3): void;
			
 
				-        updateColor3(name: string, color: Color3): void;
			
 
				-        updateColor4(name: string, color: Color3, alpha: number): void;
			
 
				-        updateUniformDirectly(uniformName: string, data: number[]): void;
			
 
				-        dispose(): void;
			
 
				+        static _FresnelEnabled: boolean;
			
 
				+        static FresnelEnabled: boolean;
			
 
				     }
			
 
				 }
			
 
				 
			
@@ -5884,7 +5982,7 @@ declare module BABYLON {
 
				          * Stores in the passed array from the passed starting index the red, green, blue values as successive elements.
			
 
				          * Returns the Color3.
			
 
				          */
			
 
				-        toArray(array: number[] | Float32Array, index?: number): Color3;
			
 
				+        toArray(array: number[], index?: number): Color3;
			
 
				         /**
			
 
				          * Returns a new Color4 object from the current Color3 and the passed alpha.
			
 
				          */
			
@@ -6692,7 +6790,7 @@ declare module BABYLON {
 
				          * Populates the passed array from the passed index with the Vector4 coordinates.
			
 
				          * Returns the Vector4.
			
 
				          */
			
 
				-        toArray(array: number[] | Float32Array, index?: number): Vector4;
			
 
				+        toArray(array: number[], index?: number): Vector4;
			
 
				         /**
			
 
				          * Adds the passed vector to the current Vector4.
			
 
				          * Returns the updated Vector4.
			
@@ -7912,7 +8010,9 @@ declare module BABYLON {
 
				         showSubMeshesBoundingBox: boolean;
			
 
				         isBlocker: boolean;
			
 
				         renderingGroupId: number;
			
 
				+        private _material;
			
 
				         material: Material;
			
 
				+        private _receiveShadows;
			
 
				         receiveShadows: boolean;
			
 
				         renderOutline: boolean;
			
 
				         outlineColor: Color3;
			
@@ -7920,12 +8020,17 @@ declare module BABYLON {
 
				         renderOverlay: boolean;
			
 
				         overlayColor: Color3;
			
 
				         overlayAlpha: number;
			
 
				+        private _hasVertexAlpha;
			
 
				         hasVertexAlpha: boolean;
			
 
				+        private _useVertexColors;
			
 
				         useVertexColors: boolean;
			
 
				-        applyFog: boolean;
			
 
				+        private _computeBonesUsingShaders;
			
 
				         computeBonesUsingShaders: boolean;
			
 
				-        scalingDeterminant: number;
			
 
				+        private _numBoneInfluencers;
			
 
				         numBoneInfluencers: number;
			
 
				+        private _applyFog;
			
 
				+        applyFog: boolean;
			
 
				+        scalingDeterminant: number;
			
 
				         useOctreeForRenderingSelection: boolean;
			
 
				         useOctreeForPicking: boolean;
			
 
				         useOctreeForCollisions: boolean;
			
@@ -7963,7 +8068,6 @@ declare module BABYLON {
 
				         _positions: Vector3[];
			
 
				         private _isDirty;
			
 
				         _masterMesh: AbstractMesh;
			
 
				-        _materialDefines: MaterialDefines;
			
 
				         _boundingInfo: BoundingInfo;
			
 
				         private _pivotMatrix;
			
 
				         _isDisposed: boolean;
			
@@ -7974,6 +8078,7 @@ declare module BABYLON {
 
				         private _isWorldMatrixFrozen;
			
 
				         _unIndexed: boolean;
			
 
				         _poseMatrix: Matrix;
			
 
				+        _lightSources: Light[];
			
 
				         _waitingActions: any;
			
 
				         _waitingFreezeWorldMatrix: boolean;
			
 
				         private _skeleton;
			
@@ -7988,6 +8093,13 @@ declare module BABYLON {
 
				          * @param {boolean} fullDetails - support for multiple levels of logging within scene loading
			
 
				          */
			
 
				         toString(fullDetails?: boolean): string;
			
 
				+        _resyncLightSources(): void;
			
 
				+        _resyncLighSource(light: Light): void;
			
 
				+        _removeLightSource(light: Light): void;
			
 
				+        private _markSubMeshesAsDirty(func);
			
 
				+        _markSubMeshesAsLightDirty(): void;
			
 
				+        _markSubMeshesAsAttributesDirty(): void;
			
 
				+        _markSubMeshesAsMiscDirty(): void;
			
 
				         /**
			
 
				          * Rotation property : a Vector3 depicting the rotation value in radians around each local axis X, Y, Z.
			
 
				          * If rotation quaternion is set, this Vector3 will (almost always) be the Zero vector!
			
@@ -10738,6 +10850,10 @@ declare module BABYLON {
 
				         _alphaIndex: number;
			
 
				         _distanceToCamera: number;
			
 
				         _id: number;
			
 
				+        _materialDefines: MaterialDefines;
			
 
				+        private _materialEffect;
			
 
				+        readonly effect: Effect;
			
 
				+        setEffect(effect: Effect, defines?: MaterialDefines): void;
			
 
				         constructor(materialIndex: number, verticesStart: number, verticesCount: number, indexStart: any, indexCount: number, mesh: AbstractMesh, renderingMesh?: Mesh, createBoundingBox?: boolean);
			
 
				         readonly IsGlobal: boolean;
			
 
				         /**
			
@@ -12968,6 +13084,7 @@ declare module BABYLON {
 
				 }
			
 
				 
			
 
				 declare module BABYLON {
			
 
				+    function expandToProperty(callback: string): (target: any, propertyKey: string) => void;
			
 
				     function serialize(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
 
				     function serializeAsTexture(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
 
				     function serializeAsColor3(sourceName?: string): (target: any, propertyKey: string | symbol) => void;
			
@@ -13656,7 +13773,8 @@ declare module BABYLON {
 
				         dispose(): void;
			
 
				         concat(array: any): void;
			
 
				         concatWithNoDuplicate(array: any): void;
			
 
				-        indexOf(value: any): number;
			
 
				+        indexOf(value: T): number;
			
 
				+        contains(value: T): boolean;
			
 
				         private static _GlobalId;
			
 
				     }
			
 
				 }
			
@@ -14621,10 +14739,12 @@ declare module BABYLON.Internals {
 
				 declare module BABYLON {
			
 
				     class BaseTexture {
			
 
				         name: string;
			
 
				+        private _hasAlpha;
			
 
				         hasAlpha: boolean;
			
 
				         getAlphaFromRGB: boolean;
			
 
				         level: number;
			
 
				         coordinatesIndex: number;
			
 
				+        private _coordinatesMode;
			
 
				         coordinatesMode: number;
			
 
				         wrapU: number;
			
 
				         wrapV: number;
			
--- a/release/babylon.noworker.js
+++ b/release/babylon.noworker.js
--- a/release/canvas2D/babylon.canvas2d.js
+++ b/release/canvas2D/babylon.canvas2d.js
--- a/release/canvas2D/babylon.canvas2d.min.js
+++ b/release/canvas2D/babylon.canvas2d.min.js
--- a/release/inspector/babylon.inspector.bundle.js
+++ b/release/inspector/babylon.inspector.bundle.js
--- a/release/inspector/babylon.inspector.css
+++ b/release/inspector/babylon.inspector.css
@@ -8,6 +8,7 @@
 
				   display: flex;
			
 
				   font-size: 0.9em;
			
 
				   font-family: "Inconsolata", sans-serif;
			
 
				+  background-color: #242424;
			
 
				   /**

			
 
				  * A tool contained in the tree panel (available for each item of the tree)

			
 
				  */
			
--- a/release/inspector/babylon.inspector.d.ts
+++ b/release/inspector/babylon.inspector.d.ts
@@ -24,7 +24,15 @@ declare module INSPECTOR {
 
				          * If the parameter 'popup' is false, the inspector is created as a right panel on the main window.
			
 
				          * If the parameter 'popup' is true, the inspector is created in another popup.
			
 
				          */
			
 
				-        constructor(scene: BABYLON.Scene, popup?: boolean, initialTab?: number, parentElement?: HTMLElement);
			
 
				+        constructor(scene: BABYLON.Scene, popup?: boolean, initialTab?: number, parentElement?: HTMLElement, newColors?: {
			
 
				+            backgroundColor?: string;
			
 
				+            backgroundColorLighter?: string;
			
 
				+            backgroundColorLighter2?: string;
			
 
				+            backgroundColorLighter3?: string;
			
 
				+            color?: string;
			
 
				+            colorTop?: string;
			
 
				+            colorBot?: string;
			
 
				+        });
			
 
				         /**
			
 
				          * If the given element has a position 'asbolute' or 'relative',
			
 
				          * returns the first parent of the given element that has a position 'relative' or 'absolute'.
			
@@ -157,6 +165,96 @@ declare module INSPECTOR {
 
				             type: typeof BABYLON.PBRMaterial;
			
 
				             properties: string[];
			
 
				         };
			
 
				+        'Canvas2D': {
			
 
				+            type: typeof BABYLON.Canvas2D;
			
 
				+        };
			
 
				+        'Canvas2DEngineBoundData': {
			
 
				+            type: typeof BABYLON.Canvas2DEngineBoundData;
			
 
				+        };
			
 
				+        'Ellipse2D': {
			
 
				+            type: typeof BABYLON.Ellipse2D;
			
 
				+        };
			
 
				+        'Ellipse2DInstanceData': {
			
 
				+            type: typeof BABYLON.Ellipse2DInstanceData;
			
 
				+        };
			
 
				+        'Ellipse2DRenderCache': {
			
 
				+            type: typeof BABYLON.Ellipse2DRenderCache;
			
 
				+        };
			
 
				+        'Group2D': {
			
 
				+            type: typeof BABYLON.Group2D;
			
 
				+        };
			
 
				+        'IntersectInfo2D': {
			
 
				+            type: typeof BABYLON.IntersectInfo2D;
			
 
				+        };
			
 
				+        'Lines2D': {
			
 
				+            type: typeof BABYLON.Lines2D;
			
 
				+        };
			
 
				+        'Lines2DInstanceData': {
			
 
				+            type: typeof BABYLON.Lines2DInstanceData;
			
 
				+        };
			
 
				+        'Lines2DRenderCache': {
			
 
				+            type: typeof BABYLON.Lines2DRenderCache;
			
 
				+        };
			
 
				+        'PrepareRender2DContext': {
			
 
				+            type: typeof BABYLON.PrepareRender2DContext;
			
 
				+        };
			
 
				+        'Prim2DBase': {
			
 
				+            type: typeof BABYLON.Prim2DBase;
			
 
				+        };
			
 
				+        'Prim2DClassInfo': {
			
 
				+            type: typeof BABYLON.Prim2DClassInfo;
			
 
				+        };
			
 
				+        'Prim2DPropInfo': {
			
 
				+            type: typeof BABYLON.Prim2DPropInfo;
			
 
				+        };
			
 
				+        'Rectangle2D': {
			
 
				+            type: typeof BABYLON.Rectangle2D;
			
 
				+        };
			
 
				+        'Rectangle2DInstanceData': {
			
 
				+            type: typeof BABYLON.Rectangle2DInstanceData;
			
 
				+        };
			
 
				+        'Rectangle2DRenderCache': {
			
 
				+            type: typeof BABYLON.Rectangle2DRenderCache;
			
 
				+        };
			
 
				+        'Render2DContext': {
			
 
				+            type: typeof BABYLON.Render2DContext;
			
 
				+        };
			
 
				+        'RenderablePrim2D': {
			
 
				+            type: typeof BABYLON.RenderablePrim2D;
			
 
				+        };
			
 
				+        'ScreenSpaceCanvas2D': {
			
 
				+            type: typeof BABYLON.ScreenSpaceCanvas2D;
			
 
				+        };
			
 
				+        'Shape2D': {
			
 
				+            type: typeof BABYLON.Shape2D;
			
 
				+        };
			
 
				+        'Shape2DInstanceData': {
			
 
				+            type: typeof BABYLON.Shape2DInstanceData;
			
 
				+        };
			
 
				+        'Sprite2D': {
			
 
				+            type: typeof BABYLON.Sprite2D;
			
 
				+        };
			
 
				+        'Sprite2DInstanceData': {
			
 
				+            type: typeof BABYLON.Sprite2DInstanceData;
			
 
				+        };
			
 
				+        'Sprite2DRenderCache': {
			
 
				+            type: typeof BABYLON.Sprite2DRenderCache;
			
 
				+        };
			
 
				+        'Text2D': {
			
 
				+            type: typeof BABYLON.Text2D;
			
 
				+        };
			
 
				+        'Text2DInstanceData': {
			
 
				+            type: typeof BABYLON.Text2DInstanceData;
			
 
				+        };
			
 
				+        'Text2DRenderCache': {
			
 
				+            type: typeof BABYLON.Text2DRenderCache;
			
 
				+        };
			
 
				+        'WorldSpaceCanvas2D': {
			
 
				+            type: typeof BABYLON.WorldSpaceCanvas2D;
			
 
				+        };
			
 
				+        'WorldSpaceCanvas2DNode': {
			
 
				+            type: typeof BABYLON.WorldSpaceCanvas2DNode;
			
 
				+        };
			
 
				     };
			
 
				 }
			
 
				 
			
@@ -424,6 +522,8 @@ declare module INSPECTOR {
 
				         private _displayInputHandler;
			
 
				         /** Handler used to validate the input by pressing 'enter' */
			
 
				         private _validateInputHandler;
			
 
				+        /** Handler used to validate the input by pressing 'esc' */
			
 
				+        private _escapeInputHandler;
			
 
				         constructor(prop: Property, parent?: PropertyLine, level?: number);
			
 
				         /**
			
 
				          * Init the input element and al its handler :
			
@@ -436,6 +536,10 @@ declare module INSPECTOR {
 
				          * On escape : removes the input
			
 
				          */
			
 
				         private _validateInput(e);
			
 
				+        /**
			
 
				+         * On escape : removes the input
			
 
				+         */
			
 
				+        private _escapeInput(e);
			
 
				         /** Removes the input without validating the new value */
			
 
				         private _removeInputWithoutValidating();
			
 
				         /** Replaces the default display with an input */
			
--- a/release/inspector/babylon.inspector.js
+++ b/release/inspector/babylon.inspector.js
--- a/release/inspector/babylon.inspector.min.js
+++ b/release/inspector/babylon.inspector.min.js
--- a/release/loaders/babylon.glTFFileLoader.d.ts
+++ b/release/loaders/babylon.glTFFileLoader.d.ts
@@ -326,7 +326,7 @@ declare module BABYLON {
 
				     */
			
 
				     class GLTFFileLoaderBase {
			
 
				         static CreateRuntime(parsedData: any, scene: Scene, rootUrl: string): IGLTFRuntime;
			
 
				-        static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void): void;
			
 
				+        static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): void;
			
 
				         static LoadTextureBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void): void;
			
 
				         static CreateTextureAsync(gltfRuntime: IGLTFRuntime, id: string, buffer: ArrayBufferView, onSuccess: (texture: Texture) => void, onError: () => void): void;
			
 
				         static LoadShaderStringAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (shaderString: string) => void, onError: () => void): void;
			
@@ -355,13 +355,13 @@ declare module BABYLON {
 
				         /**
			
 
				         * Import meshes
			
 
				         */
			
 
				-        importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onError?: () => void): boolean;
			
 
				+        importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onError?: () => void, onProgress?: () => void): boolean;
			
 
				         /**
			
 
				         * Load scene
			
 
				         */
			
 
				-        loadAsync(scene: Scene, data: string | ArrayBuffer, rootUrl: string, onSuccess: () => void, onError: () => void): boolean;
			
 
				+        loadAsync(scene: Scene, data: string, rootUrl: string, onSuccess: () => void, onError: () => void): boolean;
			
 
				         private _loadShadersAsync(gltfRuntime, onload);
			
 
				-        private _loadBuffersAsync(gltfRuntime, onload);
			
 
				+        private _loadBuffersAsync(gltfRuntime, onload, onProgress?);
			
 
				         private _createNodes(gltfRuntime);
			
 
				     }
			
 
				 }
			
@@ -456,7 +456,7 @@ declare module BABYLON {
 
				         * Defines an override for loading buffers
			
 
				         * Return true to stop further extensions from loading this buffer
			
 
				         */
			
 
				-        loadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void): boolean;
			
 
				+        loadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): boolean;
			
 
				         /**
			
 
				         * Defines an override for loading texture buffers
			
 
				         * Return true to stop further extensions from loading this texture data
			
@@ -479,7 +479,7 @@ declare module BABYLON {
 
				         loadMaterialAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (material: Material) => void, onError: () => void): boolean;
			
 
				         static LoadRuntimeAsync(scene: Scene, data: string, rootUrl: string, onSuccess: (gltfRuntime: IGLTFRuntime) => void, onError: () => void): void;
			
 
				         static LoadRuntimeExtensionsAsync(gltfRuntime: IGLTFRuntime, onSuccess: () => void, onError: () => void): void;
			
 
				-        static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (bufferView: ArrayBufferView) => void, onError: () => void): void;
			
 
				+        static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (bufferView: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): void;
			
 
				         static LoadTextureAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (texture: Texture) => void, onError: () => void): void;
			
 
				         static LoadShaderStringAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (shaderData: string) => void, onError: () => void): void;
			
 
				         static LoadMaterialAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (material: Material) => void, onError: () => void): void;
			
--- a/release/loaders/babylon.glTFFileLoader.js
+++ b/release/loaders/babylon.glTFFileLoader.js
@@ -602,6 +602,7 @@ var BABYLON;
 
				                 var tempVertexData = new BABYLON.VertexData();
			
 
				                 var primitive = mesh.primitives[i];
			
 
				                 if (primitive.mode !== 4) {
			
 
				+                    // continue;
			
 
				                 }
			
 
				                 var attributes = primitive.attributes;
			
 
				                 var accessor = null;
			
@@ -692,6 +693,7 @@ var BABYLON;
 
				             }
			
 
				             for (var i = 0; i < mesh.primitives.length; i++) {
			
 
				                 if (mesh.primitives[i].mode !== 4) {
			
 
				+                    //continue;
			
 
				                 }
			
 
				                 var subMesh = new BABYLON.SubMesh(index, verticesStarts[index], verticesCounts[index], indexStarts[index], indexCounts[index], newMesh, newMesh, true);
			
 
				                 index++;
			
@@ -1152,13 +1154,13 @@ var BABYLON;
 
				             }
			
 
				             return gltfRuntime;
			
 
				         };
			
 
				-        GLTFFileLoaderBase.LoadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
			
 
				+        GLTFFileLoaderBase.LoadBufferAsync = function (gltfRuntime, id, onSuccess, onError, onProgress) {
			
 
				             var buffer = gltfRuntime.buffers[id];
			
 
				             if (BABYLON.GLTFUtils.IsBase64(buffer.uri)) {
			
 
				                 setTimeout(function () { return onSuccess(new Uint8Array(BABYLON.GLTFUtils.DecodeBase64(buffer.uri))); });
			
 
				             }
			
 
				             else {
			
 
				-                BABYLON.Tools.LoadFile(gltfRuntime.rootUrl + buffer.uri, function (data) { return onSuccess(new Uint8Array(data)); }, null, null, true, onError);
			
 
				+                BABYLON.Tools.LoadFile(gltfRuntime.rootUrl + buffer.uri, function (data) { return onSuccess(new Uint8Array(data)); }, onProgress, null, true, onError);
			
 
				             }
			
 
				         };
			
 
				         GLTFFileLoaderBase.LoadTextureBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
			
@@ -1364,7 +1366,7 @@ var BABYLON;
 
				         /**
			
 
				         * Import meshes
			
 
				         */
			
 
				-        GLTFFileLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onSuccess, onError) {
			
 
				+        GLTFFileLoader.prototype.importMeshAsync = function (meshesNames, scene, data, rootUrl, onSuccess, onError, onProgress) {
			
 
				             var _this = this;
			
 
				             scene.useRightHandedSystem = true;
			
 
				             var gltfRuntime = BABYLON.GLTFFileLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, function (gltfRuntime) {
			
@@ -1408,7 +1410,7 @@ var BABYLON;
 
				                             onSuccess(meshes, null, skeletons);
			
 
				                         }
			
 
				                     });
			
 
				-                });
			
 
				+                }, onProgress);
			
 
				                 if (GLTFFileLoader.IncrementalLoading && onSuccess) {
			
 
				                     onSuccess(meshes, null, skeletons);
			
 
				                 }
			
@@ -1473,7 +1475,7 @@ var BABYLON;
 
				             }
			
 
				         };
			
 
				         ;
			
 
				-        GLTFFileLoader.prototype._loadBuffersAsync = function (gltfRuntime, onload) {
			
 
				+        GLTFFileLoader.prototype._loadBuffersAsync = function (gltfRuntime, onload, onProgress) {
			
 
				             var hasBuffers = false;
			
 
				             var processBuffer = function (buf, buffer) {
			
 
				                 BABYLON.GLTFFileLoaderExtension.LoadBufferAsync(gltfRuntime, buf, function (bufferView) {
			
@@ -1825,7 +1827,7 @@ var BABYLON;
 
				         * Defines an override for loading buffers
			
 
				         * Return true to stop further extensions from loading this buffer
			
 
				         */
			
 
				-        GLTFFileLoaderExtension.prototype.loadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
			
 
				+        GLTFFileLoaderExtension.prototype.loadBufferAsync = function (gltfRuntime, id, onSuccess, onError, onProgress) {
			
 
				             return false;
			
 
				         };
			
 
				         /**
			
@@ -1877,11 +1879,11 @@ var BABYLON;
 
				                 });
			
 
				             });
			
 
				         };
			
 
				-        GLTFFileLoaderExtension.LoadBufferAsync = function (gltfRuntime, id, onSuccess, onError) {
			
 
				+        GLTFFileLoaderExtension.LoadBufferAsync = function (gltfRuntime, id, onSuccess, onError, onProgress) {
			
 
				             GLTFFileLoaderExtension.ApplyExtensions(function (loaderExtension) {
			
 
				-                return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError);
			
 
				+                return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
			
 
				             }, function () {
			
 
				-                BABYLON.GLTFFileLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError);
			
 
				+                BABYLON.GLTFFileLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);
			
 
				             });
			
 
				         };
			
 
				         GLTFFileLoaderExtension.LoadTextureAsync = function (gltfRuntime, id, onSuccess, onError) {
			
@@ -1932,11 +1934,16 @@ var BABYLON;
 
				 //# sourceMappingURL=babylon.glTFFileLoaderExtension.js.map
			
 
				 
			
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var BinaryExtensionBufferName = "binary_glTF";
			
@@ -2076,11 +2083,16 @@ var BABYLON;
 
				 //# sourceMappingURL=babylon.glTFBinaryExtension.js.map
			
 
				 
			
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     ;
			
--- a/release/loaders/babylon.glTFFileLoader.min.js
+++ b/release/loaders/babylon.glTFFileLoader.min.js
--- a/release/loaders/babylon.objFileLoader.js
+++ b/release/loaders/babylon.objFileLoader.js
@@ -83,6 +83,8 @@ var BABYLON;
 
				                     else if (key === "d") {
			
 
				                         //d is dissolve for current material. It mean alpha for BABYLON
			
 
				                         material.alpha = value;
			
 
				+                        //Texture
			
 
				+                        //This part can be improved by adding the possible options of texture
			
 
				                     }
			
 
				                     else if (key === "map_ka") {
			
 
				                         // ambient texture map with a loaded image
			
@@ -99,6 +101,13 @@ var BABYLON;
 
				                         material.specularTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
			
 
				                     }
			
 
				                     else if (key === "map_ns") {
			
 
				+                        //Specular
			
 
				+                        //Specular highlight component
			
 
				+                        //We must first get the folder of the image
			
 
				+                        //
			
 
				+                        //Not supported by BABYLON
			
 
				+                        //
			
 
				+                        //    continue;
			
 
				                     }
			
 
				                     else if (key === "map_bump") {
			
 
				                         //The bump texture
			
@@ -107,33 +116,46 @@ var BABYLON;
 
				                     else if (key === "map_d") {
			
 
				                         // The dissolve of the material
			
 
				                         material.opacityTexture = MTLFileLoader._getTexture(rootUrl, value, scene);
			
 
				+                        //Options for illumination
			
 
				                     }
			
 
				                     else if (key === "illum") {
			
 
				                         //Illumination
			
 
				                         if (value === "0") {
			
 
				+                            //That mean Kd == Kd
			
 
				                         }
			
 
				                         else if (value === "1") {
			
 
				+                            //Color on and Ambient on
			
 
				                         }
			
 
				                         else if (value === "2") {
			
 
				+                            //Highlight on
			
 
				                         }
			
 
				                         else if (value === "3") {
			
 
				+                            //Reflection on and Ray trace on
			
 
				                         }
			
 
				                         else if (value === "4") {
			
 
				+                            //Transparency: Glass on, Reflection: Ray trace on
			
 
				                         }
			
 
				                         else if (value === "5") {
			
 
				+                            //Reflection: Fresnel on and Ray trace on
			
 
				                         }
			
 
				                         else if (value === "6") {
			
 
				+                            //Transparency: Refraction on, Reflection: Fresnel off and Ray trace on
			
 
				                         }
			
 
				                         else if (value === "7") {
			
 
				+                            //Transparency: Refraction on, Reflection: Fresnel on and Ray trace on
			
 
				                         }
			
 
				                         else if (value === "8") {
			
 
				+                            //Reflection on and Ray trace off
			
 
				                         }
			
 
				                         else if (value === "9") {
			
 
				+                            //Transparency: Glass on, Reflection: Ray trace off
			
 
				                         }
			
 
				                         else if (value === "10") {
			
 
				+                            //Casts shadows onto invisible surfaces
			
 
				                         }
			
 
				                     }
			
 
				                     else {
			
 
				+                        // console.log("Unhandled expression at line : " + i +'\n' + "with value : " + line);
			
 
				                     }
			
 
				                 }
			
 
				                 //At the end of the file, add the last material
			
@@ -517,6 +539,7 @@ var BABYLON;
 
				                 //Comment or newLine
			
 
				                 if (line.length === 0 || line.charAt(0) === '#') {
			
 
				                     continue;
			
 
				+                    //Get information about one position possible for the vertices
			
 
				                 }
			
 
				                 else if ((result = this.vertexPattern.exec(line)) !== null) {
			
 
				                     //Create a Vector3 with the position x, y, z
			
@@ -538,6 +561,8 @@ var BABYLON;
 
				                     // ["vt 0.1 0.2 0.3", "0.1", "0.2"]
			
 
				                     //Add the Vector in the list of uvs
			
 
				                     uvs.push(new BABYLON.Vector2(parseFloat(result[1]), parseFloat(result[2])));
			
 
				+                    //Identify patterns of faces
			
 
				+                    //Face could be defined in different type of pattern
			
 
				                 }
			
 
				                 else if ((result = this.facePattern3.exec(line)) !== null) {
			
 
				                     //Value of result:
			
@@ -566,6 +591,8 @@ var BABYLON;
 
				                     //Set the data for this face
			
 
				                     setDataForCurrentFaceWithPattern1(result[1].trim().split(" "), // ["1", "2", "3"]
			
 
				                     1);
			
 
				+                    //Define a mesh or an object
			
 
				+                    //Each time this keyword is analysed, create a new Object with all data for creating a babylonMesh
			
 
				                 }
			
 
				                 else if (this.group.test(line) || this.obj.test(line)) {
			
 
				                     //Create a new mesh corresponding to the name of the group.
			
@@ -587,6 +614,7 @@ var BABYLON;
 
				                     hasMeshes = true;
			
 
				                     isFirstMaterial = true;
			
 
				                     increment = 1;
			
 
				+                    //Keyword for applying a material
			
 
				                 }
			
 
				                 else if (this.usemtl.test(line)) {
			
 
				                     //Get the name of the material
			
@@ -616,12 +644,17 @@ var BABYLON;
 
				                         meshesFromObj[meshesFromObj.length - 1].materialName = materialNameFromObj;
			
 
				                         isFirstMaterial = false;
			
 
				                     }
			
 
				+                    //Keyword for loading the mtl file
			
 
				                 }
			
 
				                 else if (this.mtllib.test(line)) {
			
 
				                     //Get the name of mtl file
			
 
				                     fileToLoad = line.substring(7).trim();
			
 
				+                    //Apply smoothing
			
 
				                 }
			
 
				                 else if (this.smooth.test(line)) {
			
 
				+                    // smooth shading => apply smoothing
			
 
				+                    //Toda  y I don't know it work with babylon and with obj.
			
 
				+                    //With the obj file  an integer is set
			
 
				                 }
			
 
				                 else {
			
 
				                     //If there is another possibility
			
--- a/release/materialsLibrary/babylon.customMaterial.d.ts
+++ b/release/materialsLibrary/babylon.customMaterial.d.ts
@@ -11,6 +11,5 @@ declare module BABYLON {
 
				         private _diffusePart;
			
 
				         private _vertexPositionPart;
			
 
				         constructor(name: string, builder: ICustomMaterialBuilder, scene: Scene);
			
 
				-        isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean;
			
 
				     }
			
 
				 }
			
--- a/release/materialsLibrary/babylon.customMaterial.js
+++ b/release/materialsLibrary/babylon.customMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var CustomShaderHelper = (function () {
			
@@ -20,376 +25,11 @@ var BABYLON;
 
				             _this._diffusePart = 'vec3 diffuseColor=vDiffuseColor.rgb;';
			
 
				             _this._vertexPositionPart = 'gl_Position=viewProjection*finalWorld*vec4(position,1.0);';
			
 
				             _this.builder = builder;
			
 
				+            _this.customShaderNameResolve = function (shaderName) {
			
 
				+                return _this.builder(new CustomShaderHelper(), shaderName, _this._mainPart, _this._diffusePart, _this._vertexPositionPart);
			
 
				+            };
			
 
				             return _this;
			
 
				         }
			
 
				-        CustomMaterial.prototype.isReady = function (mesh, useInstances) {
			
 
				-            if (this.isFrozen) {
			
 
				-                if (this._wasPreviouslyReady) {
			
 
				-                    return true;
			
 
				-                }
			
 
				-            }
			
 
				-            var scene = this.getScene();
			
 
				-            var engine = scene.getEngine();
			
 
				-            var needUVs = false;
			
 
				-            var needNormals = false;
			
 
				-            this._defines.reset();
			
 
				-            // Lights
			
 
				-            if (scene.lightsEnabled && !this.disableLighting) {
			
 
				-                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);
			
 
				-            }
			
 
				-            if (!this.checkReadyOnEveryCall) {
			
 
				-                if (this._renderId === scene.getRenderId()) {
			
 
				-                    if (this._checkCache(scene, mesh, useInstances)) {
			
 
				-                        return true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            // Textures
			
 
				-            if (scene.texturesEnabled) {
			
 
				-                if (this.diffuseTexture && BABYLON.StandardMaterial.DiffuseTextureEnabled) {
			
 
				-                    if (!this.diffuseTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.DIFFUSE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.ambientTexture && BABYLON.StandardMaterial.AmbientTextureEnabled) {
			
 
				-                    if (!this.ambientTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.AMBIENT = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.opacityTexture && BABYLON.StandardMaterial.OpacityTextureEnabled) {
			
 
				-                    if (!this.opacityTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.OPACITY = true;
			
 
				-                        if (this.opacityTexture.getAlphaFromRGB) {
			
 
				-                            this._defines.OPACITYRGB = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.reflectionTexture && BABYLON.StandardMaterial.ReflectionTextureEnabled) {
			
 
				-                    if (!this.reflectionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needNormals = true;
			
 
				-                        this._defines.REFLECTION = true;
			
 
				-                        if (this.roughness > 0) {
			
 
				-                            this._defines.ROUGHNESS = true;
			
 
				-                        }
			
 
				-                        if (this.useReflectionOverAlpha) {
			
 
				-                            this._defines.REFLECTIONOVERALPHA = true;
			
 
				-                        }
			
 
				-                        if (this.reflectionTexture.coordinatesMode === BABYLON.Texture.INVCUBIC_MODE) {
			
 
				-                            this._defines.INVERTCUBICMAP = true;
			
 
				-                        }
			
 
				-                        this._defines.REFLECTIONMAP_3D = this.reflectionTexture.isCube;
			
 
				-                        switch (this.reflectionTexture.coordinatesMode) {
			
 
				-                            case BABYLON.Texture.CUBIC_MODE:
			
 
				-                            case BABYLON.Texture.INVCUBIC_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_CUBIC = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.EXPLICIT_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EXPLICIT = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.PLANAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PLANAR = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.PROJECTION_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PROJECTION = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.SKYBOX_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SKYBOX = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.SPHERICAL_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SPHERICAL = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.FIXED_EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = true;
			
 
				-                                break;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.emissiveTexture && BABYLON.StandardMaterial.EmissiveTextureEnabled) {
			
 
				-                    if (!this.emissiveTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.EMISSIVE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.lightmapTexture && BABYLON.StandardMaterial.LightmapTextureEnabled) {
			
 
				-                    if (!this.lightmapTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.LIGHTMAP = true;
			
 
				-                        this._defines.USELIGHTMAPASSHADOWMAP = this.useLightmapAsShadowmap;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.specularTexture && BABYLON.StandardMaterial.SpecularTextureEnabled) {
			
 
				-                    if (!this.specularTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.SPECULAR = true;
			
 
				-                        this._defines.GLOSSINESS = this.useGlossinessFromSpecularMapAlpha;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (scene.getEngine().getCaps().standardDerivatives && this.bumpTexture && BABYLON.StandardMaterial.BumpTextureEnabled) {
			
 
				-                    if (!this.bumpTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.BUMP = true;
			
 
				-                        if (this.useParallax) {
			
 
				-                            this._defines.PARALLAX = true;
			
 
				-                            if (this.useParallaxOcclusion) {
			
 
				-                                this._defines.PARALLAXOCCLUSION = true;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        if (this.invertNormalMapX) {
			
 
				-                            this._defines.INVERTNORMALMAPX = true;
			
 
				-                        }
			
 
				-                        if (this.invertNormalMapY) {
			
 
				-                            this._defines.INVERTNORMALMAPY = true;
			
 
				-                        }
			
 
				-                        if (scene._mirroredCameraPosition) {
			
 
				-                            this._defines.INVERTNORMALMAPX = !this._defines.INVERTNORMALMAPX;
			
 
				-                            this._defines.INVERTNORMALMAPY = !this._defines.INVERTNORMALMAPY;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.refractionTexture && BABYLON.StandardMaterial.RefractionTextureEnabled) {
			
 
				-                    if (!this.refractionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.REFRACTION = true;
			
 
				-                        this._defines.REFRACTIONMAP_3D = this.refractionTexture.isCube;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.cameraColorGradingTexture && BABYLON.StandardMaterial.ColorGradingTextureEnabled) {
			
 
				-                    if (!this.cameraColorGradingTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        this._defines.CAMERACOLORGRADING = true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            // Effect
			
 
				-            if (scene.clipPlane) {
			
 
				-                this._defines.CLIPPLANE = true;
			
 
				-            }
			
 
				-            if (engine.getAlphaTesting()) {
			
 
				-                this._defines.ALPHATEST = true;
			
 
				-            }
			
 
				-            if (this._shouldUseAlphaFromDiffuseTexture()) {
			
 
				-                this._defines.ALPHAFROMDIFFUSE = true;
			
 
				-            }
			
 
				-            if (this.useEmissiveAsIllumination) {
			
 
				-                this._defines.EMISSIVEASILLUMINATION = true;
			
 
				-            }
			
 
				-            if (this.linkEmissiveWithDiffuse) {
			
 
				-                this._defines.LINKEMISSIVEWITHDIFFUSE = true;
			
 
				-            }
			
 
				-            if (this.useLogarithmicDepth) {
			
 
				-                this._defines.LOGARITHMICDEPTH = true;
			
 
				-            }
			
 
				-            if (this.cameraColorCurves) {
			
 
				-                this._defines.CAMERACOLORCURVES = true;
			
 
				-            }
			
 
				-            // Point size
			
 
				-            if (this.pointsCloud || scene.forcePointsCloud) {
			
 
				-                this._defines.POINTSIZE = true;
			
 
				-            }
			
 
				-            // Fog
			
 
				-            if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== BABYLON.Scene.FOGMODE_NONE && this.fogEnabled) {
			
 
				-                this._defines.FOG = true;
			
 
				-            }
			
 
				-            if (BABYLON.StandardMaterial.FresnelEnabled) {
			
 
				-                // Fresnel
			
 
				-                if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled ||
			
 
				-                    this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||
			
 
				-                    this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled ||
			
 
				-                    this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled ||
			
 
				-                    this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				-                    if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled) {
			
 
				-                        this._defines.DIFFUSEFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled) {
			
 
				-                        this._defines.OPACITYFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFLECTIONFRESNEL = true;
			
 
				-                        if (this.useReflectionFresnelFromSpecular) {
			
 
				-                            this._defines.REFLECTIONFRESNELFROMSPECULAR = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    if (this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFRACTIONFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled) {
			
 
				-                        this._defines.EMISSIVEFRESNEL = true;
			
 
				-                    }
			
 
				-                    needNormals = true;
			
 
				-                    this._defines.FRESNEL = true;
			
 
				-                }
			
 
				-            }
			
 
				-            if (this._defines.SPECULARTERM && this.useSpecularOverAlpha) {
			
 
				-                this._defines.SPECULAROVERALPHA = true;
			
 
				-            }
			
 
				-            // Attribs
			
 
				-            if (mesh) {
			
 
				-                if (needNormals && mesh.isVerticesDataPresent(BABYLON.VertexBuffer.NormalKind)) {
			
 
				-                    this._defines.NORMAL = true;
			
 
				-                }
			
 
				-                if (needUVs) {
			
 
				-                    if (mesh.isVerticesDataPresent(BABYLON.VertexBuffer.UVKind)) {
			
 
				-                        this._defines.UV1 = true;
			
 
				-                    }
			
 
				-                    if (mesh.isVerticesDataPresent(BABYLON.VertexBuffer.UV2Kind)) {
			
 
				-                        this._defines.UV2 = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useVertexColors && mesh.isVerticesDataPresent(BABYLON.VertexBuffer.ColorKind)) {
			
 
				-                    this._defines.VERTEXCOLOR = true;
			
 
				-                    if (mesh.hasVertexAlpha) {
			
 
				-                        this._defines.VERTEXALPHA = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useBones && mesh.computeBonesUsingShaders) {
			
 
				-                    this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;
			
 
				-                    this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);
			
 
				-                }
			
 
				-                // Instances
			
 
				-                if (useInstances) {
			
 
				-                    this._defines.INSTANCES = true;
			
 
				-                }
			
 
				-            }
			
 
				-            // Get correct effect      
			
 
				-            if (!this._defines.isEqual(this._cachedDefines)) {
			
 
				-                this._defines.cloneTo(this._cachedDefines);
			
 
				-                scene.resetCachedMaterial();
			
 
				-                // Fallbacks
			
 
				-                var fallbacks = new BABYLON.EffectFallbacks();
			
 
				-                if (this._defines.REFLECTION) {
			
 
				-                    fallbacks.addFallback(0, "REFLECTION");
			
 
				-                }
			
 
				-                if (this._defines.SPECULAR) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAR");
			
 
				-                }
			
 
				-                if (this._defines.BUMP) {
			
 
				-                    fallbacks.addFallback(0, "BUMP");
			
 
				-                }
			
 
				-                if (this._defines.PARALLAX) {
			
 
				-                    fallbacks.addFallback(1, "PARALLAX");
			
 
				-                }
			
 
				-                if (this._defines.PARALLAXOCCLUSION) {
			
 
				-                    fallbacks.addFallback(0, "PARALLAXOCCLUSION");
			
 
				-                }
			
 
				-                if (this._defines.SPECULAROVERALPHA) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAROVERALPHA");
			
 
				-                }
			
 
				-                if (this._defines.FOG) {
			
 
				-                    fallbacks.addFallback(1, "FOG");
			
 
				-                }
			
 
				-                if (this._defines.POINTSIZE) {
			
 
				-                    fallbacks.addFallback(0, "POINTSIZE");
			
 
				-                }
			
 
				-                if (this._defines.LOGARITHMICDEPTH) {
			
 
				-                    fallbacks.addFallback(0, "LOGARITHMICDEPTH");
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.HandleFallbacksForShadows(this._defines, fallbacks, this.maxSimultaneousLights);
			
 
				-                if (this._defines.SPECULARTERM) {
			
 
				-                    fallbacks.addFallback(0, "SPECULARTERM");
			
 
				-                }
			
 
				-                if (this._defines.DIFFUSEFRESNEL) {
			
 
				-                    fallbacks.addFallback(1, "DIFFUSEFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.OPACITYFRESNEL) {
			
 
				-                    fallbacks.addFallback(2, "OPACITYFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.REFLECTIONFRESNEL) {
			
 
				-                    fallbacks.addFallback(3, "REFLECTIONFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.EMISSIVEFRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "EMISSIVEFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.FRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "FRESNEL");
			
 
				-                }
			
 
				-                //Attributes
			
 
				-                var attribs = [BABYLON.VertexBuffer.PositionKind];
			
 
				-                if (this._defines.NORMAL) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.NormalKind);
			
 
				-                }
			
 
				-                if (this._defines.UV1) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.UVKind);
			
 
				-                }
			
 
				-                if (this._defines.UV2) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.UV2Kind);
			
 
				-                }
			
 
				-                if (this._defines.VERTEXCOLOR) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.ColorKind);
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);
			
 
				-                BABYLON.MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);
			
 
				-                var shaderName = "default";
			
 
				-                if (this.builder) {
			
 
				-                    shaderName = this.builder(new CustomShaderHelper(), shaderName, this._mainPart, this._diffusePart, this._vertexPositionPart);
			
 
				-                }
			
 
				-                var join = this._defines.toString();
			
 
				-                var uniforms = ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vAmbientColor", "vDiffuseColor", "vSpecularColor", "vEmissiveColor",
			
 
				-                    "vFogInfos", "vFogColor", "pointSize",
			
 
				-                    "vDiffuseInfos", "vAmbientInfos", "vOpacityInfos", "vReflectionInfos", "vEmissiveInfos", "vSpecularInfos", "vBumpInfos", "vLightmapInfos", "vRefractionInfos",
			
 
				-                    "mBones",
			
 
				-                    "vClipPlane", "diffuseMatrix", "ambientMatrix", "opacityMatrix", "reflectionMatrix", "emissiveMatrix", "specularMatrix", "bumpMatrix", "lightmapMatrix", "refractionMatrix",
			
 
				-                    "depthValues",
			
 
				-                    "diffuseLeftColor", "diffuseRightColor", "opacityParts", "reflectionLeftColor", "reflectionRightColor", "emissiveLeftColor", "emissiveRightColor", "refractionLeftColor", "refractionRightColor",
			
 
				-                    "logarithmicDepthConstant"
			
 
				-                ];
			
 
				-                var samplers = ["diffuseSampler", "ambientSampler", "opacitySampler", "reflectionCubeSampler", "reflection2DSampler", "emissiveSampler", "specularSampler", "bumpSampler", "lightmapSampler", "refractionCubeSampler", "refraction2DSampler"];
			
 
				-                if (this._defines.CAMERACOLORCURVES) {
			
 
				-                    BABYLON.ColorCurves.PrepareUniforms(uniforms);
			
 
				-                }
			
 
				-                if (this._defines.CAMERACOLORGRADING) {
			
 
				-                    BABYLON.ColorGradingTexture.PrepareUniformsAndSamplers(uniforms, samplers);
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, this._defines, this.maxSimultaneousLights);
			
 
				-                this._effect = scene.getEngine().createEffect(shaderName, attribs, uniforms, samplers, join, fallbacks, this.onCompiled, this.onError, { maxSimultaneousLights: this.maxSimultaneousLights - 1 });
			
 
				-            }
			
 
				-            if (!this._effect.isReady()) {
			
 
				-                return false;
			
 
				-            }
			
 
				-            this._renderId = scene.getRenderId();
			
 
				-            this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new BABYLON.StandardMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				-            return true;
			
 
				-        };
			
 
				         return CustomMaterial;
			
 
				     }(BABYLON.StandardMaterial));
			
 
				     BABYLON.CustomMaterial = CustomMaterial;
			
--- a/release/materialsLibrary/babylon.customMaterial.min.js
+++ b/release/materialsLibrary/babylon.customMaterial.min.js
--- a/release/materialsLibrary/babylon.fireMaterial.js
+++ b/release/materialsLibrary/babylon.fireMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -63,9 +68,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         FireMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -175,12 +177,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new FireMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         FireMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.fireMaterial.min.js
+++ b/release/materialsLibrary/babylon.fireMaterial.min.js
--- a/release/materialsLibrary/babylon.furMaterial.js
+++ b/release/materialsLibrary/babylon.furMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -103,9 +108,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         FurMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -248,12 +250,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new FurMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         FurMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.furMaterial.min.js
+++ b/release/materialsLibrary/babylon.furMaterial.min.js
--- a/release/materialsLibrary/babylon.gradientMaterial.js
+++ b/release/materialsLibrary/babylon.gradientMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -106,9 +111,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         GradientMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -228,12 +230,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new GradientMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         GradientMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.gradientMaterial.min.js
+++ b/release/materialsLibrary/babylon.gradientMaterial.min.js
--- a/release/materialsLibrary/babylon.gridMaterial.js
+++ b/release/materialsLibrary/babylon.gridMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -75,9 +80,6 @@ var BABYLON;
 
				             if (!mesh) {
			
 
				                 return true;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         GridMaterial.prototype.isReady = function (mesh, useInstances) {
			
--- a/release/materialsLibrary/babylon.gridMaterial.min.js
+++ b/release/materialsLibrary/babylon.gridMaterial.min.js
--- a/release/materialsLibrary/babylon.lavaMaterial.js
+++ b/release/materialsLibrary/babylon.lavaMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -103,9 +108,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         LavaMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -236,12 +238,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new LavaMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         LavaMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.lavaMaterial.min.js
+++ b/release/materialsLibrary/babylon.lavaMaterial.min.js
--- a/release/materialsLibrary/babylon.normalMaterial.js
+++ b/release/materialsLibrary/babylon.normalMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -97,9 +102,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         NormalMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -229,12 +231,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new NormalMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         NormalMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.normalMaterial.min.js
+++ b/release/materialsLibrary/babylon.normalMaterial.min.js
--- a/release/materialsLibrary/babylon.shadowOnlyMaterial.js
+++ b/release/materialsLibrary/babylon.shadowOnlyMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -56,9 +61,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         ShadowOnlyMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -143,12 +145,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new ShadowOnlyMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         ShadowOnlyMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.shadowOnlyMaterial.min.js
+++ b/release/materialsLibrary/babylon.shadowOnlyMaterial.min.js
--- a/release/materialsLibrary/babylon.simpleMaterial.js
+++ b/release/materialsLibrary/babylon.simpleMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -65,9 +70,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         SimpleMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -192,12 +194,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new SimpleMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         SimpleMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.simpleMaterial.min.js
+++ b/release/materialsLibrary/babylon.simpleMaterial.min.js
--- a/release/materialsLibrary/babylon.skyMaterial.js
+++ b/release/materialsLibrary/babylon.skyMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -61,9 +66,6 @@ var BABYLON;
 
				             if (!mesh) {
			
 
				                 return true;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         SkyMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -131,12 +133,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new SkyMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         SkyMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.skyMaterial.min.js
+++ b/release/materialsLibrary/babylon.skyMaterial.min.js
--- a/release/materialsLibrary/babylon.terrainMaterial.js
+++ b/release/materialsLibrary/babylon.terrainMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -69,9 +74,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         TerrainMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -206,12 +208,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new TerrainMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         TerrainMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.terrainMaterial.min.js
+++ b/release/materialsLibrary/babylon.terrainMaterial.min.js
--- a/release/materialsLibrary/babylon.triPlanarMaterial.js
+++ b/release/materialsLibrary/babylon.triPlanarMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -72,9 +77,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         TriPlanarMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -207,12 +209,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new TriPlanarMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         TriPlanarMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.triPlanarMaterial.min.js
+++ b/release/materialsLibrary/babylon.triPlanarMaterial.min.js
--- a/release/materialsLibrary/babylon.waterMaterial.js
+++ b/release/materialsLibrary/babylon.waterMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
@@ -179,9 +184,6 @@ var BABYLON;
 
				             if (this._defines.INSTANCES !== useInstances) {
			
 
				                 return false;
			
 
				             }
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				             return false;
			
 
				         };
			
 
				         WaterMaterial.prototype.isReady = function (mesh, useInstances) {
			
@@ -334,12 +336,6 @@ var BABYLON;
 
				             }
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new WaterMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				             return true;
			
 
				         };
			
 
				         WaterMaterial.prototype.bindOnlyWorldMatrix = function (world) {
			
--- a/release/materialsLibrary/babylon.waterMaterial.min.js
+++ b/release/materialsLibrary/babylon.waterMaterial.min.js
--- a/release/postProcessesLibrary/babylon.asciiArtPostProcess.js
+++ b/release/postProcessesLibrary/babylon.asciiArtPostProcess.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
--- a/release/postProcessesLibrary/babylon.digitalRainPostProcess.js
+++ b/release/postProcessesLibrary/babylon.digitalRainPostProcess.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
			
 
				     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
			
 
				     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
			
--- a/release/proceduralTexturesLibrary/babylon.brickProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.brickProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var BrickProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.cloudProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.cloudProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var CloudProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.fireProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.fireProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var FireProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.grassProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.grassProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var GrassProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.marbleProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.marbleProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var MarbleProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.normalMapProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.normalMapProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var NormalMapProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.roadProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.roadProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var RoadProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.starfieldProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.starfieldProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var StarfieldProceduralTexture = (function (_super) {
			
--- a/release/proceduralTexturesLibrary/babylon.woodProceduralTexture.js
+++ b/release/proceduralTexturesLibrary/babylon.woodProceduralTexture.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var WoodProceduralTexture = (function (_super) {
			
--- a/release/serializers/babylon.objSerializer.js
+++ b/release/serializers/babylon.objSerializer.js
@@ -64,9 +64,15 @@ var BABYLON;
 
				             }
			
 
				             if (m.diffuseTexture) {
			
 
				                 output.push("  map_Kd " + uvscale + m.diffuseTexture.name);
			
 
				+                //TODO: alpha testing, opacity in diffuse texture alpha channel (diffuseTexture.hasAlpha -> map_d)
			
 
				             }
			
 
				             if (m.specularTexture) {
			
 
				                 output.push("  map_Ks " + uvscale + m.specularTexture.name);
			
 
				+                /* TODO: glossiness = specular highlight component is in alpha channel of specularTexture. (???)
			
 
				+                if (m.useGlossinessFromSpecularMapAlpha)  {
			
 
				+                    output.push("  map_Ns "+uvscale + m.specularTexture.name);
			
 
				+                }
			
 
				+                */
			
 
				             }
			
 
				             /* TODO: emissive texture not in .MAT format (???)
			
 
				             if (m.emissiveTexture) {
			
--- a/release/what's
+++ b/release/what's
@@ -5,7 +5,7 @@
 
				 ### Major updates

			
 
				  - WebGL2 context support. WebGL2 is now used instead of WebGL 1 when available. [More info here](http://doc.babylonjs.com/overviews/webgl2) ([deltakosh](https://github.com/deltakosh))

			
 
				  - Complete WebVR 1.1 support including controllers for HTC Vive and Occulus. [More info here](http://doc.babylonjs.com/overviews/webvr_camera) ([raanan](https://github.com/raananw))

			
 
				- - Added support for Exponential Shadow maps to replace Variance Shadow maps. [more info here](http://www.babylonjs-playground.com/debug.html#1CXNXC#3) - [Demo](http://www.babylonjs.com/Demos/AdvancedShadows/) ([deltakosh](https://github.com/deltakosh))

			
 
				+ - Added support for Exponential Shadow maps to replace Variance Shadow maps. [more info here](http://www.babylonjs-playground.com/debug.html#1CXNXC#3) - [Demo](http://www.babylonjs.com/Demos/AdvancedShadows/) - [Demo](http://www.babylonjs-playground.com/#1CXNXC#4) ([deltakosh](https://github.com/deltakosh))

			
 
				  - Support for [Vertex Array Objects](https://www.opengl.org/registry/specs/ARB/vertex_array_object.txt) ([deltakosh](https://github.com/deltakosh))

			
 
				  - Support for multisample render targets. [Demo](http://www.babylonjs-playground.com/#12MKMN) ([deltakosh](https://github.com/deltakosh))

			
 
				  - New Unity 5 Editor Toolkit. Complete pipeline integration [Doc](TODO) - ([MackeyK24](https://github.com/MackeyK24))

			
@@ -13,7 +13,7 @@
 
				  - New `VideoTexture.CreateFromWebCam` to generate video texture using WebRTC. [Demo](https://www.babylonjs-playground.com#1R77YT#2) - (Sebastien Vandenberghe)(https://github.com/sebavanmicrosoft) / ([deltakosh](https://github.com/deltakosh))

			
 
				  - New Facet Data feature ([jerome](https://github.com/jbousquie))

			
 
				  - babylon.fontTexture.ts was moved from babylon.js to canvas2D ([nockawa](https://github.com/nockawa))

			
 
				- - Multi-platform Compressed Textures for Desktops & Mobile Devices with fall back.  Batch (dos) scripts to convert entire directories of .jpg's & .png's ([jcpalmer](https://github.com/Palmer-JC))

			
 
				+ - Multi-platform Compressed Textures for Desktops & Mobile Devices with fall back.  Batch (dos) scripts to convert entire directories of .jpg's & .png's [Doc](http://doc.babylonjs.com/tutorials/multi-platform_compressed_textures) ([jcpalmer](https://github.com/Palmer-JC))

			
 
				  - All deprecated functions and properties were removed ([deltakosh](https://github.com/deltakosh))

			
 
				 

			
 
				 ### Updates

			
--- a/inspector/index.html
+++ b/inspector/index.html
@@ -1,79 +1,55 @@
 
				 <!DOCTYPE html>

			
 
				 <html>

			
 
				+

			
 
				 <head>

			
 
				     <title>Inspector - test</title>

			
 
				-    <meta charset='utf-8'/>

			
 
				+    <meta charset='utf-8' />

			
 
				     <meta name="viewport" content="width=device-width, user-scalable=no">

			
 
				 

			
 
				     <!--Babylon-->

			
 
				-	<script src="../tools/DevLoader/BabylonLoader.js"></script>

			
 
				+    <script src="../tools/DevLoader/BabylonLoader.js"></script>

			
 
				 

			
 
				     <style>

			
 
				-        

			
 
				-        html, body {

			
 
				+        html,

			
 
				+        body {

			
 
				             width: 100%;

			
 
				-            height:100%;

			
 
				-            margin:0;

			
 
				-            padding:0;

			
 
				-            overflow:hidden;

			
 
				-            font-family:sans-serif;

			
 
				-        }

			
 
				-

			
 
				-        /* First try : PG-like */

			
 
				-        /*#game-canvas {

			
 
				-            width:75%;

			
 
				-            height:100%; 

			
 
				-            top:0;

			
 
				-            left:0;

			
 
				+            height: 100%;

			
 
				+            padding: 0;

			
 
				+            margin: 0

			
 
				         }

			
 
				-        .fakeToolbar {

			
 
				-            height:150px;

			
 
				-            background-color: #333;

			
 
				-        }

			
 
				-        .mini {

			
 
				-            display:flex;

			
 
				-            height:calc(100% - 150px);

			
 
				+        

			
 
				+        #wrapper {

			
 
				+            width: 100%;

			
 
				+            height: 100%;

			
 
				+            display: flex;

			
 
				+            overflow: hidden;

			
 
				         }

			
 
				-        .fakeBarAgain {

			
 
				-            width:50%;

			
 
				-            background-color: #333;

			
 
				-        }*/

			
 
				         

			
 
				-        /*Second : sandbox like*/

			
 
				-        #game-canvas {

			
 
				-            position:absolute;

			
 
				-            width:100%;

			
 
				-            height:100%; 

			
 
				-            top:0;

			
 
				+        canvas {

			
 
				+            width: 75%;

			
 
				         }

			
 
				-        .fakeFooter {

			
 
				-            position:absolute;

			
 
				-            width:100%;

			
 
				-            height:50px;

			
 
				-            background-color: #333;

			
 
				-            bottom: 0;

			
 
				+        

			
 
				+        #inspector {

			
 
				+            width: 25%;

			
 
				         }

			
 
				-

			
 
				     </style>

			
 
				 

			
 
				 </head>

			
 
				+

			
 
				 <body>

			
 
				-    

			
 
				-    <!-- First try : PG-like 

			
 
				-    <div class="fakeToolbar"></div>

			
 
				-    <div class="mini">

			
 
				-        <div class="fakeBarAgain"></div>

			
 
				-        <canvas id="game-canvas"></canvas> 

			
 
				-    </div>-->

			
 
				-    <!--Second try : Sandbox-like -->

			
 
				-    <canvas id="game-canvas"></canvas>

			
 
				-    <div class="fakeFooter"></div>

			
 
				+

			
 
				+    <div id="wrapper">

			
 
				+        <canvas id='game-canvas'></canvas>

			
 
				+        <div id="inspector"></div>

			
 
				+    </div>

			
 
				+

			
 
				 

			
 
				     <!--Starting the game-->

			
 
				     <script>

			
 
				-        BABYLONDEVTOOLS.Loader.require("test/index.js").load(function() {

			
 
				+        BABYLONDEVTOOLS.Loader.require("test/index.js").load(function () {

			
 
				             new Test('game-canvas');

			
 
				-	    });

			
 
				-	</script>

			
 
				+        });

			
 
				+    </script>

			
 
				 </body>

			
 
				+

			
 
				 </html>
			
--- a/inspector/sass/defines.scss
+++ b/inspector/sass/defines.scss
@@ -3,6 +3,11 @@
 
				 

			
 
				 $font               : 'Inconsolata', sans-serif;

			
 
				 

			
 
				+// ------------- //

			
 
				+// If you update these colors, you should also 

			
 
				+// replace them in the class Inspector as well, 

			
 
				+// as it's used for custom themes

			
 
				+// ------------- //

			
 
				 

			
 
				 $color              : #ccc;

			
 
				 $background         : #242424;

			
--- a/inspector/sass/main.scss
+++ b/inspector/sass/main.scss
@@ -18,6 +18,7 @@
 
				   display:flex;

			
 
				   font-size:0.9em;

			
 
				   font-family     : $font;

			
 
				+  background-color: $background;

			
 
				 

			
 
				   // The panel containing the two subpanel : tree and details

			
 
				   .insp-right-panel {

			
--- a/inspector/src/Inspector.ts
+++ b/inspector/src/Inspector.ts
@@ -30,7 +30,15 @@ module INSPECTOR {
 
				          * If the parameter 'popup' is false, the inspector is created as a right panel on the main window.

			
 
				          * If the parameter 'popup' is true, the inspector is created in another popup.

			
 
				          */

			
 
				-        constructor(scene: BABYLON.Scene, popup?: boolean, initialTab?: number, parentElement?: HTMLElement) {

			
 
				+        constructor(scene: BABYLON.Scene, popup?: boolean, initialTab?: number, parentElement?: HTMLElement, newColors?: {

			
 
				+            backgroundColor?: string,

			
 
				+            backgroundColorLighter?: string,

			
 
				+            backgroundColorLighter2?: string,

			
 
				+            backgroundColorLighter3?: string,

			
 
				+            color?: string,

			
 
				+            colorTop?: string,

			
 
				+            colorBot?: string

			
 
				+        }) {

			
 
				 

			
 
				             //get Tabbar initialTab

			
 
				             this._initialTab = initialTab;

			
@@ -87,96 +95,93 @@ module INSPECTOR {
 
				 

			
 
				                 };

			
 
				 

			
 
				-                // Create c2di wrapper

			
 
				-                this._c2diwrapper = Helpers.CreateDiv('insp-wrapper');

			
 
				-

			
 
				-                // copy style from canvas to wrapper

			
 
				-                for (let prop in this._canvasStyle) {

			
 
				-                    this._c2diwrapper.style[prop] = this._canvasStyle[prop];

			
 
				-                }

			
 
				-

			
 
				-                // Convert wrapper size in % (because getComputedStyle returns px only)

			
 
				-                let widthPx = parseFloat(canvasComputedStyle.width.substr(0, canvasComputedStyle.width.length - 2)) || 0;

			
 
				-                let heightPx = parseFloat(canvasComputedStyle.height.substr(0, canvasComputedStyle.height.length - 2)) || 0;

			
 
				+                if (this._parentElement) {

			
 
				+                    // Build the inspector wrapper

			
 
				+                    this._c2diwrapper = Helpers.CreateDiv('insp-wrapper', this._parentElement);

			
 
				+                    this._c2diwrapper.style.width = '100%';

			
 
				+                    this._c2diwrapper.style.height = '100%';

			
 
				+                    this._c2diwrapper.style.paddingLeft = '5px';

			
 
				+

			
 
				+                    // add inspector     

			
 
				+                    let inspector = Helpers.CreateDiv('insp-right-panel', this._c2diwrapper);

			
 
				+                    inspector.style.width = '100%';

			
 
				+                    inspector.style.height = '100%';

			
 
				+                    // and build it in the popup  

			
 
				+                    this._buildInspector(inspector);

			
 
				+                } else {

			
 
				+                    // Create c2di wrapper

			
 
				+                    this._c2diwrapper = Helpers.CreateDiv('insp-wrapper');

			
 
				 

			
 
				-                // If the canvas position is absolute, restrain the wrapper width to the window width + left positionning

			
 
				-                if (canvasComputedStyle.position === "absolute" || canvasComputedStyle.position === "relative") {

			
 
				-                    // compute only left as it takes predominance if right is also specified (and it will be for the wrapper)

			
 
				-                    let leftPx = parseFloat(canvasComputedStyle.left.substr(0, canvasComputedStyle.left.length - 2)) || 0;

			
 
				-                    if (widthPx + leftPx >= Inspector.WINDOW.innerWidth) {

			
 
				-                        this._c2diwrapper.style.maxWidth = `${widthPx - leftPx}px`;

			
 
				+                    // copy style from canvas to wrapper

			
 
				+                    for (let prop in this._canvasStyle) {

			
 
				+                        this._c2diwrapper.style[prop] = this._canvasStyle[prop];

			
 
				                     }

			
 
				-                }

			
 
				-

			
 
				-                // Check if the parent of the canvas is the body page. If yes, the size ratio is computed

			
 
				-                let parent = this._getRelativeParent(canvas);

			
 
				 

			
 
				-                let parentWidthPx = parent.clientWidth;

			
 
				-                let parentHeightPx = parent.clientHeight;

			
 
				+                    // Convert wrapper size in % (because getComputedStyle returns px only)

			
 
				+                    let widthPx = parseFloat(canvasComputedStyle.width.substr(0, canvasComputedStyle.width.length - 2)) || 0;

			
 
				+                    let heightPx = parseFloat(canvasComputedStyle.height.substr(0, canvasComputedStyle.height.length - 2)) || 0;

			
 
				 

			
 
				-                let pWidth = widthPx / parentWidthPx * 100;

			
 
				-                let pheight = heightPx / parentHeightPx * 100;

			
 
				-

			
 
				-                this._c2diwrapper.style.width = pWidth + "%";

			
 
				-                this._c2diwrapper.style.height = pheight + "%";

			
 
				-

			
 
				-                // reset canvas style

			
 
				-                canvas.style.position = "static";

			
 
				-                canvas.style.width = "100%";

			
 
				-                canvas.style.height = "100%";

			
 
				-                canvas.style.paddingBottom = "0";

			
 
				-                canvas.style.paddingLeft = "0";

			
 
				-                canvas.style.paddingTop = "0";

			
 
				-                canvas.style.paddingRight = "0";

			
 
				-

			
 
				-                canvas.style.margin = "0";

			
 
				-                canvas.style.marginBottom = "0";

			
 
				-                canvas.style.marginLeft = "0";

			
 
				-                canvas.style.marginTop = "0";

			
 
				-                canvas.style.marginRight = "0";

			
 
				-

			
 
				-

			
 
				-                // Replace canvas with the wrapper...

			
 
				-                // if (this._parentElement) {

			
 
				-                //     canvasParent.replaceChild(this._parentElement, canvas);

			
 
				-                //     this._parentElement.appendChild(canvas);

			
 
				-                // }

			
 
				-                // else {

			
 
				-                canvasParent.replaceChild(this._c2diwrapper, canvas);

			
 
				-                // ... and add canvas to the wrapper

			
 
				-                this._c2diwrapper.appendChild(canvas);

			
 
				-                // }

			
 
				-

			
 
				-

			
 
				-

			
 
				-                // add inspector

			
 
				-                let inspector;

			
 
				-                if (this._parentElement) {

			
 
				-                    this._c2diwrapper.appendChild(this._parentElement);

			
 
				-                    inspector = Helpers.CreateDiv('insp-right-panel', this._parentElement);

			
 
				-                    inspector.style.width = '100%';

			
 
				-                    inspector.style.height = '100%';

			
 
				-                }

			
 
				-                else {

			
 
				-                    inspector = Helpers.CreateDiv('insp-right-panel', this._c2diwrapper);

			
 
				-                }

			
 
				+                    // If the canvas position is absolute, restrain the wrapper width to the window width + left positionning

			
 
				+                    if (canvasComputedStyle.position === "absolute" || canvasComputedStyle.position === "relative") {

			
 
				+                        // compute only left as it takes predominance if right is also specified (and it will be for the wrapper)

			
 
				+                        let leftPx = parseFloat(canvasComputedStyle.left.substr(0, canvasComputedStyle.left.length - 2)) || 0;

			
 
				+                        if (widthPx + leftPx >= Inspector.WINDOW.innerWidth) {

			
 
				+                            this._c2diwrapper.style.maxWidth = `${widthPx - leftPx}px`;

			
 
				+                        }

			
 
				+                    }

			
 
				 

			
 
				-                // Add split bar

			
 
				-                if (!this._parentElement) {

			
 
				-                    Split([canvas, inspector], {

			
 
				-                        direction: 'horizontal',

			
 
				-                        sizes: [75, 25],

			
 
				-                        onDrag: () => {

			
 
				-                            Helpers.SEND_EVENT('resize');

			
 
				-                            if (this._tabbar) {

			
 
				-                                this._tabbar.updateWidth()

			
 
				+                    // Check if the parent of the canvas is the body page. If yes, the size ratio is computed

			
 
				+                    let parent = this._getRelativeParent(canvas);

			
 
				+

			
 
				+                    let parentWidthPx = parent.clientWidth;

			
 
				+                    let parentHeightPx = parent.clientHeight;

			
 
				+

			
 
				+                    let pWidth = widthPx / parentWidthPx * 100;

			
 
				+                    let pheight = heightPx / parentHeightPx * 100;

			
 
				+

			
 
				+                    this._c2diwrapper.style.width = pWidth + "%";

			
 
				+                    this._c2diwrapper.style.height = pheight + "%";

			
 
				+

			
 
				+                    // reset canvas style

			
 
				+                    canvas.style.position = "static";

			
 
				+                    canvas.style.width = "100%";

			
 
				+                    canvas.style.height = "100%";

			
 
				+                    canvas.style.paddingBottom = "0";

			
 
				+                    canvas.style.paddingLeft = "0";

			
 
				+                    canvas.style.paddingTop = "0";

			
 
				+                    canvas.style.paddingRight = "0";

			
 
				+

			
 
				+                    canvas.style.margin = "0";

			
 
				+                    canvas.style.marginBottom = "0";

			
 
				+                    canvas.style.marginLeft = "0";

			
 
				+                    canvas.style.marginTop = "0";

			
 
				+                    canvas.style.marginRight = "0";

			
 
				+

			
 
				+                    // Replace canvas with the wrapper...

			
 
				+                    canvasParent.replaceChild(this._c2diwrapper, canvas);

			
 
				+                    // ... and add canvas to the wrapper

			
 
				+                    this._c2diwrapper.appendChild(canvas);

			
 
				+

			
 
				+                    // add inspector

			
 
				+                    let inspector = Helpers.CreateDiv('insp-right-panel', this._c2diwrapper);

			
 
				+

			
 
				+                    // Add split bar

			
 
				+                    if (!this._parentElement) {

			
 
				+                        Split([canvas, inspector], {

			
 
				+                            direction: 'horizontal',

			
 
				+                            sizes: [75, 25],

			
 
				+                            onDrag: () => {

			
 
				+                                Helpers.SEND_EVENT('resize');

			
 
				+                                if (this._tabbar) {

			
 
				+                                    this._tabbar.updateWidth()

			
 
				+                                }

			
 
				                             }

			
 
				-                        }

			
 
				-                    });

			
 
				-                }

			
 
				+                        });

			
 
				+                    }

			
 
				 

			
 
				-                // Build the inspector

			
 
				-                this._buildInspector(inspector);

			
 
				+                    // Build the inspector

			
 
				+                    this._buildInspector(inspector);

			
 
				+                }

			
 
				                 // Send resize event to the window

			
 
				                 Helpers.SEND_EVENT('resize');

			
 
				                 this._tabbar.updateWidth();

			
@@ -186,6 +191,36 @@ module INSPECTOR {
 
				             if (!Helpers.IsBrowserEdge()) {

			
 
				                 this.refresh();

			
 
				             }

			
 
				+

			
 
				+            // Check custom css colors

			
 
				+            if (newColors) {

			
 
				+

			
 
				+                let bColor = newColors.backgroundColor || '#242424';

			
 
				+                let bColorl1 = newColors.backgroundColorLighter || '#2c2c2c';

			
 
				+                let bColorl2 = newColors.backgroundColorLighter2 || '#383838';

			
 
				+                let bColorl3 = newColors.backgroundColorLighter3 || '#454545';

			
 
				+

			
 
				+                let color = newColors.color || '#ccc';

			
 
				+                let colorTop = newColors.colorTop || '#f29766';

			
 
				+                let colorBot = newColors.colorBot || '#5db0d7';

			
 
				+

			
 
				+                let styles = Inspector.DOCUMENT.querySelectorAll('style');

			
 
				+                for (let s = 0; s < styles.length; s++) {

			
 
				+                    let style = styles[s];

			
 
				+

			
 
				+                    if (style.innerHTML.indexOf('insp-wrapper') != -1) {

			
 
				+

			
 
				+                        styles[s].innerHTML = styles[s].innerHTML

			
 
				+                            .replace(/#242424/g, bColor) // background color

			
 
				+                            .replace(/#2c2c2c/g, bColorl1) // background-lighter

			
 
				+                            .replace(/#383838/g, bColorl2) // background-lighter2

			
 
				+                            .replace(/#454545/g, bColorl3) // background-lighter3

			
 
				+                            .replace(/#ccc/g, color) // color

			
 
				+                            .replace(/#f29766/g, colorTop) // color-top

			
 
				+                            .replace(/#5db0d7/g, colorBot) // color-bot

			
 
				+                    }

			
 
				+                }

			
 
				+            }

			
 
				         }

			
 
				 

			
 
				         /**

			
--- a/inspector/src/adapters/Canvas2DAdapter.ts
+++ b/inspector/src/adapters/Canvas2DAdapter.ts
@@ -1,29 +1,29 @@
 
				 module INSPECTOR {

			
 
				-    

			
 
				-    export class Canvas2DAdapter 

			
 
				-        extends Adapter 

			
 
				+

			
 
				+    export class Canvas2DAdapter

			
 
				+        extends Adapter

			
 
				         implements IToolVisible, IToolDebug {

			
 
				-        

			
 
				-        constructor(obj:any) {

			
 
				+

			
 
				+        constructor(obj: any) {

			
 
				             super(obj);

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Returns the name displayed in the tree */

			
 
				-        public id() : string {

			
 
				+        public id(): string {

			
 
				             let str = '';

			
 
				             if (this._obj.id) {

			
 
				                 str = this._obj.id;

			
 
				             } // otherwise nothing displayed        

			
 
				             return str;

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Returns the type of this object - displayed in the tree */

			
 
				-        public type() : string{

			
 
				+        public type(): string {

			
 
				             return Helpers.GET_TYPE(this._obj);

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Returns the list of properties to be displayed for this adapter */

			
 
				-        public getProperties() : Array<PropertyLine> {

			
 
				+        public getProperties(): Array<PropertyLine> {

			
 
				             let propertiesLines = [];

			
 
				             if (this._obj.propDic) {

			
 
				                 let dico = this._obj.propDic as BABYLON.StringDictionary<BABYLON.Prim2DPropInfo>;

			
@@ -31,42 +31,42 @@ module INSPECTOR {
 
				                     let property = new Property(name, this.actualObject);

			
 
				                     propertiesLines.push(new PropertyLine(property));

			
 
				                 });

			
 
				-            }            

			
 
				+            }

			
 
				             // TODO REMOVE THIS WHEN PROPERTIES WILL BE DECORATED

			
 
				             let toAddDirty = [

			
 
				-                'actualZOffset', 'isSizeAuto', 'layoutArea', 'layoutAreaPos', 'contentArea', 

			
 
				-                'marginOffset', 'paddingOffset', 'isPickable', 'isContainer', 'boundingInfo', 

			
 
				-                'levelBoundingInfo', 'isSizedByContent', 'isPositionAuto', 'actualScale', 'layoutBoundingInfo', 

			
 
				-                '_cachedTexture'];

			
 
				+                'actualZOffset', 'isSizeAuto', 'layoutArea', 'layoutAreaPos', 'contentArea',

			
 
				+                'marginOffset', 'paddingOffset', 'isPickable', 'isContainer', 'boundingInfo',

			
 
				+                'levelBoundingInfo', 'isSizedByContent', 'isPositionAuto', 'actualScale', 'layoutBoundingInfo',

			
 
				+                '_cachedTexture', 'actualOpacity'];

			
 
				             for (let dirty of toAddDirty) {

			
 
				                 let infos = new Property(dirty, this.actualObject);

			
 
				                 propertiesLines.push(new PropertyLine(infos));

			
 
				             }

			
 
				-            return propertiesLines; 

			
 
				+            return propertiesLines;

			
 
				         }

			
 
				 

			
 
				-        public getTools() : Array<AbstractTreeTool> {

			
 
				+        public getTools(): Array<AbstractTreeTool> {

			
 
				             let tools = [];

			
 
				             tools.push(new Checkbox(this));

			
 
				-            tools.push(new DebugArea(this));   

			
 
				+            tools.push(new DebugArea(this));

			
 
				             return tools;

			
 
				         }

			
 
				 

			
 
				         /// TOOLS ///

			
 
				-        public setVisible(b:boolean) {

			
 
				+        public setVisible(b: boolean) {

			
 
				             this._obj.levelVisible = b;

			
 
				         }

			
 
				-        public isVisible():boolean{

			
 
				+        public isVisible(): boolean {

			
 
				             return this._obj.levelVisible;

			
 
				         }

			
 
				         /** Overrides super */

			
 
				-        public debug(b:boolean) {

			
 
				+        public debug(b: boolean) {

			
 
				             this._obj["displayDebugAreas"] = b;

			
 
				         }

			
 
				         /** Overrides super.highlight */

			
 
				-        public highlight(b:boolean) {

			
 
				+        public highlight(b: boolean) {

			
 
				         }

			
 
				-        

			
 
				-        

			
 
				+

			
 
				+

			
 
				     }

			
 
				 }
			
--- a/inspector/src/details/PropertyLine.ts
+++ b/inspector/src/details/PropertyLine.ts
@@ -5,14 +5,14 @@ module INSPECTOR {
 
				         /**

			
 
				          * Format the value of the given property of the given object.

			
 
				          */

			
 
				-        public static format(obj: any, prop:string) : string {

			
 
				+        public static format(obj: any, prop: string): string {

			
 
				             // Get original value;

			
 
				             let value = obj[prop];

			
 
				             // test if type PrimitiveAlignment is available (only included in canvas2d)

			
 
				-            if (BABYLON.PrimitiveAlignment) {                

			
 
				+            if (BABYLON.PrimitiveAlignment) {

			
 
				                 if (obj instanceof BABYLON.PrimitiveAlignment) {

			
 
				                     if (prop === 'horizontal') {

			
 
				-                        switch(value) {

			
 
				+                        switch (value) {

			
 
				                             case BABYLON.PrimitiveAlignment.AlignLeft:

			
 
				                                 return 'left';

			
 
				                             case BABYLON.PrimitiveAlignment.AlignRight:

			
@@ -23,7 +23,7 @@ module INSPECTOR {
 
				                                 return 'stretch';

			
 
				                         }

			
 
				                     } else if (prop === 'vertical') {

			
 
				-                        switch(value) {

			
 
				+                        switch (value) {

			
 
				                             case BABYLON.PrimitiveAlignment.AlignTop:

			
 
				                                 return 'top';

			
 
				                             case BABYLON.PrimitiveAlignment.AlignBottom:

			
@@ -54,66 +54,69 @@ module INSPECTOR {
 
				      * 

			
 
				      */

			
 
				     export class PropertyLine {

			
 
				-        

			
 
				+

			
 
				         // The property can be of any type (Property internally can have any type), relative to this._obj

			
 
				-        private _property : Property;    

			
 
				+        private _property: Property;

			
 
				         //The HTML element corresponding to this line

			
 
				-        private _div : HTMLElement;

			
 
				+        private _div: HTMLElement;

			
 
				         // The div containing the value to display. Used to update dynamically the property

			
 
				-        private _valueDiv : HTMLElement;

			
 
				+        private _valueDiv: HTMLElement;

			
 
				         // If the type is complex, this property will have child to update

			
 
				-        private _children : Array<PropertyLine> = [];        

			
 
				+        private _children: Array<PropertyLine> = [];

			
 
				         // Array representing the simple type. All others are considered 'complex'

			
 
				         private static _SIMPLE_TYPE = ['number', 'string', 'boolean'];

			
 
				         // The number of pixel at each children step

			
 
				         private static _MARGIN_LEFT = 15;

			
 
				         // The margin-left used to display to row

			
 
				-        private _level : number;

			
 
				+        private _level: number;

			
 
				         /** The list of viewer element displayed at the end of the line (color, texture...) */

			
 
				-        private _elements : Array<BasicElement> = [];

			
 
				+        private _elements: Array<BasicElement> = [];

			
 
				         /** The property parent of this one. Used to update the value of this property and to retrieve the correct object */

			
 
				-        private _parent : PropertyLine;

			
 
				+        private _parent: PropertyLine;

			
 
				         /** The input element to display if this property is 'simple' in order to update it */

			
 
				-        private _input : HTMLInputElement;

			
 
				+        private _input: HTMLInputElement;

			
 
				         /** Display input handler (stored to be removed afterwards) */

			
 
				-        private _displayInputHandler : EventListener;

			
 
				+        private _displayInputHandler: EventListener;

			
 
				         /** Handler used to validate the input by pressing 'enter' */

			
 
				-        private _validateInputHandler : EventListener;

			
 
				-        

			
 
				-        constructor(prop : Property, parent?: PropertyLine, level:number=0) {

			
 
				+        private _validateInputHandler: EventListener;

			
 
				+        /** Handler used to validate the input by pressing 'esc' */

			
 
				+        private _escapeInputHandler: EventListener;

			
 
				+

			
 
				+        constructor(prop: Property, parent?: PropertyLine, level: number = 0) {

			
 
				             this._property = prop;

			
 
				-            this._level    = level;       

			
 
				-            this._parent   = parent;   

			
 
				-                         

			
 
				+            this._level = level;

			
 
				+            this._parent = parent;

			
 
				+

			
 
				             this._div = Helpers.CreateDiv('row');

			
 
				             this._div.style.marginLeft = `${this._level}px`;

			
 
				-            

			
 
				+

			
 
				             // Property name

			
 
				-            let propName : HTMLElement = Helpers.CreateDiv('prop-name', this._div);

			
 
				+            let propName: HTMLElement = Helpers.CreateDiv('prop-name', this._div);

			
 
				             propName.textContent = `${this.name}`;

			
 
				 

			
 
				             // Value

			
 
				             this._valueDiv = Helpers.CreateDiv('prop-value', this._div);

			
 
				             this._valueDiv.textContent = this._displayValueContent() || '-'; // Init value text node

			
 
				-            

			
 
				+

			
 
				             this._createElements();

			
 
				-            

			
 
				+

			
 
				             for (let elem of this._elements) {

			
 
				                 this._valueDiv.appendChild(elem.toHtml());

			
 
				             }

			
 
				-            

			
 
				+

			
 
				             this._updateValue();

			
 
				 

			
 
				             // If the property type is not simple, add click event to unfold its children

			
 
				-            if (!this._isSimple()) { 

			
 
				+            if (!this._isSimple()) {

			
 
				                 this._valueDiv.classList.add('clickable');

			
 
				                 this._valueDiv.addEventListener('click', this._addDetails.bind(this));

			
 
				             } else {

			
 
				                 this._initInput();

			
 
				                 this._valueDiv.addEventListener('click', this._displayInputHandler);

			
 
				                 this._input.addEventListener('keypress', this._validateInputHandler);

			
 
				+                this._input.addEventListener('keydown', this._escapeInputHandler);

			
 
				             }

			
 
				-            

			
 
				+

			
 
				             // Add this property to the scheduler

			
 
				             Scheduler.getInstance().add(this);

			
 
				         }

			
@@ -124,21 +127,22 @@ module INSPECTOR {
 
				          * - enters updates the property

			
 
				          */

			
 
				         private _initInput() {

			
 
				-            

			
 
				+

			
 
				             // Create the input element

			
 
				             this._input = document.createElement('input') as HTMLInputElement;

			
 
				             this._input.setAttribute('type', 'text');

			
 
				 

			
 
				             // if the property is 'simple', add an event listener to create an input

			
 
				-            this._displayInputHandler  = this._displayInput.bind(this);

			
 
				+            this._displayInputHandler = this._displayInput.bind(this);

			
 
				             this._validateInputHandler = this._validateInput.bind(this);

			
 
				+            this._escapeInputHandler = this._escapeInput.bind(this);

			
 
				         }

			
 
				 

			
 
				         /** 

			
 
				          * On enter : validates the new value and removes the input

			
 
				          * On escape : removes the input

			
 
				          */

			
 
				-        private _validateInput(e : KeyboardEvent) {

			
 
				+        private _validateInput(e: KeyboardEvent) {

			
 
				             if (e.keyCode == 13) {

			
 
				                 // Enter : validate the new value

			
 
				                 let newValue = this._input.value;

			
@@ -148,8 +152,18 @@ module INSPECTOR {
 
				                 this.update();

			
 
				                 // resume scheduler

			
 
				                 Scheduler.getInstance().pause = false;

			
 
				-                

			
 
				-            } else if (e.keyCode == 27) { 

			
 
				+

			
 
				+            } else if (e.keyCode == 27) {

			
 
				+                // Esc : remove input

			
 
				+                this.update();

			
 
				+            }

			
 
				+        }

			
 
				+

			
 
				+        /** 

			
 
				+         * On escape : removes the input

			
 
				+         */

			
 
				+        private _escapeInput(e: KeyboardEvent) {

			
 
				+            if (e.keyCode == 27) {

			
 
				                 // Esc : remove input

			
 
				                 this.update();

			
 
				             }

			
@@ -162,7 +176,7 @@ module INSPECTOR {
 
				             // restore elements

			
 
				             for (let elem of this._elements) {

			
 
				                 this._valueDiv.appendChild(elem.toHtml());

			
 
				-            }            

			
 
				+            }

			
 
				             this._valueDiv.addEventListener('click', this._displayInputHandler);

			
 
				         }

			
 
				 

			
@@ -176,7 +190,7 @@ module INSPECTOR {
 
				             this._valueDiv.textContent = "";

			
 
				             this._input.value = valueTxt;

			
 
				             this._valueDiv.appendChild(this._input);

			
 
				-            

			
 
				+

			
 
				             // Pause the scheduler

			
 
				             Scheduler.getInstance().pause = true;

			
 
				         }

			
@@ -190,76 +204,76 @@ module INSPECTOR {
 
				             if (this._parent) {

			
 
				                 this._property.obj = this._parent.updateObject();

			
 
				             }

			
 
				-            return this._property.value;            

			
 
				+            return this._property.value;

			
 
				         }

			
 
				 

			
 
				         // Returns the property name

			
 
				-        public get name() : string {

			
 
				+        public get name(): string {

			
 
				             return this._property.name;

			
 
				         }

			
 
				 

			
 
				         // Returns the value of the property

			
 
				-        public get value() : any {

			
 
				+        public get value(): any {

			
 
				             return PropertyFormatter.format(this._property.obj, this._property.name);

			
 
				         }

			
 
				 

			
 
				         // Returns the type of the property

			
 
				-        public get type() : string {

			
 
				+        public get type(): string {

			
 
				             return this._property.type;

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Creates elements that wil be displayed on a property line, depending on the

			
 
				          * type of the property.

			
 
				          */

			
 
				         private _createElements() {

			
 
				-            

			
 
				+

			
 
				             // Colors

			
 
				-            if (this.type == 'Color3' ||this.type == 'Color4') {

			
 
				+            if (this.type == 'Color3' || this.type == 'Color4') {

			
 
				                 this._elements.push(new ColorElement(this.value));

			
 
				-            } 

			
 
				+            }

			
 
				             // Texture

			
 
				             if (this.type == 'Texture') {

			
 
				                 this._elements.push(new TextureElement(this.value));

			
 
				-            }   

			
 
				+            }

			
 
				             // HDR Texture

			
 
				             if (this.type == 'HDRCubeTexture') {

			
 
				                 this._elements.push(new HDRCubeTextureElement(this.value));

			
 
				-            }      

			
 
				+            }

			
 
				             if (this.type == 'CubeTexture') {

			
 
				                 this._elements.push(new CubeTextureElement(this.value));

			
 
				-            }      

			
 
				+            }

			
 
				         }

			
 
				 

			
 
				         // Returns the text displayed on the left of the property name : 

			
 
				         // - If the type is simple, display its value

			
 
				         // - If the type is complex, but instance of Vector2, Size, display the type and its tostring

			
 
				         // - If the type is another one, display the Type

			
 
				-        private _displayValueContent () {

			
 
				-            

			
 
				+        private _displayValueContent() {

			
 
				+

			
 
				             let value = this.value;

			
 
				             // If the value is a number, truncate it if needed

			
 
				             if (typeof value === 'number') {

			
 
				-                return Helpers.Trunc(value);                

			
 
				-            } 

			
 
				+                return Helpers.Trunc(value);

			
 
				+            }

			
 
				             // If it's a string or a boolean, display its value

			
 
				             if (typeof value === 'string' || typeof value === 'boolean') {

			
 
				-                return value;          

			
 
				-            } 

			
 
				+                return value;

			
 
				+            }

			
 
				             return PROPERTIES.format(value);

			
 
				-            

			
 
				+

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Delete properly this property line. 

			
 
				          * Removes itself from the scheduler.

			
 
				          * Dispose all viewer element (color, texture...)

			
 
				          */

			
 
				         public dispose() {

			
 
				             // console.log('delete properties', this.name);

			
 
				-            Scheduler.getInstance().remove(this); 

			
 
				+            Scheduler.getInstance().remove(this);

			
 
				             for (let child of this._children) {

			
 
				                 // console.log('delete properties', child.name);

			
 
				-                Scheduler.getInstance().remove(child); 

			
 
				+                Scheduler.getInstance().remove(child);

			
 
				             }

			
 
				             for (let elem of this._elements) {

			
 
				                 elem.dispose();

			
@@ -281,20 +295,20 @@ module INSPECTOR {
 
				                 elem.update(this.value);

			
 
				             }

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Update the property division with the new property value. 

			
 
				          * If this property is complex, update its child, otherwise update its text content

			
 
				          */

			
 
				-        public update() {            

			
 
				-           this._removeInputWithoutValidating();

			
 
				-           this._updateValue();

			
 
				+        public update() {

			
 
				+            this._removeInputWithoutValidating();

			
 
				+            this._updateValue();

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Returns true if the given instance is a simple type  

			
 
				          */

			
 
				-        private static _IS_TYPE_SIMPLE(inst:any) {

			
 
				+        private static _IS_TYPE_SIMPLE(inst: any) {

			
 
				             let type = Helpers.GET_TYPE(inst);

			
 
				             return PropertyLine._SIMPLE_TYPE.indexOf(type) != -1;

			
 
				         }

			
@@ -303,21 +317,21 @@ module INSPECTOR {
 
				          * Returns true if the type of this property is simple, false otherwise.

			
 
				          * Returns true if the value is null

			
 
				          */

			
 
				-        private _isSimple() : boolean {

			
 
				+        private _isSimple(): boolean {

			
 
				             if (this.value != null && this.type !== 'type_not_defined') {

			
 
				                 if (PropertyLine._SIMPLE_TYPE.indexOf(this.type) == -1) {

			
 
				                     // complex type : return the type name

			
 
				                     return false;

			
 
				                 } else {

			
 
				                     // simple type : return value

			
 
				-                    return true; 

			
 
				+                    return true;

			
 
				                 }

			
 
				             } else {

			
 
				                 return true;

			
 
				             }

			
 
				         }

			
 
				 

			
 
				-        public toHtml() : HTMLElement {

			
 
				+        public toHtml(): HTMLElement {

			
 
				             return this._div;

			
 
				         }

			
 
				 

			
@@ -325,7 +339,7 @@ module INSPECTOR {
 
				          * Add sub properties in case of a complex type

			
 
				          */

			
 
				         private _addDetails() {

			
 
				-            if (this._div.classList.contains('unfolded')) {            

			
 
				+            if (this._div.classList.contains('unfolded')) {

			
 
				                 // Remove class unfolded

			
 
				                 this._div.classList.remove('unfolded');

			
 
				                 // remove html children

			
@@ -335,23 +349,23 @@ module INSPECTOR {
 
				             } else {

			
 
				                 // if children does not exists, generate it

			
 
				                 this._div.classList.toggle('unfolded');

			
 
				-                if (this._children.length ==0) {                    

			
 
				+                if (this._children.length == 0) {

			
 
				                     let objToDetail = this.value;

			
 
				                     let propToDisplay = PROPERTIES[Helpers.GET_TYPE(objToDetail)].properties.reverse();

			
 
				                     let propertyLine = null;

			
 
				-                    

			
 
				+

			
 
				                     for (let prop of propToDisplay) {

			
 
				                         let infos = new Property(prop, this._property.value);

			
 
				-                        let child = new PropertyLine(infos, this, this._level+PropertyLine._MARGIN_LEFT);

			
 
				+                        let child = new PropertyLine(infos, this, this._level + PropertyLine._MARGIN_LEFT);

			
 
				                         this._children.push(child);

			
 
				                     }

			
 
				-                } 

			
 
				+                }

			
 
				                 // otherwise display it                    

			
 
				                 for (let child of this._children) {

			
 
				                     this._div.parentNode.insertBefore(child.toHtml(), this._div.nextSibling);

			
 
				                 }

			
 
				-            }            

			
 
				-        }        

			
 
				-    } 

			
 
				-    

			
 
				+            }

			
 
				+        }

			
 
				+    }

			
 
				+

			
 
				 }
			
--- a/inspector/src/helpers/Helpers.ts
+++ b/inspector/src/helpers/Helpers.ts
@@ -1,15 +1,15 @@
 
				 module INSPECTOR {

			
 
				     export class Helpers {

			
 
				-        

			
 
				-        

			
 
				+

			
 
				+

			
 
				         /** 

			
 
				          * Returns the type of the given object. First

			
 
				          * uses getClassName. If nothing is returned, used the type of the constructor

			
 
				          */

			
 
				-        public static GET_TYPE(obj:any) : string{

			
 
				+        public static GET_TYPE(obj: any): string {

			
 
				             if (obj != null && obj != undefined) {

			
 
				                 let classname = BABYLON.Tools.getClassName(obj);

			
 
				-                if (!classname || classname === 'object'){

			
 
				+                if (!classname || classname === 'object') {

			
 
				                     classname = obj.constructor.name;

			
 
				                     // classname is undefined in IE11

			
 
				                     if (!classname) {

			
@@ -25,22 +25,22 @@ module INSPECTOR {
 
				                 return 'type_not_defined';

			
 
				             }

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Check if some properties are defined for the given type.

			
 
				          */

			
 
				-        private static _CheckIfTypeExists(type:string) {

			
 
				+        private static _CheckIfTypeExists(type: string) {

			
 
				             let properties = PROPERTIES[type];

			
 
				             if (properties) {

			
 
				                 return true;

			
 
				-            } 

			
 
				+            }

			
 
				             return false;

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Returns true if the user browser is edge.

			
 
				          */

			
 
				-        public static IsBrowserEdge() : boolean {

			
 
				+        public static IsBrowserEdge(): boolean {

			
 
				             //Detect if we are running on a faulty buggy OS.

			
 
				             var regexp = /Edge/

			
 
				             return regexp.test(navigator.userAgent);

			
@@ -51,7 +51,7 @@ module INSPECTOR {
 
				          * is in PROPERTIES constant.

			
 
				          * Returns 'Undefined' if no type exists for this object

			
 
				          */

			
 
				-        private static _GetTypeFor(obj:any) {

			
 
				+        private static _GetTypeFor(obj: any) {

			
 
				             for (let type in PROPERTIES) {

			
 
				                 let typeBlock = PROPERTIES[type];

			
 
				                 if (typeBlock.type) {

			
@@ -70,9 +70,9 @@ module INSPECTOR {
 
				             var s = f && ((fn.name && ['', fn.name]) || fn.toString().match(/function ([^\(]+)/));

			
 
				             return (!f && 'not a function') || (s && s[1] || 'anonymous');

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Send the event which name is given in parameter to the window */

			
 
				-        public static SEND_EVENT(eventName:string){

			
 
				+        public static SEND_EVENT(eventName: string) {

			
 
				             let event;

			
 
				             if (Inspector.DOCUMENT.createEvent) {

			
 
				                 event = Inspector.DOCUMENT.createEvent('HTMLEvents');

			
@@ -82,25 +82,25 @@ module INSPECTOR {
 
				             }

			
 
				             window.dispatchEvent(event);

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /** Returns the given number with 2 decimal number max if a decimal part exists */

			
 
				-        public static Trunc(nb) :number {

			
 
				-            if(Math.round(nb) !== nb) {

			
 
				+        public static Trunc(nb): number {

			
 
				+            if (Math.round(nb) !== nb) {

			
 
				                 return nb.toFixed(2);

			
 
				             }

			
 
				             return nb;

			
 
				         };

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Useful function used to create a div

			
 
				          */

			
 
				-        public static CreateDiv(className?:string, parent?: HTMLElement) : HTMLElement{

			
 
				+        public static CreateDiv(className?: string, parent?: HTMLElement): HTMLElement {

			
 
				             return Helpers.CreateElement('div', className, parent);

			
 
				         }

			
 
				-        

			
 
				-        public static CreateElement(element:string, className?:string, parent?: HTMLElement) : HTMLElement{

			
 
				+

			
 
				+        public static CreateElement(element: string, className?: string, parent?: HTMLElement): HTMLElement {

			
 
				             let elem = Inspector.DOCUMENT.createElement(element);

			
 
				-            

			
 
				+

			
 
				             if (className) {

			
 
				                 elem.className = className;

			
 
				             }

			
@@ -109,12 +109,12 @@ module INSPECTOR {
 
				             }

			
 
				             return elem;

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         /**

			
 
				          * Removes all children of the given div.

			
 
				          */

			
 
				-        public static CleanDiv(div:HTMLElement) {

			
 
				-            while ( div.firstChild ) {

			
 
				+        public static CleanDiv(div: HTMLElement) {

			
 
				+            while (div.firstChild) {

			
 
				                 div.removeChild(div.firstChild);

			
 
				             }

			
 
				         }

			
@@ -122,7 +122,7 @@ module INSPECTOR {
 
				         /**

			
 
				          * Returns the true value of the given CSS Attribute from the given element (in percentage or in pixel, as it was specified in the css)

			
 
				          */

			
 
				-        public static Css(elem:HTMLElement, cssAttribute:string) : string{

			
 
				+        public static Css(elem: HTMLElement, cssAttribute: string): string {

			
 
				             let clone = elem.cloneNode(true) as HTMLElement;

			
 
				             let div = Helpers.CreateDiv('', Inspector.DOCUMENT.body);

			
 
				             div.style.display = 'none';

			
@@ -131,17 +131,17 @@ module INSPECTOR {
 
				             div.parentNode.removeChild(div);

			
 
				             return value;

			
 
				         }

			
 
				-        

			
 
				+

			
 
				         public static LoadScript() {

			
 
				             BABYLON.Tools.LoadFile("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/highlight.min.js", (elem) => {

			
 
				                 let script = Helpers.CreateElement('script', '', Inspector.DOCUMENT.body);

			
 
				-                script.textContent = elem;                

			
 
				-                

			
 
				+                script.textContent = elem;

			
 
				+

			
 
				                 // Load glsl detection

			
 
				                 BABYLON.Tools.LoadFile("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/languages/glsl.min.js", (elem) => {

			
 
				                     let script = Helpers.CreateElement('script', '', Inspector.DOCUMENT.body);

			
 
				-                    script.textContent = elem;                    

			
 
				-                    

			
 
				+                    script.textContent = elem;

			
 
				+

			
 
				                     // Load css style

			
 
				                     BABYLON.Tools.LoadFile("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.7.0/styles/zenburn.min.css", (elem) => {

			
 
				                         let style = Helpers.CreateElement('style', '', Inspector.DOCUMENT.body);

			
@@ -149,19 +149,19 @@ module INSPECTOR {
 
				                     });

			
 
				                 }, null, null, null, () => {

			
 
				                     console.log("erreur");

			
 
				-                });      

			
 
				-                

			
 
				+                });

			
 
				+

			
 
				             }, null, null, null, () => {

			
 
				                 console.log("erreur");

			
 
				             });

			
 
				-            

			
 
				+

			
 
				         }

			
 
				 

			
 
				         public static IsSystemName(name: string): boolean {

			
 
				-            if (name==null) {

			
 
				+            if (name == null) {

			
 
				                 return false;

			
 
				             }

			
 
				-            return name.indexOf("###")===0 && name.lastIndexOf("###")===(name.length-3);

			
 
				+            return name.indexOf("###") === 0 && name.lastIndexOf("###") === (name.length - 3);

			
 
				         }

			
 
				     }

			
 
				 }
			
--- a/inspector/src/properties.ts
+++ b/inspector/src/properties.ts
@@ -315,8 +315,97 @@ module INSPECTOR {
 
				                 'cameraColorGradingTexture',

			
 
				                 'cameraColorCurves'

			
 
				             ]

			
 
				+        },

			
 
				+        'Canvas2D': {

			
 
				+            type: BABYLON.Canvas2D

			
 
				+        },

			
 
				+        'Canvas2DEngineBoundData': {

			
 
				+            type: BABYLON.Canvas2DEngineBoundData

			
 
				+        },

			
 
				+        'Ellipse2D': {

			
 
				+            type: BABYLON.Ellipse2D

			
 
				+        },

			
 
				+        'Ellipse2DInstanceData': {

			
 
				+            type: BABYLON.Ellipse2DInstanceData

			
 
				+        },

			
 
				+        'Ellipse2DRenderCache': {

			
 
				+            type: BABYLON.Ellipse2DRenderCache

			
 
				+        },

			
 
				+        'Group2D': {

			
 
				+            type: BABYLON.Group2D

			
 
				+        },

			
 
				+        'IntersectInfo2D': {

			
 
				+            type: BABYLON.IntersectInfo2D

			
 
				+        },

			
 
				+        'Lines2D': {

			
 
				+            type: BABYLON.Lines2D

			
 
				+        },

			
 
				+        'Lines2DInstanceData': {

			
 
				+            type: BABYLON.Lines2DInstanceData

			
 
				+        },

			
 
				+        'Lines2DRenderCache': {

			
 
				+            type: BABYLON.Lines2DRenderCache

			
 
				+        },

			
 
				+        'PrepareRender2DContext': {

			
 
				+            type: BABYLON.PrepareRender2DContext

			
 
				+        },

			
 
				+        'Prim2DBase': {

			
 
				+            type: BABYLON.Prim2DBase

			
 
				+        },

			
 
				+        'Prim2DClassInfo': {

			
 
				+            type: BABYLON.Prim2DClassInfo

			
 
				+        },

			
 
				+        'Prim2DPropInfo': {

			
 
				+            type: BABYLON.Prim2DPropInfo

			
 
				+        },

			
 
				+        'Rectangle2D': {

			
 
				+            type: BABYLON.Rectangle2D

			
 
				+        },

			
 
				+        'Rectangle2DInstanceData': {

			
 
				+            type: BABYLON.Rectangle2DInstanceData

			
 
				+        },

			
 
				+        'Rectangle2DRenderCache': {

			
 
				+            type: BABYLON.Rectangle2DRenderCache

			
 
				+        },

			
 
				+        'Render2DContext': {

			
 
				+            type: BABYLON.Render2DContext

			
 
				+        },

			
 
				+        'RenderablePrim2D': {

			
 
				+            type: BABYLON.RenderablePrim2D

			
 
				+        },

			
 
				+        'ScreenSpaceCanvas2D': {

			
 
				+            type: BABYLON.ScreenSpaceCanvas2D

			
 
				+        },

			
 
				+        'Shape2D': {

			
 
				+            type: BABYLON.Shape2D

			
 
				+        },

			
 
				+        'Shape2DInstanceData': {

			
 
				+            type: BABYLON.Shape2DInstanceData

			
 
				+        },

			
 
				+        'Sprite2D': {

			
 
				+            type: BABYLON.Sprite2D

			
 
				+        },

			
 
				+        'Sprite2DInstanceData': {

			
 
				+            type: BABYLON.Sprite2DInstanceData

			
 
				+        },

			
 
				+        'Sprite2DRenderCache': {

			
 
				+            type: BABYLON.Sprite2DRenderCache

			
 
				+        },

			
 
				+        'Text2D': {

			
 
				+            type: BABYLON.Text2D

			
 
				+        },

			
 
				+        'Text2DInstanceData': {

			
 
				+            type: BABYLON.Text2DInstanceData

			
 
				+        },

			
 
				+        'Text2DRenderCache': {

			
 
				+            type: BABYLON.Text2DRenderCache

			
 
				+        },

			
 
				+        'WorldSpaceCanvas2D': {

			
 
				+            type: BABYLON.WorldSpaceCanvas2D

			
 
				+        },

			
 
				+        'WorldSpaceCanvas2DNode': {

			
 
				+            type: BABYLON.WorldSpaceCanvas2DNode

			
 
				         }

			
 
				-

			
 
				     }

			
 
				 

			
 
				 }
			
--- a/inspector/test/index.js
+++ b/inspector/test/index.js
@@ -16,7 +16,17 @@ var Test = (function () {
 
				     Test.prototype._run = function () {

			
 
				         var _this = this;

			
 
				         this._initScene();

			
 
				-        this.scene.debugLayer.show({ popup: false, initialTab: 4 });

			
 
				+        this.scene.debugLayer.show({

			
 
				+            popup: false,

			
 
				+            parentElement: document.getElementById('inspector'),

			
 
				+            newColors: {

			
 
				+                backgroundColor: '#eee',

			
 
				+                backgroundColorLighter: '#fff',

			
 
				+                backgroundColorLighter2: '#fff',

			
 
				+                backgroundColorLighter3: '#fff',

			
 
				+                color: '#333'

			
 
				+            }

			
 
				+        });

			
 
				         this.scene.executeWhenReady(function () {

			
 
				             _this._initGame();

			
 
				             _this.engine.runRenderLoop(function () {

			
--- a/loaders/src/glTF/babylon.glTFFileLoader.ts
+++ b/loaders/src/glTF/babylon.glTFFileLoader.ts
@@ -934,7 +934,7 @@ module BABYLON {
 
				                 var translation = node.translation || [0, 0, 0];

			
 
				                 var rotation = node.rotation || [0, 0, 0, 1];

			
 
				                 var scale = node.scale || [1, 1, 1];

			
 
				-                configureNode(lastNode, Vector3.FromArray(translation), Quaternion.FromArray(rotation), Vector3.FromArray(scale));
			
 
				+                configureNode(lastNode, Vector3.FromArray(translation), Quaternion.FromArray(rotation), Vector3.FromArray(scale));

			
 
				             }

			
 
				 

			
 
				             lastNode.updateCache(true);

			
@@ -1293,14 +1293,14 @@ module BABYLON {
 
				             return gltfRuntime;

			
 
				         }

			
 
				 

			
 
				-        public static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void): void {

			
 
				+        public static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): void {

			
 
				             var buffer: IGLTFBuffer = gltfRuntime.buffers[id];

			
 
				 

			
 
				             if (GLTFUtils.IsBase64(buffer.uri)) {

			
 
				                 setTimeout(() => onSuccess(new Uint8Array(GLTFUtils.DecodeBase64(buffer.uri))));

			
 
				             }

			
 
				             else {

			
 
				-                Tools.LoadFile(gltfRuntime.rootUrl + buffer.uri, data => onSuccess(new Uint8Array(data)), null, null, true, onError);

			
 
				+                Tools.LoadFile(gltfRuntime.rootUrl + buffer.uri, data => onSuccess(new Uint8Array(data)), onProgress, null, true, onError);

			
 
				             }

			
 
				         }

			
 
				 

			
@@ -1560,7 +1560,7 @@ module BABYLON {
 
				         /**

			
 
				         * Import meshes

			
 
				         */

			
 
				-        public importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onError?: () => void): boolean {

			
 
				+        public importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess?: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onError?: () => void, onProgress?: () => void): boolean {

			
 
				             scene.useRightHandedSystem = true;

			
 
				 

			
 
				             var gltfRuntime = GLTFFileLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, gltfRuntime => {

			
@@ -1613,7 +1613,8 @@ module BABYLON {
 
				                             onSuccess(meshes, null, skeletons);

			
 
				                         }

			
 
				                     });

			
 
				-                });

			
 
				+                },

			
 
				+                onProgress);

			
 
				 

			
 
				                 if (GLTFFileLoader.IncrementalLoading && onSuccess) {

			
 
				                     onSuccess(meshes, null, skeletons);

			
@@ -1626,7 +1627,7 @@ module BABYLON {
 
				         /**

			
 
				         * Load scene

			
 
				         */

			
 
				-        public loadAsync(scene: Scene, data: string | ArrayBuffer, rootUrl: string, onSuccess: () => void, onError: () => void): boolean {

			
 
				+        public loadAsync(scene: Scene, data: string, rootUrl: string, onSuccess: () => void, onError: () => void): boolean {

			
 
				             scene.useRightHandedSystem = true;

			
 
				 

			
 
				             GLTFFileLoaderExtension.LoadRuntimeAsync(scene, data, rootUrl, gltfRuntime => {

			
@@ -1692,7 +1693,7 @@ module BABYLON {
 
				             }

			
 
				         };

			
 
				 

			
 
				-        private _loadBuffersAsync(gltfRuntime: IGLTFRuntime, onload: () => void): void {

			
 
				+        private _loadBuffersAsync(gltfRuntime: IGLTFRuntime, onload: () => void, onProgress?: () => void): void {

			
 
				             var hasBuffers = false;

			
 
				 

			
 
				             var processBuffer = (buf: string, buffer: IGLTFBuffer) => {

			
--- a/loaders/src/glTF/babylon.glTFFileLoaderExtension.ts
+++ b/loaders/src/glTF/babylon.glTFFileLoaderExtension.ts
@@ -32,7 +32,7 @@ module BABYLON {
 
				         * Defines an override for loading buffers

			
 
				         * Return true to stop further extensions from loading this buffer

			
 
				         */

			
 
				-        public loadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void): boolean {

			
 
				+        public loadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (buffer: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): boolean {

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -92,11 +92,11 @@ module BABYLON {
 
				             });

			
 
				         }

			
 
				 

			
 
				-        public static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (bufferView: ArrayBufferView) => void, onError: () => void): void {

			
 
				+        public static LoadBufferAsync(gltfRuntime: IGLTFRuntime, id: string, onSuccess: (bufferView: ArrayBufferView) => void, onError: () => void, onProgress?: () => void): void {

			
 
				             GLTFFileLoaderExtension.ApplyExtensions(loaderExtension => {

			
 
				-                return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError);

			
 
				+                return loaderExtension.loadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);

			
 
				             }, () => {

			
 
				-                GLTFFileLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError);

			
 
				+                GLTFFileLoaderBase.LoadBufferAsync(gltfRuntime, id, onSuccess, onError, onProgress);

			
 
				             });

			
 
				         }

			
 
				 

			
--- a/materialsLibrary/src/custom/Babylon.CustomMaterial.js.map
+++ b/materialsLibrary/src/custom/Babylon.CustomMaterial.js.map
--- a/materialsLibrary/src/custom/babylon.customMaterial.js
+++ b/materialsLibrary/src/custom/babylon.customMaterial.js
@@ -1,9 +1,14 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>
			
 
				-var __extends = (this && this.__extends) || function (d, b) {
			
 
				-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
			
 
				-    function __() { this.constructor = d; }
			
 
				-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				-};
			
 
				+var __extends = (this && this.__extends) || (function () {
			
 
				+    var extendStatics = Object.setPrototypeOf ||
			
 
				+        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
			
 
				+        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
			
 
				+    return function (d, b) {
			
 
				+        extendStatics(d, b);
			
 
				+        function __() { this.constructor = d; }
			
 
				+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
			
 
				+    };
			
 
				+})();
			
 
				 var BABYLON;
			
 
				 (function (BABYLON) {
			
 
				     var CustomShaderHelper = (function () {
			
@@ -20,376 +25,11 @@ var BABYLON;
 
				             _this._diffusePart = 'vec3 diffuseColor=vDiffuseColor.rgb;';
			
 
				             _this._vertexPositionPart = 'gl_Position=viewProjection*finalWorld*vec4(position,1.0);';
			
 
				             _this.builder = builder;
			
 
				+            _this.customShaderNameResolve = function (shaderName) {
			
 
				+                return _this.builder(new CustomShaderHelper(), shaderName, _this._mainPart, _this._diffusePart, _this._vertexPositionPart);
			
 
				+            };
			
 
				             return _this;
			
 
				         }
			
 
				-        CustomMaterial.prototype.isReady = function (mesh, useInstances) {
			
 
				-            if (this.isFrozen) {
			
 
				-                if (this._wasPreviouslyReady) {
			
 
				-                    return true;
			
 
				-                }
			
 
				-            }
			
 
				-            var scene = this.getScene();
			
 
				-            var engine = scene.getEngine();
			
 
				-            var needUVs = false;
			
 
				-            var needNormals = false;
			
 
				-            this._defines.reset();
			
 
				-            // Lights
			
 
				-            if (scene.lightsEnabled && !this.disableLighting) {
			
 
				-                needNormals = BABYLON.MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);
			
 
				-            }
			
 
				-            if (!this.checkReadyOnEveryCall) {
			
 
				-                if (this._renderId === scene.getRenderId()) {
			
 
				-                    if (this._checkCache(scene, mesh, useInstances)) {
			
 
				-                        return true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            // Textures
			
 
				-            if (scene.texturesEnabled) {
			
 
				-                if (this.diffuseTexture && BABYLON.StandardMaterial.DiffuseTextureEnabled) {
			
 
				-                    if (!this.diffuseTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.DIFFUSE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.ambientTexture && BABYLON.StandardMaterial.AmbientTextureEnabled) {
			
 
				-                    if (!this.ambientTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.AMBIENT = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.opacityTexture && BABYLON.StandardMaterial.OpacityTextureEnabled) {
			
 
				-                    if (!this.opacityTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.OPACITY = true;
			
 
				-                        if (this.opacityTexture.getAlphaFromRGB) {
			
 
				-                            this._defines.OPACITYRGB = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.reflectionTexture && BABYLON.StandardMaterial.ReflectionTextureEnabled) {
			
 
				-                    if (!this.reflectionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needNormals = true;
			
 
				-                        this._defines.REFLECTION = true;
			
 
				-                        if (this.roughness > 0) {
			
 
				-                            this._defines.ROUGHNESS = true;
			
 
				-                        }
			
 
				-                        if (this.useReflectionOverAlpha) {
			
 
				-                            this._defines.REFLECTIONOVERALPHA = true;
			
 
				-                        }
			
 
				-                        if (this.reflectionTexture.coordinatesMode === BABYLON.Texture.INVCUBIC_MODE) {
			
 
				-                            this._defines.INVERTCUBICMAP = true;
			
 
				-                        }
			
 
				-                        this._defines.REFLECTIONMAP_3D = this.reflectionTexture.isCube;
			
 
				-                        switch (this.reflectionTexture.coordinatesMode) {
			
 
				-                            case BABYLON.Texture.CUBIC_MODE:
			
 
				-                            case BABYLON.Texture.INVCUBIC_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_CUBIC = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.EXPLICIT_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EXPLICIT = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.PLANAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PLANAR = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.PROJECTION_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PROJECTION = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.SKYBOX_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SKYBOX = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.SPHERICAL_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SPHERICAL = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR = true;
			
 
				-                                break;
			
 
				-                            case BABYLON.Texture.FIXED_EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = true;
			
 
				-                                break;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.emissiveTexture && BABYLON.StandardMaterial.EmissiveTextureEnabled) {
			
 
				-                    if (!this.emissiveTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.EMISSIVE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.lightmapTexture && BABYLON.StandardMaterial.LightmapTextureEnabled) {
			
 
				-                    if (!this.lightmapTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.LIGHTMAP = true;
			
 
				-                        this._defines.USELIGHTMAPASSHADOWMAP = this.useLightmapAsShadowmap;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.specularTexture && BABYLON.StandardMaterial.SpecularTextureEnabled) {
			
 
				-                    if (!this.specularTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.SPECULAR = true;
			
 
				-                        this._defines.GLOSSINESS = this.useGlossinessFromSpecularMapAlpha;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (scene.getEngine().getCaps().standardDerivatives && this.bumpTexture && BABYLON.StandardMaterial.BumpTextureEnabled) {
			
 
				-                    if (!this.bumpTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.BUMP = true;
			
 
				-                        if (this.useParallax) {
			
 
				-                            this._defines.PARALLAX = true;
			
 
				-                            if (this.useParallaxOcclusion) {
			
 
				-                                this._defines.PARALLAXOCCLUSION = true;
			
 
				-                            }
			
 
				-                        }
			
 
				-                        if (this.invertNormalMapX) {
			
 
				-                            this._defines.INVERTNORMALMAPX = true;
			
 
				-                        }
			
 
				-                        if (this.invertNormalMapY) {
			
 
				-                            this._defines.INVERTNORMALMAPY = true;
			
 
				-                        }
			
 
				-                        if (scene._mirroredCameraPosition) {
			
 
				-                            this._defines.INVERTNORMALMAPX = !this._defines.INVERTNORMALMAPX;
			
 
				-                            this._defines.INVERTNORMALMAPY = !this._defines.INVERTNORMALMAPY;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.refractionTexture && BABYLON.StandardMaterial.RefractionTextureEnabled) {
			
 
				-                    if (!this.refractionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.REFRACTION = true;
			
 
				-                        this._defines.REFRACTIONMAP_3D = this.refractionTexture.isCube;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (this.cameraColorGradingTexture && BABYLON.StandardMaterial.ColorGradingTextureEnabled) {
			
 
				-                    if (!this.cameraColorGradingTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    }
			
 
				-                    else {
			
 
				-                        this._defines.CAMERACOLORGRADING = true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-            // Effect
			
 
				-            if (scene.clipPlane) {
			
 
				-                this._defines.CLIPPLANE = true;
			
 
				-            }
			
 
				-            if (engine.getAlphaTesting()) {
			
 
				-                this._defines.ALPHATEST = true;
			
 
				-            }
			
 
				-            if (this._shouldUseAlphaFromDiffuseTexture()) {
			
 
				-                this._defines.ALPHAFROMDIFFUSE = true;
			
 
				-            }
			
 
				-            if (this.useEmissiveAsIllumination) {
			
 
				-                this._defines.EMISSIVEASILLUMINATION = true;
			
 
				-            }
			
 
				-            if (this.linkEmissiveWithDiffuse) {
			
 
				-                this._defines.LINKEMISSIVEWITHDIFFUSE = true;
			
 
				-            }
			
 
				-            if (this.useLogarithmicDepth) {
			
 
				-                this._defines.LOGARITHMICDEPTH = true;
			
 
				-            }
			
 
				-            if (this.cameraColorCurves) {
			
 
				-                this._defines.CAMERACOLORCURVES = true;
			
 
				-            }
			
 
				-            // Point size
			
 
				-            if (this.pointsCloud || scene.forcePointsCloud) {
			
 
				-                this._defines.POINTSIZE = true;
			
 
				-            }
			
 
				-            // Fog
			
 
				-            if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== BABYLON.Scene.FOGMODE_NONE && this.fogEnabled) {
			
 
				-                this._defines.FOG = true;
			
 
				-            }
			
 
				-            if (BABYLON.StandardMaterial.FresnelEnabled) {
			
 
				-                // Fresnel
			
 
				-                if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled ||
			
 
				-                    this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||
			
 
				-                    this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled ||
			
 
				-                    this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled ||
			
 
				-                    this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				-                    if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled) {
			
 
				-                        this._defines.DIFFUSEFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled) {
			
 
				-                        this._defines.OPACITYFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFLECTIONFRESNEL = true;
			
 
				-                        if (this.useReflectionFresnelFromSpecular) {
			
 
				-                            this._defines.REFLECTIONFRESNELFROMSPECULAR = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-                    if (this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFRACTIONFRESNEL = true;
			
 
				-                    }
			
 
				-                    if (this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled) {
			
 
				-                        this._defines.EMISSIVEFRESNEL = true;
			
 
				-                    }
			
 
				-                    needNormals = true;
			
 
				-                    this._defines.FRESNEL = true;
			
 
				-                }
			
 
				-            }
			
 
				-            if (this._defines.SPECULARTERM && this.useSpecularOverAlpha) {
			
 
				-                this._defines.SPECULAROVERALPHA = true;
			
 
				-            }
			
 
				-            // Attribs
			
 
				-            if (mesh) {
			
 
				-                if (needNormals && mesh.isVerticesDataPresent(BABYLON.VertexBuffer.NormalKind)) {
			
 
				-                    this._defines.NORMAL = true;
			
 
				-                }
			
 
				-                if (needUVs) {
			
 
				-                    if (mesh.isVerticesDataPresent(BABYLON.VertexBuffer.UVKind)) {
			
 
				-                        this._defines.UV1 = true;
			
 
				-                    }
			
 
				-                    if (mesh.isVerticesDataPresent(BABYLON.VertexBuffer.UV2Kind)) {
			
 
				-                        this._defines.UV2 = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useVertexColors && mesh.isVerticesDataPresent(BABYLON.VertexBuffer.ColorKind)) {
			
 
				-                    this._defines.VERTEXCOLOR = true;
			
 
				-                    if (mesh.hasVertexAlpha) {
			
 
				-                        this._defines.VERTEXALPHA = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useBones && mesh.computeBonesUsingShaders) {
			
 
				-                    this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;
			
 
				-                    this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);
			
 
				-                }
			
 
				-                // Instances
			
 
				-                if (useInstances) {
			
 
				-                    this._defines.INSTANCES = true;
			
 
				-                }
			
 
				-            }
			
 
				-            // Get correct effect      
			
 
				-            if (!this._defines.isEqual(this._cachedDefines)) {
			
 
				-                this._defines.cloneTo(this._cachedDefines);
			
 
				-                scene.resetCachedMaterial();
			
 
				-                // Fallbacks
			
 
				-                var fallbacks = new BABYLON.EffectFallbacks();
			
 
				-                if (this._defines.REFLECTION) {
			
 
				-                    fallbacks.addFallback(0, "REFLECTION");
			
 
				-                }
			
 
				-                if (this._defines.SPECULAR) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAR");
			
 
				-                }
			
 
				-                if (this._defines.BUMP) {
			
 
				-                    fallbacks.addFallback(0, "BUMP");
			
 
				-                }
			
 
				-                if (this._defines.PARALLAX) {
			
 
				-                    fallbacks.addFallback(1, "PARALLAX");
			
 
				-                }
			
 
				-                if (this._defines.PARALLAXOCCLUSION) {
			
 
				-                    fallbacks.addFallback(0, "PARALLAXOCCLUSION");
			
 
				-                }
			
 
				-                if (this._defines.SPECULAROVERALPHA) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAROVERALPHA");
			
 
				-                }
			
 
				-                if (this._defines.FOG) {
			
 
				-                    fallbacks.addFallback(1, "FOG");
			
 
				-                }
			
 
				-                if (this._defines.POINTSIZE) {
			
 
				-                    fallbacks.addFallback(0, "POINTSIZE");
			
 
				-                }
			
 
				-                if (this._defines.LOGARITHMICDEPTH) {
			
 
				-                    fallbacks.addFallback(0, "LOGARITHMICDEPTH");
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.HandleFallbacksForShadows(this._defines, fallbacks, this.maxSimultaneousLights);
			
 
				-                if (this._defines.SPECULARTERM) {
			
 
				-                    fallbacks.addFallback(0, "SPECULARTERM");
			
 
				-                }
			
 
				-                if (this._defines.DIFFUSEFRESNEL) {
			
 
				-                    fallbacks.addFallback(1, "DIFFUSEFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.OPACITYFRESNEL) {
			
 
				-                    fallbacks.addFallback(2, "OPACITYFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.REFLECTIONFRESNEL) {
			
 
				-                    fallbacks.addFallback(3, "REFLECTIONFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.EMISSIVEFRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "EMISSIVEFRESNEL");
			
 
				-                }
			
 
				-                if (this._defines.FRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "FRESNEL");
			
 
				-                }
			
 
				-                //Attributes
			
 
				-                var attribs = [BABYLON.VertexBuffer.PositionKind];
			
 
				-                if (this._defines.NORMAL) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.NormalKind);
			
 
				-                }
			
 
				-                if (this._defines.UV1) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.UVKind);
			
 
				-                }
			
 
				-                if (this._defines.UV2) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.UV2Kind);
			
 
				-                }
			
 
				-                if (this._defines.VERTEXCOLOR) {
			
 
				-                    attribs.push(BABYLON.VertexBuffer.ColorKind);
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);
			
 
				-                BABYLON.MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);
			
 
				-                var shaderName = "default";
			
 
				-                if (this.builder) {
			
 
				-                    shaderName = this.builder(new CustomShaderHelper(), shaderName, this._mainPart, this._diffusePart, this._vertexPositionPart);
			
 
				-                }
			
 
				-                var join = this._defines.toString();
			
 
				-                var uniforms = ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vAmbientColor", "vDiffuseColor", "vSpecularColor", "vEmissiveColor",
			
 
				-                    "vFogInfos", "vFogColor", "pointSize",
			
 
				-                    "vDiffuseInfos", "vAmbientInfos", "vOpacityInfos", "vReflectionInfos", "vEmissiveInfos", "vSpecularInfos", "vBumpInfos", "vLightmapInfos", "vRefractionInfos",
			
 
				-                    "mBones",
			
 
				-                    "vClipPlane", "diffuseMatrix", "ambientMatrix", "opacityMatrix", "reflectionMatrix", "emissiveMatrix", "specularMatrix", "bumpMatrix", "lightmapMatrix", "refractionMatrix",
			
 
				-                    "depthValues",
			
 
				-                    "diffuseLeftColor", "diffuseRightColor", "opacityParts", "reflectionLeftColor", "reflectionRightColor", "emissiveLeftColor", "emissiveRightColor", "refractionLeftColor", "refractionRightColor",
			
 
				-                    "logarithmicDepthConstant"
			
 
				-                ];
			
 
				-                var samplers = ["diffuseSampler", "ambientSampler", "opacitySampler", "reflectionCubeSampler", "reflection2DSampler", "emissiveSampler", "specularSampler", "bumpSampler", "lightmapSampler", "refractionCubeSampler", "refraction2DSampler"];
			
 
				-                if (this._defines.CAMERACOLORCURVES) {
			
 
				-                    BABYLON.ColorCurves.PrepareUniforms(uniforms);
			
 
				-                }
			
 
				-                if (this._defines.CAMERACOLORGRADING) {
			
 
				-                    BABYLON.ColorGradingTexture.PrepareUniformsAndSamplers(uniforms, samplers);
			
 
				-                }
			
 
				-                BABYLON.MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, this._defines, this.maxSimultaneousLights);
			
 
				-                this._effect = scene.getEngine().createEffect(shaderName, attribs, uniforms, samplers, join, fallbacks, this.onCompiled, this.onError, { maxSimultaneousLights: this.maxSimultaneousLights - 1 });
			
 
				-            }
			
 
				-            if (!this._effect.isReady()) {
			
 
				-                return false;
			
 
				-            }
			
 
				-            this._renderId = scene.getRenderId();
			
 
				-            this._wasPreviouslyReady = true;
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new BABYLON.StandardMaterialDefines();
			
 
				-                }
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				-            return true;
			
 
				-        };
			
 
				         return CustomMaterial;
			
 
				     }(BABYLON.StandardMaterial));
			
 
				     BABYLON.CustomMaterial = CustomMaterial;
			
--- a/materialsLibrary/src/custom/babylon.customMaterial.ts
+++ b/materialsLibrary/src/custom/babylon.customMaterial.ts
@@ -20,455 +20,16 @@ module BABYLON {
 
				         constructor (name: string, builder:ICustomMaterialBuilder, scene: Scene) {
			
 
				             super(name, scene);  
			
 
				             this.builder = builder;             
			
 
				-        }   
			
 
				- 
			
 
				-        public isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean {
			
 
				-            if (this.isFrozen) {
			
 
				-                if (this._wasPreviouslyReady) {
			
 
				-                    return true;
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            var scene = this.getScene();
			
 
				-            var engine = scene.getEngine();
			
 
				-            var needUVs = false;
			
 
				-            var needNormals = false;
			
 
				-
			
 
				-            this._defines.reset();
			
 
				-
			
 
				-            // Lights
			
 
				-            if (scene.lightsEnabled && !this.disableLighting) {
			
 
				-                needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);
			
 
				-            }
			
 
				-
			
 
				-            if (!this.checkReadyOnEveryCall) {
			
 
				-                if (this._renderId === scene.getRenderId()) {
			
 
				-                    if (this._checkCache(scene, mesh, useInstances)) {
			
 
				-                        return true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            // Textures
			
 
				-            if (scene.texturesEnabled) {
			
 
				-                if (this.diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {
			
 
				-                    if (!this.diffuseTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.DIFFUSE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.ambientTexture && StandardMaterial.AmbientTextureEnabled) {
			
 
				-                    if (!this.ambientTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.AMBIENT = true;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.opacityTexture && StandardMaterial.OpacityTextureEnabled) {
			
 
				-                    if (!this.opacityTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.OPACITY = true;
			
 
				-
			
 
				-                        if (this.opacityTexture.getAlphaFromRGB) {
			
 
				-                            this._defines.OPACITYRGB = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.reflectionTexture && StandardMaterial.ReflectionTextureEnabled) {
			
 
				-                    if (!this.reflectionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needNormals = true;
			
 
				-                        this._defines.REFLECTION = true;
			
 
				-
			
 
				-                        if (this.roughness > 0) {
			
 
				-                            this._defines.ROUGHNESS = true;
			
 
				-                        }
			
 
				-
			
 
				-                        if (this.useReflectionOverAlpha) {
			
 
				-                            this._defines.REFLECTIONOVERALPHA = true;
			
 
				-                        }
			
 
				-
			
 
				-                        if (this.reflectionTexture.coordinatesMode === Texture.INVCUBIC_MODE) {
			
 
				-                            this._defines.INVERTCUBICMAP = true;
			
 
				-                        }
			
 
				-
			
 
				-                        this._defines.REFLECTIONMAP_3D = this.reflectionTexture.isCube;
			
 
				-
			
 
				-                        switch (this.reflectionTexture.coordinatesMode) {
			
 
				-                            case Texture.CUBIC_MODE:
			
 
				-                            case Texture.INVCUBIC_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_CUBIC = true;
			
 
				-                                break;
			
 
				-                            case Texture.EXPLICIT_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EXPLICIT = true;
			
 
				-                                break;
			
 
				-                            case Texture.PLANAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PLANAR = true;
			
 
				-                                break;
			
 
				-                            case Texture.PROJECTION_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_PROJECTION = true;
			
 
				-                                break;
			
 
				-                            case Texture.SKYBOX_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SKYBOX = true;
			
 
				-                                break;
			
 
				-                            case Texture.SPHERICAL_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_SPHERICAL = true;
			
 
				-                                break;
			
 
				-                            case Texture.EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR = true;
			
 
				-                                break;
			
 
				-                            case Texture.FIXED_EQUIRECTANGULAR_MODE:
			
 
				-                                this._defines.REFLECTIONMAP_EQUIRECTANGULAR_FIXED = true;
			
 
				-                                break;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.emissiveTexture && StandardMaterial.EmissiveTextureEnabled) {
			
 
				-                    if (!this.emissiveTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.EMISSIVE = true;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.lightmapTexture && StandardMaterial.LightmapTextureEnabled) {
			
 
				-                    if (!this.lightmapTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.LIGHTMAP = true;
			
 
				-                        this._defines.USELIGHTMAPASSHADOWMAP = this.useLightmapAsShadowmap;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.specularTexture && StandardMaterial.SpecularTextureEnabled) {
			
 
				-                    if (!this.specularTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.SPECULAR = true;
			
 
				-                        this._defines.GLOSSINESS = this.useGlossinessFromSpecularMapAlpha;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (scene.getEngine().getCaps().standardDerivatives && this.bumpTexture && StandardMaterial.BumpTextureEnabled) {
			
 
				-                    if (!this.bumpTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.BUMP = true;
			
 
				-
			
 
				-                        if (this.useParallax) {
			
 
				-                            this._defines.PARALLAX = true;
			
 
				-                            if (this.useParallaxOcclusion) {
			
 
				-                                this._defines.PARALLAXOCCLUSION = true;
			
 
				-                            }
			
 
				-                        }
			
 
				-
			
 
				-                        if (this.invertNormalMapX) {
			
 
				-                            this._defines.INVERTNORMALMAPX = true;
			
 
				-                        }
			
 
				-
			
 
				-                        if (this.invertNormalMapY) {
			
 
				-                            this._defines.INVERTNORMALMAPY = true;
			
 
				-                        }
			
 
				-
			
 
				-                        if (scene._mirroredCameraPosition) {
			
 
				-                            this._defines.INVERTNORMALMAPX = !this._defines.INVERTNORMALMAPX;
			
 
				-                            this._defines.INVERTNORMALMAPY = !this._defines.INVERTNORMALMAPY;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.refractionTexture && StandardMaterial.RefractionTextureEnabled) {
			
 
				-                    if (!this.refractionTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        needUVs = true;
			
 
				-                        this._defines.REFRACTION = true;
			
 
				-
			
 
				-                        this._defines.REFRACTIONMAP_3D = this.refractionTexture.isCube;
			
 
				-                    }
			
 
				-                }
			
 
				-
			
 
				-                if (this.cameraColorGradingTexture && StandardMaterial.ColorGradingTextureEnabled) {
			
 
				-                    if (!this.cameraColorGradingTexture.isReady()) {
			
 
				-                        return false;
			
 
				-                    } else {
			
 
				-                        this._defines.CAMERACOLORGRADING = true;
			
 
				-                    }
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            // Effect
			
 
				-            if (scene.clipPlane) {
			
 
				-                this._defines.CLIPPLANE = true;
			
 
				-            }
			
 
				-
			
 
				-            if (engine.getAlphaTesting()) {
			
 
				-                this._defines.ALPHATEST = true;
			
 
				-            }
			
 
				-
			
 
				-            if (this._shouldUseAlphaFromDiffuseTexture()) {
			
 
				-                this._defines.ALPHAFROMDIFFUSE = true;
			
 
				-            }
			
 
				-
			
 
				-            if (this.useEmissiveAsIllumination) {
			
 
				-                this._defines.EMISSIVEASILLUMINATION = true;
			
 
				-            }
			
 
				-
			
 
				-            if (this.linkEmissiveWithDiffuse) {
			
 
				-                this._defines.LINKEMISSIVEWITHDIFFUSE = true;
			
 
				-            }
			
 
				-
			
 
				-            if (this.useLogarithmicDepth) {
			
 
				-                this._defines.LOGARITHMICDEPTH = true;
			
 
				-            }
			
 
				-            
			
 
				-            if (this.cameraColorCurves) {
			
 
				-                this._defines.CAMERACOLORCURVES = true;
			
 
				-            }
			
 
				-
			
 
				-            // Point size
			
 
				-            if (this.pointsCloud || scene.forcePointsCloud) {
			
 
				-                this._defines.POINTSIZE = true;
			
 
				-            }
			
 
				-
			
 
				-            // Fog
			
 
				-            if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE && this.fogEnabled) {
			
 
				-                this._defines.FOG = true;
			
 
				-            }
			
 
				-
			
 
				-            if (StandardMaterial.FresnelEnabled) {
			
 
				-                // Fresnel
			
 
				-                if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled ||
			
 
				-                    this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled ||
			
 
				-                    this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled ||
			
 
				-                    this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled ||
			
 
				-                    this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				 
			
 
				-                    if (this.diffuseFresnelParameters && this.diffuseFresnelParameters.isEnabled) {
			
 
				-                        this._defines.DIFFUSEFRESNEL = true;
			
 
				-                    }
			
 
				-
			
 
				-                    if (this.opacityFresnelParameters && this.opacityFresnelParameters.isEnabled) {
			
 
				-                        this._defines.OPACITYFRESNEL = true;
			
 
				-                    }
			
 
				-
			
 
				-                    if (this.reflectionFresnelParameters && this.reflectionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFLECTIONFRESNEL = true;
			
 
				-
			
 
				-                        if (this.useReflectionFresnelFromSpecular) {
			
 
				-                            this._defines.REFLECTIONFRESNELFROMSPECULAR = true;
			
 
				-                        }
			
 
				-                    }
			
 
				-
			
 
				-                    if (this.refractionFresnelParameters && this.refractionFresnelParameters.isEnabled) {
			
 
				-                        this._defines.REFRACTIONFRESNEL = true;
			
 
				-                    }
			
 
				-
			
 
				-                    if (this.emissiveFresnelParameters && this.emissiveFresnelParameters.isEnabled) {
			
 
				-                        this._defines.EMISSIVEFRESNEL = true;
			
 
				-                    }
			
 
				-
			
 
				-                    needNormals = true;
			
 
				-                    this._defines.FRESNEL = true;
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            if (this._defines.SPECULARTERM && this.useSpecularOverAlpha) {
			
 
				-                this._defines.SPECULAROVERALPHA = true;
			
 
				-            }
			
 
				-
			
 
				-            // Attribs
			
 
				-            if (mesh) {
			
 
				-                if (needNormals && mesh.isVerticesDataPresent(VertexBuffer.NormalKind)) {
			
 
				-                    this._defines.NORMAL = true;
			
 
				-                }
			
 
				-                if (needUVs) {
			
 
				-                    if (mesh.isVerticesDataPresent(VertexBuffer.UVKind)) {
			
 
				-                        this._defines.UV1 = true;
			
 
				-                    }
			
 
				-                    if (mesh.isVerticesDataPresent(VertexBuffer.UV2Kind)) {
			
 
				-                        this._defines.UV2 = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useVertexColors && mesh.isVerticesDataPresent(VertexBuffer.ColorKind)) {
			
 
				-                    this._defines.VERTEXCOLOR = true;
			
 
				-
			
 
				-                    if (mesh.hasVertexAlpha) {
			
 
				-                        this._defines.VERTEXALPHA = true;
			
 
				-                    }
			
 
				-                }
			
 
				-                if (mesh.useBones && mesh.computeBonesUsingShaders) {
			
 
				-                    this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;
			
 
				-                    this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);
			
 
				-                }
			
 
				-
			
 
				-                // Instances
			
 
				-                if (useInstances) {
			
 
				-                    this._defines.INSTANCES = true;
			
 
				-                }
			
 
				-            }
			
 
				-
			
 
				-            // Get correct effect      
			
 
				-            if (!this._defines.isEqual(this._cachedDefines)) {
			
 
				-                this._defines.cloneTo(this._cachedDefines);
			
 
				-
			
 
				-                scene.resetCachedMaterial();
			
 
				-
			
 
				-                // Fallbacks
			
 
				-                var fallbacks = new EffectFallbacks();
			
 
				-                if (this._defines.REFLECTION) {
			
 
				-                    fallbacks.addFallback(0, "REFLECTION");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.SPECULAR) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAR");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.BUMP) {
			
 
				-                    fallbacks.addFallback(0, "BUMP");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.PARALLAX) {
			
 
				-                    fallbacks.addFallback(1, "PARALLAX");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.PARALLAXOCCLUSION) {
			
 
				-                    fallbacks.addFallback(0, "PARALLAXOCCLUSION");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.SPECULAROVERALPHA) {
			
 
				-                    fallbacks.addFallback(0, "SPECULAROVERALPHA");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.FOG) {
			
 
				-                    fallbacks.addFallback(1, "FOG");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.POINTSIZE) {
			
 
				-                    fallbacks.addFallback(0, "POINTSIZE");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.LOGARITHMICDEPTH) {
			
 
				-                    fallbacks.addFallback(0, "LOGARITHMICDEPTH");
			
 
				-                }
			
 
				-
			
 
				-                MaterialHelper.HandleFallbacksForShadows(this._defines, fallbacks, this.maxSimultaneousLights);
			
 
				-
			
 
				-                if (this._defines.SPECULARTERM) {
			
 
				-                    fallbacks.addFallback(0, "SPECULARTERM");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.DIFFUSEFRESNEL) {
			
 
				-                    fallbacks.addFallback(1, "DIFFUSEFRESNEL");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.OPACITYFRESNEL) {
			
 
				-                    fallbacks.addFallback(2, "OPACITYFRESNEL");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.REFLECTIONFRESNEL) {
			
 
				-                    fallbacks.addFallback(3, "REFLECTIONFRESNEL");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.EMISSIVEFRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "EMISSIVEFRESNEL");
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.FRESNEL) {
			
 
				-                    fallbacks.addFallback(4, "FRESNEL");
			
 
				-                }
			
 
				-
			
 
				-                //Attributes
			
 
				-                var attribs = [VertexBuffer.PositionKind];
			
 
				-
			
 
				-                if (this._defines.NORMAL) {
			
 
				-                    attribs.push(VertexBuffer.NormalKind);
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.UV1) {
			
 
				-                    attribs.push(VertexBuffer.UVKind);
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.UV2) {
			
 
				-                    attribs.push(VertexBuffer.UV2Kind);
			
 
				-                }
			
 
				-
			
 
				-                if (this._defines.VERTEXCOLOR) {
			
 
				-                    attribs.push(VertexBuffer.ColorKind);
			
 
				-                }
			
 
				-
			
 
				-                MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);
			
 
				-                MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);
			
 
				-                
			
 
				-                var shaderName = "default";
			
 
				-               
			
 
				-                if (this.builder) {
			
 
				- 
			
 
				-                     shaderName = this.builder(
			
 
				+            this.customShaderNameResolve = (shaderName) => {
			
 
				+                return this.builder(
			
 
				                          new CustomShaderHelper(),
			
 
				                          shaderName, 
			
 
				                          this._mainPart,
			
 
				                          this._diffusePart, 
			
 
				                          this._vertexPositionPart ); 
			
 
				-               }
			
 
				-
			
 
				-                var join = this._defines.toString();
			
 
				-                var uniforms = ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vAmbientColor", "vDiffuseColor", "vSpecularColor", "vEmissiveColor",
			
 
				-                    "vFogInfos", "vFogColor", "pointSize",
			
 
				-                    "vDiffuseInfos", "vAmbientInfos", "vOpacityInfos", "vReflectionInfos", "vEmissiveInfos", "vSpecularInfos", "vBumpInfos", "vLightmapInfos", "vRefractionInfos",
			
 
				-                    "mBones",
			
 
				-                    "vClipPlane", "diffuseMatrix", "ambientMatrix", "opacityMatrix", "reflectionMatrix", "emissiveMatrix", "specularMatrix", "bumpMatrix", "lightmapMatrix", "refractionMatrix",
			
 
				-                    "depthValues",
			
 
				-                    "diffuseLeftColor", "diffuseRightColor", "opacityParts", "reflectionLeftColor", "reflectionRightColor", "emissiveLeftColor", "emissiveRightColor", "refractionLeftColor", "refractionRightColor",
			
 
				-                    "logarithmicDepthConstant"
			
 
				-                ];
			
 
				-
			
 
				-                var samplers = ["diffuseSampler", "ambientSampler", "opacitySampler", "reflectionCubeSampler", "reflection2DSampler", "emissiveSampler", "specularSampler", "bumpSampler", "lightmapSampler", "refractionCubeSampler", "refraction2DSampler"]
			
 
				-
			
 
				-                if (this._defines.CAMERACOLORCURVES) {
			
 
				-                    ColorCurves.PrepareUniforms(uniforms);
			
 
				-                }
			
 
				-                if (this._defines.CAMERACOLORGRADING) {
			
 
				-                    ColorGradingTexture.PrepareUniformsAndSamplers(uniforms, samplers);
			
 
				-                }
			
 
				-                MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, this._defines, this.maxSimultaneousLights);
			
 
				-
			
 
				-                this._effect = scene.getEngine().createEffect(shaderName,
			
 
				-                    attribs, uniforms, samplers,
			
 
				-                    join, fallbacks, this.onCompiled, this.onError, { maxSimultaneousLights: this.maxSimultaneousLights - 1 });
			
 
				             }
			
 
				-            if (!this._effect.isReady()) {
			
 
				-                return false;
			
 
				-            }
			
 
				-
			
 
				-            this._renderId = scene.getRenderId();
			
 
				-            this._wasPreviouslyReady = true;
			
 
				-
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new StandardMaterialDefines();
			
 
				-                }
			
 
				-
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				-
			
 
				-            return true;
			
 
				-        }
			
 
				-    
			
 
				+        }           
			
 
				     }
			
 
				 }
			
 
				      
			
--- a/materialsLibrary/src/fire/babylon.fireMaterial.ts
+++ b/materialsLibrary/src/fire/babylon.fireMaterial.ts
@@ -1,7 +1,6 @@
 
				 /// <reference path="../../../dist/preview release/babylon.d.ts"/>

			
 
				 

			
 
				 module BABYLON {

			
 
				-    var maxSimultaneousLights = 4;

			
 
				 

			
 
				     class FireMaterialDefines extends MaterialDefines {

			
 
				         public DIFFUSE = false;

			
@@ -18,18 +17,24 @@ module BABYLON {
 
				 

			
 
				         constructor() {

			
 
				             super();

			
 
				-            this._keys = Object.keys(this);

			
 
				+            this.rebuild();

			
 
				         }

			
 
				     }

			
 
				 

			
 
				-    export class FireMaterial extends Material {

			
 
				-        @serializeAsTexture()

			
 
				-        public diffuseTexture: BaseTexture;

			
 
				+    export class FireMaterial extends PushMaterial {

			
 
				+        @serializeAsTexture("diffuseTexture")

			
 
				+        private _diffuseTexture: BaseTexture;

			
 
				+        @expandToProperty("_markAllSubMeshesAsTexturesDirty")

			
 
				+        public diffuseTexture: BaseTexture;        

			
 
				         

			
 
				-        @serializeAsTexture()

			
 
				-        public distortionTexture: BaseTexture;

			
 
				+        @serializeAsTexture("distortionTexture")

			
 
				+        private _distortionTexture: BaseTexture;

			
 
				+        @expandToProperty("_markAllSubMeshesAsTexturesDirty")

			
 
				+        public distortionTexture: BaseTexture;       

			
 
				         

			
 
				-        @serializeAsTexture()

			
 
				+        @serializeAsTexture("opacityTexture")

			
 
				+        private _opacityTexture: BaseTexture;

			
 
				+        @expandToProperty("_markAllSubMeshesAsTexturesDirty")

			
 
				         public opacityTexture: BaseTexture;

			
 
				         

			
 
				         @serialize("diffuseColor")

			
@@ -40,24 +45,18 @@ module BABYLON {
 
				         

			
 
				         private _scaledDiffuse = new Color3();

			
 
				         private _renderId: number;

			
 
				-

			
 
				-        private _defines = new FireMaterialDefines();

			
 
				-        private _cachedDefines = new FireMaterialDefines();

			
 
				-        

			
 
				         private _lastTime: number = 0;

			
 
				 

			
 
				         constructor(name: string, scene: Scene) {

			
 
				             super(name, scene);

			
 
				-

			
 
				-            this._cachedDefines.BonesPerMesh = -1;

			
 
				         }

			
 
				 

			
 
				         public needAlphaBlending(): boolean {

			
 
				-            return (this.alpha < 1.0);

			
 
				+            return false;

			
 
				         }

			
 
				 

			
 
				         public needAlphaTesting(): boolean {

			
 
				-            return false;

			
 
				+            return true;

			
 
				         }

			
 
				 

			
 
				         public getAlphaTestTexture(): BaseTexture {

			
@@ -65,134 +64,94 @@ module BABYLON {
 
				         }

			
 
				 

			
 
				         // Methods   

			
 
				-        private _checkCache(scene: Scene, mesh?: AbstractMesh, useInstances?: boolean): boolean {

			
 
				-            if (!mesh) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				-            if (this._defines.INSTANCES !== useInstances) {

			
 
				-                return false;

			
 
				-            }

			
 
				-

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				-            return false;

			
 
				-        }

			
 
				-

			
 
				-        public isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean {

			
 
				-            if (this.checkReadyOnlyOnce) {

			
 
				-                if (this._wasPreviouslyReady) {

			
 
				+        public isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean {   

			
 
				+            if (this.isFrozen) {

			
 
				+                if (this._wasPreviouslyReady && subMesh.effect) {

			
 
				                     return true;

			
 
				                 }

			
 
				             }

			
 
				 

			
 
				+            if (!subMesh._materialDefines) {

			
 
				+                subMesh._materialDefines = new FireMaterialDefines();

			
 
				+            }

			
 
				+

			
 
				+            var defines = <FireMaterialDefines>subMesh._materialDefines;

			
 
				             var scene = this.getScene();

			
 
				 

			
 
				             if (!this.checkReadyOnEveryCall) {

			
 
				                 if (this._renderId === scene.getRenderId()) {

			
 
				-                    if (this._checkCache(scene, mesh, useInstances)) {

			
 
				-                        return true;

			
 
				-                    }

			
 
				+                    return true;

			
 
				                 }

			
 
				             }

			
 
				 

			
 
				             var engine = scene.getEngine();

			
 
				-            var needNormals = false;

			
 
				-            var needUVs = false;

			
 
				-

			
 
				-            this._defines.reset();

			
 
				 

			
 
				             // Textures

			
 
				-            if (scene.texturesEnabled) {

			
 
				-                if (this.diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				-                    if (!this.diffuseTexture.isReady()) {

			
 
				+            if (defines._areTexturesDirty) {

			
 
				+                defines._needUVs = false;

			
 
				+                if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				+                    if (!this._diffuseTexture.isReady()) {

			
 
				                         return false;

			
 
				                     } else {

			
 
				-                        needUVs = true;

			
 
				-                        this._defines.DIFFUSE = true;

			
 
				+                        defines._needUVs = true;

			
 
				+                        defines.DIFFUSE = true;

			
 
				                     }

			
 
				-                }                

			
 
				+                }  

			
 
				+                defines._areTexturesDirty = false;              

			
 
				             }

			
 
				 

			
 
				-            // Effect

			
 
				-            if (scene.clipPlane) {

			
 
				-                this._defines.CLIPPLANE = true;

			
 
				-            }

			
 
				-            

			
 
				-            this._defines.ALPHATEST = true;

			
 
				+            // Misc.

			
 
				+            if (defines._areMiscDirty) {

			
 
				+                defines.POINTSIZE = (this.pointsCloud || scene.forcePointsCloud);

			
 
				+                defines.FOG = (scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE && this.fogEnabled);

			
 
				 

			
 
				-            // Point size

			
 
				-            if (this.pointsCloud || scene.forcePointsCloud) {

			
 
				-                this._defines.POINTSIZE = true;

			
 
				-            }

			
 
				-

			
 
				-            // Fog

			
 
				-            if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE && this.fogEnabled) {

			
 
				-                this._defines.FOG = true;

			
 
				+                defines._areMiscDirty = false;

			
 
				             }

			
 
				             

			
 
				+            // Values that need to be evaluated on every frame

			
 
				+            defines.CLIPPLANE = (scene.clipPlane !== undefined && scene.clipPlane !== null);

			
 
				+            defines.ALPHATEST = engine.getAlphaTesting();

			
 
				+            defines.INSTANCES = useInstances;

			
 
				+            

			
 
				             // Attribs

			
 
				-            if (mesh) {

			
 
				-                if (needUVs) {

			
 
				-                    if (mesh.isVerticesDataPresent(VertexBuffer.UVKind)) {

			
 
				-                        this._defines.UV1 = true;

			
 
				-                    }

			
 
				-                }

			
 
				-                if (mesh.useVertexColors && mesh.isVerticesDataPresent(VertexBuffer.ColorKind)) {

			
 
				-                    this._defines.VERTEXCOLOR = true;

			
 
				-

			
 
				-                    if (mesh.hasVertexAlpha) {

			
 
				-                        this._defines.VERTEXALPHA = true;

			
 
				-                    }

			
 
				-                }

			
 
				-                if (mesh.useBones && mesh.computeBonesUsingShaders) {

			
 
				-                    this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;

			
 
				-                    this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);

			
 
				-                }

			
 
				-

			
 
				-                // Instances

			
 
				-                if (useInstances) {

			
 
				-                    this._defines.INSTANCES = true;

			
 
				-                }

			
 
				-            }

			
 
				+            MaterialHelper.PrepareDefinesForAttributes(mesh, defines, useInstances);

			
 
				+            defines._areAttributesDirty = false;

			
 
				 

			
 
				             // Get correct effect      

			
 
				-            if (!this._defines.isEqual(this._cachedDefines)) {

			
 
				-                this._defines.cloneTo(this._cachedDefines);

			
 
				+            if (defines._isDirty) {

			
 
				+                defines._isDirty = false;

			
 
				 

			
 
				                 scene.resetCachedMaterial();

			
 
				 

			
 
				                 // Fallbacks

			
 
				                 var fallbacks = new EffectFallbacks();             

			
 
				-                if (this._defines.FOG) {

			
 
				+                if (defines.FOG) {

			
 
				                     fallbacks.addFallback(1, "FOG");

			
 
				                 }

			
 
				                 

			
 
				-                if (this._defines.NUM_BONE_INFLUENCERS > 0) {

			
 
				+                if (defines.NUM_BONE_INFLUENCERS > 0) {

			
 
				                     fallbacks.addCPUSkinningFallback(0, mesh);

			
 
				                 }

			
 
				 

			
 
				                 //Attributes

			
 
				                 var attribs = [VertexBuffer.PositionKind];

			
 
				 

			
 
				-                if (this._defines.UV1) {

			
 
				+                if (defines.UV1) {

			
 
				                     attribs.push(VertexBuffer.UVKind);

			
 
				                 }

			
 
				 

			
 
				-                if (this._defines.VERTEXCOLOR) {

			
 
				+                if (defines.VERTEXCOLOR) {

			
 
				                     attribs.push(VertexBuffer.ColorKind);

			
 
				                 }

			
 
				 

			
 
				-                MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);

			
 
				-                MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);

			
 
				+                MaterialHelper.PrepareAttributesForBones(attribs, mesh, defines, fallbacks);

			
 
				+                MaterialHelper.PrepareAttributesForInstances(attribs, defines);

			
 
				 

			
 
				                 // Legacy browser patch

			
 
				                 var shaderName = "fire";

			
 
				                 

			
 
				-                var join = this._defines.toString();

			
 
				-                this._effect = scene.getEngine().createEffect(shaderName,

			
 
				+                var join = defines.toString();

			
 
				+                subMesh.setEffect(scene.getEngine().createEffect(shaderName,

			
 
				                     attribs,

			
 
				                     ["world", "view", "viewProjection", "vEyePosition",

			
 
				                         "vFogInfos", "vFogColor", "pointSize",

			
@@ -206,109 +165,105 @@ module BABYLON {
 
				                         // Fire

			
 
				                         "distortionSampler", "opacitySampler"

			
 
				                     ],

			
 
				-                    join, fallbacks, this.onCompiled, this.onError);

			
 
				+                    join, fallbacks, this.onCompiled, this.onError), defines);

			
 
				             }

			
 
				             

			
 
				-            if (!this._effect.isReady()) {

			
 
				+            if (!subMesh.effect.isReady()) {

			
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new FireMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
 
				-        public bindOnlyWorldMatrix(world: Matrix): void {

			
 
				-            this._effect.setMatrix("world", world);

			
 
				-        }

			
 
				-

			
 
				-        public bind(world: Matrix, mesh?: Mesh): void {

			
 
				+        public bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void {

			
 
				             var scene = this.getScene();

			
 
				 

			
 
				-            // Matrices        

			
 
				+            var defines = <FireMaterialDefines>subMesh._materialDefines;

			
 
				+            if (!defines) {

			
 
				+                return;

			
 
				+            }

			
 
				+

			
 
				+            var effect = subMesh.effect;

			
 
				+            this._activeEffect = effect;

			
 
				+

			
 
				+            // Matrices

			
 
				             this.bindOnlyWorldMatrix(world);

			
 
				-            this._effect.setMatrix("viewProjection", scene.getTransformMatrix());

			
 
				+            this._activeEffect.setMatrix("viewProjection", scene.getTransformMatrix());

			
 
				 

			
 
				             // Bones

			
 
				-            MaterialHelper.BindBonesParameters(mesh, this._effect);

			
 
				+            MaterialHelper.BindBonesParameters(mesh, this._activeEffect);

			
 
				 

			
 
				-            if (scene.getCachedMaterial() !== this) {

			
 
				+            if (this._mustRebind(scene, effect)) {

			
 
				                 // Textures        

			
 
				-                if (this.diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				-                    this._effect.setTexture("diffuseSampler", this.diffuseTexture);

			
 
				+                if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				+                    this._activeEffect.setTexture("diffuseSampler", this._diffuseTexture);

			
 
				 

			
 
				-                    this._effect.setFloat2("vDiffuseInfos", this.diffuseTexture.coordinatesIndex, this.diffuseTexture.level);

			
 
				-                    this._effect.setMatrix("diffuseMatrix", this.diffuseTexture.getTextureMatrix());

			
 
				+                    this._activeEffect.setFloat2("vDiffuseInfos", this._diffuseTexture.coordinatesIndex, this._diffuseTexture.level);

			
 
				+                    this._activeEffect.setMatrix("diffuseMatrix", this._diffuseTexture.getTextureMatrix());

			
 
				                     

			
 
				-                    this._effect.setTexture("distortionSampler", this.distortionTexture);

			
 
				-                    this._effect.setTexture("opacitySampler", this.opacityTexture);

			
 
				+                    this._activeEffect.setTexture("distortionSampler", this._distortionTexture);

			
 
				+                    this._activeEffect.setTexture("opacitySampler", this._opacityTexture);

			
 
				                 }

			
 
				                 

			
 
				                 // Clip plane

			
 
				                 if (scene.clipPlane) {

			
 
				                     var clipPlane = scene.clipPlane;

			
 
				-                    this._effect.setFloat4("vClipPlane", clipPlane.normal.x, clipPlane.normal.y, clipPlane.normal.z, clipPlane.d);

			
 
				+                    this._activeEffect.setFloat4("vClipPlane", clipPlane.normal.x, clipPlane.normal.y, clipPlane.normal.z, clipPlane.d);

			
 
				                 }

			
 
				 

			
 
				                 // Point size

			
 
				                 if (this.pointsCloud) {

			
 
				-                    this._effect.setFloat("pointSize", this.pointSize);

			
 
				+                    this._activeEffect.setFloat("pointSize", this.pointSize);

			
 
				                 }

			
 
				 

			
 
				-                this._effect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);                

			
 
				+                this._activeEffect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);                

			
 
				             }

			
 
				 

			
 
				-            this._effect.setColor4("vDiffuseColor", this._scaledDiffuse, this.alpha * mesh.visibility);

			
 
				+            this._activeEffect.setColor4("vDiffuseColor", this._scaledDiffuse, this.alpha * mesh.visibility);

			
 
				 

			
 
				             // View

			
 
				             if (scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE) {

			
 
				-                this._effect.setMatrix("view", scene.getViewMatrix());

			
 
				+                this._activeEffect.setMatrix("view", scene.getViewMatrix());

			
 
				             }

			
 
				             

			
 
				             // Fog

			
 
				-            MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				+            MaterialHelper.BindFogParameters(scene, mesh, this._activeEffect);

			
 
				             

			
 
				             // Time

			
 
				             this._lastTime += scene.getEngine().getDeltaTime();

			
 
				-            this._effect.setFloat("time", this._lastTime);

			
 
				+            this._activeEffect.setFloat("time", this._lastTime);

			
 
				             

			
 
				             // Speed

			
 
				-            this._effect.setFloat("speed", this.speed);

			
 
				+            this._activeEffect.setFloat("speed", this.speed);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh, this._activeEffect);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
 
				             var results = [];

			
 
				 

			
 
				-            if (this.diffuseTexture && this.diffuseTexture.animations && this.diffuseTexture.animations.length > 0) {

			
 
				-                results.push(this.diffuseTexture);

			
 
				+            if (this._diffuseTexture && this._diffuseTexture.animations && this._diffuseTexture.animations.length > 0) {

			
 
				+                results.push(this._diffuseTexture);

			
 
				             }

			
 
				-            if (this.distortionTexture && this.distortionTexture.animations && this.distortionTexture.animations.length > 0) {

			
 
				-                results.push(this.distortionTexture);

			
 
				+            if (this._distortionTexture && this._distortionTexture.animations && this._distortionTexture.animations.length > 0) {

			
 
				+                results.push(this._distortionTexture);

			
 
				             }

			
 
				-            if (this.opacityTexture && this.opacityTexture.animations && this.opacityTexture.animations.length > 0) {

			
 
				-                results.push(this.opacityTexture);

			
 
				+            if (this._opacityTexture && this._opacityTexture.animations && this._opacityTexture.animations.length > 0) {

			
 
				+                results.push(this._opacityTexture);

			
 
				             }

			
 
				 

			
 
				             return results;

			
 
				         }

			
 
				 

			
 
				         public dispose(forceDisposeEffect?: boolean): void {

			
 
				-            if (this.diffuseTexture) {

			
 
				-                this.diffuseTexture.dispose();

			
 
				+            if (this._diffuseTexture) {

			
 
				+                this._diffuseTexture.dispose();

			
 
				             }

			
 
				-            if (this.distortionTexture) {

			
 
				-                this.distortionTexture.dispose();

			
 
				+            if (this._distortionTexture) {

			
 
				+                this._distortionTexture.dispose();

			
 
				             }

			
 
				 

			
 
				             super.dispose(forceDisposeEffect);

			
@@ -325,16 +280,16 @@ module BABYLON {
 
				             serializationObject.diffuseColor    = this.diffuseColor.asArray();

			
 
				             serializationObject.speed           = this.speed;

			
 
				 

			
 
				-            if (this.diffuseTexture) {

			
 
				-                serializationObject.diffuseTexture = this.diffuseTexture.serialize();

			
 
				+            if (this._diffuseTexture) {

			
 
				+                serializationObject._diffuseTexture = this._diffuseTexture.serialize();

			
 
				             }

			
 
				             

			
 
				-			if (this.distortionTexture) {

			
 
				-                serializationObject.distortionTexture = this.distortionTexture.serialize();

			
 
				+			if (this._distortionTexture) {

			
 
				+                serializationObject._distortionTexture = this._distortionTexture.serialize();

			
 
				             }

			
 
				 			

			
 
				-			if (this.opacityTexture) {

			
 
				-                serializationObject.opacityTexture = this.opacityTexture.serialize();

			
 
				+			if (this._opacityTexture) {

			
 
				+                serializationObject._opacityTexture = this._opacityTexture.serialize();

			
 
				             }

			
 
				 

			
 
				             return serializationObject;

			
@@ -354,16 +309,16 @@ module BABYLON {
 
				             material.backFaceCulling = source.backFaceCulling;

			
 
				             material.wireframe = source.wireframe;

			
 
				 

			
 
				-            if (source.diffuseTexture) {

			
 
				-                material.diffuseTexture = Texture.Parse(source.diffuseTexture, scene, rootUrl);

			
 
				+            if (source._diffuseTexture) {

			
 
				+                material._diffuseTexture = Texture.Parse(source._diffuseTexture, scene, rootUrl);

			
 
				             }

			
 
				 

			
 
				-            if (source.distortionTexture) {

			
 
				-                material.distortionTexture = Texture.Parse(source.distortionTexture, scene, rootUrl);

			
 
				+            if (source._distortionTexture) {

			
 
				+                material._distortionTexture = Texture.Parse(source._distortionTexture, scene, rootUrl);

			
 
				             }

			
 
				 			

			
 
				-			if (source.opacityTexture) {

			
 
				-                material.opacityTexture = Texture.Parse(source.opacityTexture, scene, rootUrl);

			
 
				+			if (source._opacityTexture) {

			
 
				+                material._opacityTexture = Texture.Parse(source._opacityTexture, scene, rootUrl);

			
 
				             }

			
 
				 

			
 
				             if (source.checkReadyOnlyOnce) {

			
--- a/materialsLibrary/src/fur/babylon.furMaterial.ts
+++ b/materialsLibrary/src/fur/babylon.furMaterial.ts
@@ -137,10 +137,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -315,14 +311,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new FurMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -394,7 +382,7 @@ module BABYLON {
 
				                 this._effect.setTexture("furTexture", this.furTexture);

			
 
				             }

			
 
				  

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/gradient/babylon.gradientMaterial.ts
+++ b/materialsLibrary/src/gradient/babylon.gradientMaterial.ts
@@ -118,10 +118,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -274,14 +270,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new GradientMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -332,7 +320,7 @@ module BABYLON {
 
				             this._effect.setFloat("offset", this.offset);

			
 
				             this._effect.setFloat("smoothness", this.smoothness);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/grid/babylon.gridmaterial.ts
+++ b/materialsLibrary/src/grid/babylon.gridmaterial.ts
@@ -80,11 +80,7 @@ module BABYLON {
 
				             if (!mesh) {

			
 
				                 return true;

			
 
				             }

			
 
				-

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				+            

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -186,7 +182,7 @@ module BABYLON {
 
				             // Fog

			
 
				             MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public dispose(forceDisposeEffect?: boolean): void {

			
--- a/materialsLibrary/src/lava/babylon.lavaMaterial.ts
+++ b/materialsLibrary/src/lava/babylon.lavaMaterial.ts
@@ -123,10 +123,6 @@ module BABYLON {
 
				                 return false;
			
 
				             }
			
 
				 
			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {
			
 
				-                return true;
			
 
				-            }
			
 
				-
			
 
				             return false;
			
 
				         }
			
 
				 
			
@@ -287,15 +283,7 @@ module BABYLON {
 
				 
			
 
				             this._renderId = scene.getRenderId();
			
 
				             this._wasPreviouslyReady = true;
			
 
				-
			
 
				-            if (mesh) {
			
 
				-                if (!mesh._materialDefines) {
			
 
				-                    mesh._materialDefines = new LavaMaterialDefines();
			
 
				-                }
			
 
				-
			
 
				-                this._defines.cloneTo(mesh._materialDefines);
			
 
				-            }
			
 
				-
			
 
				+            
			
 
				             return true;
			
 
				         }
			
 
				 
			
@@ -365,7 +353,7 @@ module BABYLON {
 
				             this._effect.setFloat("movingSpeed", this.movingSpeed);
			
 
				 
			
 
				 
			
 
				-            super.bind(world, mesh);
			
 
				+            this._afterBind(mesh);
			
 
				         }
			
 
				 
			
 
				         public getAnimatables(): IAnimatable[] {
			
--- a/materialsLibrary/src/normal/babylon.normalMaterial.ts
+++ b/materialsLibrary/src/normal/babylon.normalMaterial.ts
@@ -100,10 +100,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -264,14 +260,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new NormalMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -323,7 +311,7 @@ module BABYLON {
 
				             // Fog

			
 
				             MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/shadowOnly/babylon.shadowOnlyMaterial.ts
+++ b/materialsLibrary/src/shadowOnly/babylon.shadowOnlyMaterial.ts
@@ -54,10 +54,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -168,14 +164,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new ShadowOnlyMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -218,7 +206,7 @@ module BABYLON {
 
				             // Fog

			
 
				             MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public clone(name: string): ShadowOnlyMaterial {

			
--- a/materialsLibrary/src/simple/babylon.simpleMaterial.ts
+++ b/materialsLibrary/src/simple/babylon.simpleMaterial.ts
@@ -22,30 +22,31 @@ module BABYLON {
 
				         }

			
 
				     }

			
 
				 

			
 
				-    export class SimpleMaterial extends Material {

			
 
				-        @serializeAsTexture()

			
 
				+    export class SimpleMaterial extends PushMaterial {

			
 
				+        @serializeAsTexture("diffuseTexture")

			
 
				+        private _diffuseTexture: BaseTexture;

			
 
				+        @expandToProperty("_markAllSubMeshesAsTexturesDirty")

			
 
				         public diffuseTexture: BaseTexture;

			
 
				 

			
 
				         @serializeAsColor3("diffuseColor")

			
 
				         public diffuseColor = new Color3(1, 1, 1);

			
 
				         

			
 
				-        @serialize()

			
 
				-        public disableLighting = false;        

			
 
				+        @serialize("disableLighting")

			
 
				+        private _disableLighting = false;

			
 
				+        @expandToProperty("_markAllSubMeshesAsLightsDirty")

			
 
				+        public disableLighting: boolean;   

			
 
				         

			
 
				-        @serialize()

			
 
				-        public maxSimultaneousLights = 4;

			
 
				+        @serialize("maxSimultaneousLights")

			
 
				+        private _maxSimultaneousLights = 4;

			
 
				+        @expandToProperty("_markAllSubMeshesAsLightsDirty")

			
 
				+        public maxSimultaneousLights: number; 

			
 
				 

			
 
				         private _worldViewProjectionMatrix = Matrix.Zero();

			
 
				         private _scaledDiffuse = new Color3();

			
 
				         private _renderId: number;

			
 
				 

			
 
				-        private _defines = new SimpleMaterialDefines();

			
 
				-        private _cachedDefines = new SimpleMaterialDefines();

			
 
				-

			
 
				         constructor(name: string, scene: Scene) {

			
 
				             super(name, scene);

			
 
				-

			
 
				-            this._cachedDefines.BonesPerMesh = -1;

			
 
				         }

			
 
				 

			
 
				         public needAlphaBlending(): boolean {

			
@@ -61,153 +62,106 @@ module BABYLON {
 
				         }

			
 
				 

			
 
				         // Methods   

			
 
				-        private _checkCache(scene: Scene, mesh?: AbstractMesh, useInstances?: boolean): boolean {

			
 
				-            if (!mesh) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				-            if (this._defines.INSTANCES !== useInstances) {

			
 
				-                return false;

			
 
				-            }

			
 
				-

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				-            return false;

			
 
				-        }

			
 
				-

			
 
				-        public isReady(mesh?: AbstractMesh, useInstances?: boolean): boolean {

			
 
				-            if (this.checkReadyOnlyOnce) {

			
 
				-                if (this._wasPreviouslyReady) {

			
 
				+        public isReadyForSubMesh(mesh: AbstractMesh, subMesh: SubMesh, useInstances?: boolean): boolean {   

			
 
				+            if (this.isFrozen) {

			
 
				+                if (this._wasPreviouslyReady && subMesh.effect) {

			
 
				                     return true;

			
 
				                 }

			
 
				             }

			
 
				 

			
 
				+            if (!subMesh._materialDefines) {

			
 
				+                subMesh._materialDefines = new SimpleMaterialDefines();

			
 
				+            }

			
 
				+

			
 
				+            var defines = <SimpleMaterialDefines>subMesh._materialDefines;

			
 
				             var scene = this.getScene();

			
 
				 

			
 
				             if (!this.checkReadyOnEveryCall) {

			
 
				                 if (this._renderId === scene.getRenderId()) {

			
 
				-                    if (this._checkCache(scene, mesh, useInstances)) {

			
 
				-                        return true;

			
 
				-                    }

			
 
				+                    return true;

			
 
				                 }

			
 
				             }

			
 
				 

			
 
				             var engine = scene.getEngine();

			
 
				-            var needNormals = false;

			
 
				-            var needUVs = false;

			
 
				-

			
 
				-            this._defines.reset();

			
 
				 

			
 
				             // Textures

			
 
				-            if (scene.texturesEnabled) {

			
 
				-                if (this.diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				-                    if (!this.diffuseTexture.isReady()) {

			
 
				-                        return false;

			
 
				-                    } else {

			
 
				-                        needUVs = true;

			
 
				-                        this._defines.DIFFUSE = true;

			
 
				-                    }

			
 
				-                }                

			
 
				-            }

			
 
				-

			
 
				-            // Effect

			
 
				-            if (scene.clipPlane) {

			
 
				-                this._defines.CLIPPLANE = true;

			
 
				+            if (defines._areTexturesDirty) {

			
 
				+                defines._needUVs = false;

			
 
				+                if (scene.texturesEnabled) {

			
 
				+                    if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				+                        if (!this._diffuseTexture.isReady()) {

			
 
				+                            return false;

			
 
				+                        } else {

			
 
				+                            defines._needUVs = true;

			
 
				+                            defines.DIFFUSE = true;

			
 
				+                        }

			
 
				+                    }                

			
 
				+                }

			
 
				+                defines._areTexturesDirty = false;

			
 
				             }

			
 
				 

			
 
				-            if (engine.getAlphaTesting()) {

			
 
				-                this._defines.ALPHATEST = true;

			
 
				-            }

			
 
				+            // Misc.

			
 
				+            if (defines._areMiscDirty) {

			
 
				+                defines.POINTSIZE = (this.pointsCloud || scene.forcePointsCloud);

			
 
				+                defines.FOG = (scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE && this.fogEnabled);

			
 
				 

			
 
				-            // Point size

			
 
				-            if (this.pointsCloud || scene.forcePointsCloud) {

			
 
				-                this._defines.POINTSIZE = true;

			
 
				-            }

			
 
				-

			
 
				-            // Fog

			
 
				-            if (scene.fogEnabled && mesh && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE && this.fogEnabled) {

			
 
				-                this._defines.FOG = true;

			
 
				-            }

			
 
				-

			
 
				-            if (scene.lightsEnabled && !this.disableLighting) {

			
 
				-                needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);

			
 
				+                defines._areMiscDirty = false;

			
 
				             }

			
 
				 

			
 
				+            // Lights

			
 
				+            defines._needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, defines, this._maxSimultaneousLights, this._disableLighting);

			
 
				+            defines._areLightsDirty = false;

			
 
				+

			
 
				+            // Values that need to be evaluated on every frame

			
 
				+            defines.CLIPPLANE = (scene.clipPlane !== undefined && scene.clipPlane !== null);

			
 
				+            defines.ALPHATEST = true;

			
 
				+            defines.INSTANCES = useInstances;

			
 
				+            

			
 
				             // Attribs

			
 
				-            if (mesh) {

			
 
				-                if (needNormals && mesh.isVerticesDataPresent(VertexBuffer.NormalKind)) {

			
 
				-                    this._defines.NORMAL = true;

			
 
				-                }

			
 
				-                if (needUVs) {

			
 
				-                    if (mesh.isVerticesDataPresent(VertexBuffer.UVKind)) {

			
 
				-                        this._defines.UV1 = true;

			
 
				-                    }

			
 
				-                    if (mesh.isVerticesDataPresent(VertexBuffer.UV2Kind)) {

			
 
				-                        this._defines.UV2 = true;

			
 
				-                    }

			
 
				-                }

			
 
				-                if (mesh.useVertexColors && mesh.isVerticesDataPresent(VertexBuffer.ColorKind)) {

			
 
				-                    this._defines.VERTEXCOLOR = true;

			
 
				-

			
 
				-                    if (mesh.hasVertexAlpha) {

			
 
				-                        this._defines.VERTEXALPHA = true;

			
 
				-                    }

			
 
				-                }

			
 
				-                if (mesh.useBones && mesh.computeBonesUsingShaders) {

			
 
				-                    this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;

			
 
				-                    this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);

			
 
				-                }

			
 
				-

			
 
				-                // Instances

			
 
				-                if (useInstances) {

			
 
				-                    this._defines.INSTANCES = true;

			
 
				-                }

			
 
				-            }

			
 
				+            MaterialHelper.PrepareDefinesForAttributes(mesh, defines, useInstances);

			
 
				+            defines._areAttributesDirty = false;

			
 
				 

			
 
				             // Get correct effect      

			
 
				-            if (!this._defines.isEqual(this._cachedDefines)) {

			
 
				-                this._defines.cloneTo(this._cachedDefines);

			
 
				-

			
 
				+            if (defines._isDirty) {

			
 
				+                defines._isDirty = false;

			
 
				                 scene.resetCachedMaterial();

			
 
				 

			
 
				                 // Fallbacks

			
 
				                 var fallbacks = new EffectFallbacks();             

			
 
				-                if (this._defines.FOG) {

			
 
				+                if (defines.FOG) {

			
 
				                     fallbacks.addFallback(1, "FOG");

			
 
				                 }

			
 
				 

			
 
				-                MaterialHelper.HandleFallbacksForShadows(this._defines, fallbacks, this.maxSimultaneousLights);

			
 
				+                MaterialHelper.HandleFallbacksForShadows(defines, fallbacks, this.maxSimultaneousLights);

			
 
				                 

			
 
				-                if (this._defines.NUM_BONE_INFLUENCERS > 0) {

			
 
				+                if (defines.NUM_BONE_INFLUENCERS > 0) {

			
 
				                     fallbacks.addCPUSkinningFallback(0, mesh);

			
 
				                 }

			
 
				 

			
 
				                 //Attributes

			
 
				                 var attribs = [VertexBuffer.PositionKind];

			
 
				 

			
 
				-                if (this._defines.NORMAL) {

			
 
				+                if (defines.NORMAL) {

			
 
				                     attribs.push(VertexBuffer.NormalKind);

			
 
				                 }

			
 
				 

			
 
				-                if (this._defines.UV1) {

			
 
				+                if (defines.UV1) {

			
 
				                     attribs.push(VertexBuffer.UVKind);

			
 
				                 }

			
 
				 

			
 
				-                if (this._defines.UV2) {

			
 
				+                if (defines.UV2) {

			
 
				                     attribs.push(VertexBuffer.UV2Kind);

			
 
				                 }

			
 
				 

			
 
				-                if (this._defines.VERTEXCOLOR) {

			
 
				+                if (defines.VERTEXCOLOR) {

			
 
				                     attribs.push(VertexBuffer.ColorKind);

			
 
				                 }

			
 
				 

			
 
				-                MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);

			
 
				-                MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);

			
 
				+                MaterialHelper.PrepareAttributesForBones(attribs, mesh, defines, fallbacks);

			
 
				+                MaterialHelper.PrepareAttributesForInstances(attribs, defines);

			
 
				 

			
 
				                 var shaderName = "simple";

			
 
				-                var join = this._defines.toString();

			
 
				+                var join = defines.toString();

			
 
				                 var uniforms = ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vDiffuseColor",

			
 
				                                 "vFogInfos", "vFogColor", "pointSize",

			
 
				                                 "vDiffuseInfos", 

			
@@ -216,95 +170,91 @@ module BABYLON {
 
				                 ];

			
 
				                 var samplers = ["diffuseSampler"];

			
 
				                     

			
 
				-                MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, this._defines, this.maxSimultaneousLights);

			
 
				+                MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, defines, this.maxSimultaneousLights);

			
 
				                 

			
 
				-                this._effect = scene.getEngine().createEffect(shaderName,

			
 
				+                subMesh.setEffect(scene.getEngine().createEffect(shaderName,

			
 
				                     attribs, uniforms, samplers,

			
 
				-                    join, fallbacks, this.onCompiled, this.onError, {maxSimultaneousLights: this.maxSimultaneousLights});

			
 
				+                    join, fallbacks, this.onCompiled, this.onError, { maxSimultaneousLights: this._maxSimultaneousLights - 1 }), defines);

			
 
				             }

			
 
				-            if (!this._effect.isReady()) {

			
 
				+            if (!subMesh.effect.isReady()) {

			
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new SimpleMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
 
				-        public bindOnlyWorldMatrix(world: Matrix): void {

			
 
				-            this._effect.setMatrix("world", world);

			
 
				-        }

			
 
				-

			
 
				-        public bind(world: Matrix, mesh?: Mesh): void {

			
 
				+        public bindForSubMesh(world: Matrix, mesh: Mesh, subMesh: SubMesh): void {

			
 
				             var scene = this.getScene();

			
 
				 

			
 
				+            var defines = <SimpleMaterialDefines>subMesh._materialDefines;

			
 
				+            if (!defines) {

			
 
				+                return;

			
 
				+            }

			
 
				+

			
 
				+            var effect = subMesh.effect;

			
 
				+            this._activeEffect = effect;

			
 
				+

			
 
				             // Matrices        

			
 
				             this.bindOnlyWorldMatrix(world);

			
 
				-            this._effect.setMatrix("viewProjection", scene.getTransformMatrix());

			
 
				+            this._activeEffect.setMatrix("viewProjection", scene.getTransformMatrix());

			
 
				 

			
 
				             // Bones

			
 
				-            MaterialHelper.BindBonesParameters(mesh, this._effect);

			
 
				+            MaterialHelper.BindBonesParameters(mesh, this._activeEffect);

			
 
				 

			
 
				-            if (scene.getCachedMaterial() !== this) {

			
 
				+            if (this._mustRebind(scene, effect)) {

			
 
				                 // Textures        

			
 
				-                if (this.diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				-                    this._effect.setTexture("diffuseSampler", this.diffuseTexture);

			
 
				+                if (this._diffuseTexture && StandardMaterial.DiffuseTextureEnabled) {

			
 
				+                    this._activeEffect.setTexture("diffuseSampler", this._diffuseTexture);

			
 
				 

			
 
				-                    this._effect.setFloat2("vDiffuseInfos", this.diffuseTexture.coordinatesIndex, this.diffuseTexture.level);

			
 
				-                    this._effect.setMatrix("diffuseMatrix", this.diffuseTexture.getTextureMatrix());

			
 
				+                    this._activeEffect.setFloat2("vDiffuseInfos", this._diffuseTexture.coordinatesIndex, this._diffuseTexture.level);

			
 
				+                    this._activeEffect.setMatrix("diffuseMatrix", this._diffuseTexture.getTextureMatrix());

			
 
				                 }

			
 
				                 

			
 
				                 // Clip plane

			
 
				-                MaterialHelper.BindClipPlane(this._effect, scene);

			
 
				+                MaterialHelper.BindClipPlane(this._activeEffect, scene);

			
 
				 

			
 
				                 // Point size

			
 
				                 if (this.pointsCloud) {

			
 
				-                    this._effect.setFloat("pointSize", this.pointSize);

			
 
				+                    this._activeEffect.setFloat("pointSize", this.pointSize);

			
 
				                 }

			
 
				 

			
 
				-                this._effect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);                

			
 
				+                this._activeEffect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);                

			
 
				             }

			
 
				 

			
 
				-            this._effect.setColor4("vDiffuseColor", this.diffuseColor, this.alpha * mesh.visibility);

			
 
				+            this._activeEffect.setColor4("vDiffuseColor", this.diffuseColor, this.alpha * mesh.visibility);

			
 
				 

			
 
				             // Lights

			
 
				             if (scene.lightsEnabled && !this.disableLighting) {

			
 
				-                MaterialHelper.BindLights(scene, mesh, this._effect, this._defines, this.maxSimultaneousLights);          

			
 
				+                MaterialHelper.BindLights(scene, mesh, this._activeEffect, defines, this.maxSimultaneousLights);          

			
 
				             }

			
 
				 

			
 
				             // View

			
 
				             if (scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE) {

			
 
				-                this._effect.setMatrix("view", scene.getViewMatrix());

			
 
				+                this._activeEffect.setMatrix("view", scene.getViewMatrix());

			
 
				             }

			
 
				 

			
 
				             // Fog

			
 
				-            MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				+            MaterialHelper.BindFogParameters(scene, mesh, this._activeEffect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh, this._activeEffect);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
 
				             var results = [];

			
 
				 

			
 
				-            if (this.diffuseTexture && this.diffuseTexture.animations && this.diffuseTexture.animations.length > 0) {

			
 
				-                results.push(this.diffuseTexture);

			
 
				+            if (this._diffuseTexture && this._diffuseTexture.animations && this._diffuseTexture.animations.length > 0) {

			
 
				+                results.push(this._diffuseTexture);

			
 
				             }

			
 
				 

			
 
				             return results;

			
 
				         }

			
 
				 

			
 
				         public dispose(forceDisposeEffect?: boolean): void {

			
 
				-            if (this.diffuseTexture) {

			
 
				-                this.diffuseTexture.dispose();

			
 
				+            if (this._diffuseTexture) {

			
 
				+                this._diffuseTexture.dispose();

			
 
				             }

			
 
				 

			
 
				             super.dispose(forceDisposeEffect);

			
--- a/materialsLibrary/src/simple/simple.fragment.fx
+++ b/materialsLibrary/src/simple/simple.fragment.fx
@@ -73,7 +73,10 @@ void main(void) {
 
				     lightingInfo info;

			
 
				 	float shadow = 1.;

			
 
				     float glossiness = 0.;

			
 
				-    

			
 
				+

			
 
				+#ifdef SPECULARTERM

			
 
				+	vec3 specularBase = vec3(0., 0., 0.);

			
 
				+#endif    

			
 
				 #include<lightFragment>[0..maxSimultaneousLights]

			
 
				 

			
 
				 

			
--- a/materialsLibrary/src/sky/babylon.skyMaterial.ts
+++ b/materialsLibrary/src/sky/babylon.skyMaterial.ts
@@ -75,10 +75,6 @@ module BABYLON {
 
				             if (!mesh) {

			
 
				                 return true;

			
 
				             }

			
 
				-            

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				 

			
 
				             return false;

			
 
				         }

			
@@ -170,14 +166,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new SkyMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -243,7 +231,7 @@ module BABYLON {
 
				             

			
 
				 			this._effect.setVector3("sunPosition", this.sunPosition);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/terrain/babylon.terrainMaterial.ts
+++ b/materialsLibrary/src/terrain/babylon.terrainMaterial.ts
@@ -97,10 +97,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -267,14 +263,6 @@ module BABYLON {
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				 

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new TerrainMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -355,7 +343,7 @@ module BABYLON {
 
				             // Fog

			
 
				             MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/triPlanar/babylon.triPlanarMaterial.ts
+++ b/materialsLibrary/src/triPlanar/babylon.triPlanarMaterial.ts
@@ -104,10 +104,6 @@ module BABYLON {
 
				                 return false;

			
 
				             }

			
 
				 

			
 
				-            if (mesh._materialDefines && mesh._materialDefines.isEqual(this._defines)) {

			
 
				-                return true;

			
 
				-            }

			
 
				-

			
 
				             return false;

			
 
				         }

			
 
				 

			
@@ -270,15 +266,7 @@ module BABYLON {
 
				 

			
 
				             this._renderId = scene.getRenderId();

			
 
				             this._wasPreviouslyReady = true;

			
 
				-

			
 
				-            if (mesh) {

			
 
				-                if (!mesh._materialDefines) {

			
 
				-                    mesh._materialDefines = new TriPlanarMaterialDefines();

			
 
				-                }

			
 
				-

			
 
				-                this._defines.cloneTo(mesh._materialDefines);

			
 
				-            }

			
 
				-

			
 
				+            

			
 
				             return true;

			
 
				         }

			
 
				 

			
@@ -347,7 +335,7 @@ module BABYLON {
 
				             // Fog

			
 
				             MaterialHelper.BindFogParameters(scene, mesh, this._effect);

			
 
				 

			
 
				-            super.bind(world, mesh);

			
 
				+            this._afterBind(mesh);

			
 
				         }

			
 
				 

			
 
				         public getAnimatables(): IAnimatable[] {

			
--- a/materialsLibrary/src/water/babylon.waterMaterial.ts
+++ b/materialsLibrary/src/water/babylon.waterMaterial.ts