Fix shaders and prefix

.vscode/settings.json

@@ -24,7 +24,8 @@
         "**/*.js.fx": true,
         "**/*.js": {
             "when": "$(basename).ts"
-        }
+        },
+        "**/*.fx.ts": true,
     },
     "files.associations": {
         "*.fx": "glsl"
@@ -41,6 +42,7 @@
             "when": "$(basename).ts"
         },
         "**/*.d.ts": true,
+        "**/*.fx.ts": true,
         "assets": true
     },
     "editor.tabSize": 4,

Viewer/src/loader/plugins/msftLodLoaderPlugin.ts

@@ -17,7 +17,7 @@ export class MSFTLodLoaderPlugin implements ILoaderPlugin {
 
     public onExtensionLoaded(extension: IGLTFLoaderExtension) {
         if (extension.name === "MSFT_lod" && this._model.configuration.loaderConfiguration) {
-            const MSFT_lod = extension as GLTF2.MSFT_lod;
+            const MSFT_lod = extension as GLTF2.Loader.Extensions.MSFT_lod;
             MSFT_lod.enabled = !!this._model.configuration.loaderConfiguration.progressiveLoading;
             MSFT_lod.maxLODsToLoad = this._model.configuration.loaderConfiguration.maxLODsToLoad || Number.MAX_VALUE;
         }

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

@@ -2,14 +2,6 @@
 // Dependencies for this module:
 //   ../../../../Tools/Gulp/babylonjs
 declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
     /**
         * Interface used to define a control that can receive focus
         */
@@ -498,10 +490,6 @@ declare module BABYLON.GUI {
     }
 }
 declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
     /**
         * Class used to manage 3D user interface
         * @see http://doc.babylonjs.com/how_to/gui3d

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

@@ -3,58 +3,58 @@
 //   ../../../../Tools/Gulp/babylonjs
 
 declare module 'babylonjs-gui' {
-    export * from "babylonjs-gui/2D";
-    export * from "babylonjs-gui/3D";
+    export * from "babylonjs-gui/src/2D";
+    export * from "babylonjs-gui/src/3D";
 }
 
-declare module 'babylonjs-gui/2D' {
-    export * from "babylonjs-gui/2D/controls";
-    export * from "babylonjs-gui/2D/advancedDynamicTexture";
-    export * from "babylonjs-gui/2D/math2D";
-    export * from "babylonjs-gui/2D/measure";
-    export * from "babylonjs-gui/2D/multiLinePoint";
-    export * from "babylonjs-gui/2D/style";
-    export * from "babylonjs-gui/2D/valueAndUnit";
+declare module 'babylonjs-gui/src/2D' {
+    export * from "babylonjs-gui/src/2D/controls";
+    export * from "babylonjs-gui/src/2D/advancedDynamicTexture";
+    export * from "babylonjs-gui/src/2D/math2D";
+    export * from "babylonjs-gui/src/2D/measure";
+    export * from "babylonjs-gui/src/2D/multiLinePoint";
+    export * from "babylonjs-gui/src/2D/style";
+    export * from "babylonjs-gui/src/2D/valueAndUnit";
 }
 
-declare module 'babylonjs-gui/3D' {
-    export * from "babylonjs-gui/3D/controls";
-    export * from "babylonjs-gui/3D/materials";
-    export * from "babylonjs-gui/3D/gui3DManager";
-    export * from "babylonjs-gui/3D/vector3WithInfo";
+declare module 'babylonjs-gui/src/3D' {
+    export * from "babylonjs-gui/src/3D/controls";
+    export * from "babylonjs-gui/src/3D/materials";
+    export * from "babylonjs-gui/src/3D/gui3DManager";
+    export * from "babylonjs-gui/src/3D/vector3WithInfo";
 }
 
-declare module 'babylonjs-gui/2D/controls' {
-    export * from "babylonjs-gui/2D/controls/button";
-    export * from "babylonjs-gui/2D/controls/checkbox";
-    export * from "babylonjs-gui/2D/controls/colorpicker";
-    export * from "babylonjs-gui/2D/controls/container";
-    export * from "babylonjs-gui/2D/controls/control";
-    export * from "babylonjs-gui/2D/controls/ellipse";
-    export * from "babylonjs-gui/2D/controls/grid";
-    export * from "babylonjs-gui/2D/controls/image";
-    export * from "babylonjs-gui/2D/controls/inputText";
-    export * from "babylonjs-gui/2D/controls/inputPassword";
-    export * from "babylonjs-gui/2D/controls/line";
-    export * from "babylonjs-gui/2D/controls/multiLine";
-    export * from "babylonjs-gui/2D/controls/radioButton";
-    export * from "babylonjs-gui/2D/controls/stackPanel";
-    export * from "babylonjs-gui/2D/controls/selector";
-    export * from "babylonjs-gui/2D/controls/textBlock";
-    export * from "babylonjs-gui/2D/controls/virtualKeyboard";
-    export * from "babylonjs-gui/2D/controls/rectangle";
-    export * from "babylonjs-gui/2D/controls/displayGrid";
-    export * from "babylonjs-gui/2D/controls/baseSlider";
-    export * from "babylonjs-gui/2D/controls/slider";
-    export * from "babylonjs-gui/2D/controls/imageBasedSlider";
-    export * from "babylonjs-gui/2D/controls/statics";
+declare module 'babylonjs-gui/src/2D/controls' {
+    export * from "babylonjs-gui/src/2D/controls/button";
+    export * from "babylonjs-gui/src/2D/controls/checkbox";
+    export * from "babylonjs-gui/src/2D/controls/colorpicker";
+    export * from "babylonjs-gui/src/2D/controls/container";
+    export * from "babylonjs-gui/src/2D/controls/control";
+    export * from "babylonjs-gui/src/2D/controls/ellipse";
+    export * from "babylonjs-gui/src/2D/controls/grid";
+    export * from "babylonjs-gui/src/2D/controls/image";
+    export * from "babylonjs-gui/src/2D/controls/inputText";
+    export * from "babylonjs-gui/src/2D/controls/inputPassword";
+    export * from "babylonjs-gui/src/2D/controls/line";
+    export * from "babylonjs-gui/src/2D/controls/multiLine";
+    export * from "babylonjs-gui/src/2D/controls/radioButton";
+    export * from "babylonjs-gui/src/2D/controls/stackPanel";
+    export * from "babylonjs-gui/src/2D/controls/selector";
+    export * from "babylonjs-gui/src/2D/controls/textBlock";
+    export * from "babylonjs-gui/src/2D/controls/virtualKeyboard";
+    export * from "babylonjs-gui/src/2D/controls/rectangle";
+    export * from "babylonjs-gui/src/2D/controls/displayGrid";
+    export * from "babylonjs-gui/src/2D/controls/baseSlider";
+    export * from "babylonjs-gui/src/2D/controls/slider";
+    export * from "babylonjs-gui/src/2D/controls/imageBasedSlider";
+    export * from "babylonjs-gui/src/2D/controls/statics";
 }
 
-declare module 'babylonjs-gui/2D/advancedDynamicTexture' {
+declare module 'babylonjs-gui/src/2D/advancedDynamicTexture' {
     import { DynamicTexture, Nullable, Layer, Viewport, Scene, Vector3, Matrix, Vector2, AbstractMesh } from "babylonjs";
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { Style } from "babylonjs-gui/2D/style";
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { Style } from "babylonjs-gui/src/2D/style";
     /**
         * Interface used to define a control that can receive focus
         */
@@ -252,7 +252,7 @@ declare module 'babylonjs-gui/2D/advancedDynamicTexture' {
     }
 }
 
-declare module 'babylonjs-gui/2D/math2D' {
+declare module 'babylonjs-gui/src/2D/math2D' {
     import { Vector2, Nullable } from "babylonjs";
     /**
         * Class used to transport Vector2 information for pointer events
@@ -359,7 +359,7 @@ declare module 'babylonjs-gui/2D/math2D' {
     }
 }
 
-declare module 'babylonjs-gui/2D/measure' {
+declare module 'babylonjs-gui/src/2D/measure' {
     /**
         * Class used to store 2D control sizes
         */
@@ -415,9 +415,9 @@ declare module 'babylonjs-gui/2D/measure' {
     }
 }
 
-declare module 'babylonjs-gui/2D/multiLinePoint' {
-    import { MultiLine } from "babylonjs-gui/2D/controls/multiLine";
-    import { Control } from "babylonjs-gui/2D/controls/control";
+declare module 'babylonjs-gui/src/2D/multiLinePoint' {
+    import { MultiLine } from "babylonjs-gui/src/2D/controls/multiLine";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     import { AbstractMesh, Nullable, Vector2 } from "babylonjs";
     /**
         * Class used to store a point for a MultiLine object.
@@ -451,10 +451,10 @@ declare module 'babylonjs-gui/2D/multiLinePoint' {
     }
 }
 
-declare module 'babylonjs-gui/2D/style' {
+declare module 'babylonjs-gui/src/2D/style' {
     import { IDisposable, Observable } from "babylonjs";
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
-    import { ValueAndUnit } from "babylonjs-gui/2D/valueAndUnit";
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
+    import { ValueAndUnit } from "babylonjs-gui/src/2D/valueAndUnit";
     /**
         * Define a style used by control to automatically setup properties based on a template.
         * Only support font related properties so far
@@ -492,8 +492,8 @@ declare module 'babylonjs-gui/2D/style' {
     }
 }
 
-declare module 'babylonjs-gui/2D/valueAndUnit' {
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
+declare module 'babylonjs-gui/src/2D/valueAndUnit' {
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
     /**
         * Class used to specific a value and its associated unit
         */
@@ -556,29 +556,29 @@ declare module 'babylonjs-gui/2D/valueAndUnit' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls' {
-    export * from "babylonjs-gui/3D/controls/abstractButton3D";
-    export * from "babylonjs-gui/3D/controls/button3D";
-    export * from "babylonjs-gui/3D/controls/container3D";
-    export * from "babylonjs-gui/3D/controls/control3D";
-    export * from "babylonjs-gui/3D/controls/cylinderPanel";
-    export * from "babylonjs-gui/3D/controls/holographicButton";
-    export * from "babylonjs-gui/3D/controls/meshButton3D";
-    export * from "babylonjs-gui/3D/controls/planePanel";
-    export * from "babylonjs-gui/3D/controls/scatterPanel";
-    export * from "babylonjs-gui/3D/controls/spherePanel";
-    export * from "babylonjs-gui/3D/controls/stackPanel3D";
-    export * from "babylonjs-gui/3D/controls/volumeBasedPanel";
+declare module 'babylonjs-gui/src/3D/controls' {
+    export * from "babylonjs-gui/src/3D/controls/abstractButton3D";
+    export * from "babylonjs-gui/src/3D/controls/button3D";
+    export * from "babylonjs-gui/src/3D/controls/container3D";
+    export * from "babylonjs-gui/src/3D/controls/control3D";
+    export * from "babylonjs-gui/src/3D/controls/cylinderPanel";
+    export * from "babylonjs-gui/src/3D/controls/holographicButton";
+    export * from "babylonjs-gui/src/3D/controls/meshButton3D";
+    export * from "babylonjs-gui/src/3D/controls/planePanel";
+    export * from "babylonjs-gui/src/3D/controls/scatterPanel";
+    export * from "babylonjs-gui/src/3D/controls/spherePanel";
+    export * from "babylonjs-gui/src/3D/controls/stackPanel3D";
+    export * from "babylonjs-gui/src/3D/controls/volumeBasedPanel";
 }
 
-declare module 'babylonjs-gui/3D/materials' {
-    export * from "babylonjs-gui/3D/materials/fluentMaterial";
+declare module 'babylonjs-gui/src/3D/materials' {
+    export * from "babylonjs-gui/src/3D/materials/fluentMaterial";
 }
 
-declare module 'babylonjs-gui/3D/gui3DManager' {
+declare module 'babylonjs-gui/src/3D/gui3DManager' {
     import { IDisposable, Scene, Nullable, UtilityLayerRenderer, Observable, Vector3, Material } from "babylonjs";
-    import { Container3D } from "babylonjs-gui/3D/controls/container3D";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+    import { Container3D } from "babylonjs-gui/src/3D/controls/container3D";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     /**
         * Class used to manage 3D user interface
         * @see http://doc.babylonjs.com/how_to/gui3d
@@ -640,7 +640,7 @@ declare module 'babylonjs-gui/3D/gui3DManager' {
     }
 }
 
-declare module 'babylonjs-gui/3D/vector3WithInfo' {
+declare module 'babylonjs-gui/src/3D/vector3WithInfo' {
     import { Vector3 } from "babylonjs";
     /**
         * Class used to transport Vector3 information for pointer events
@@ -659,11 +659,11 @@ declare module 'babylonjs-gui/3D/vector3WithInfo' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/button' {
-    import { Rectangle } from "babylonjs-gui/2D/controls/rectangle";
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { TextBlock } from "babylonjs-gui/2D/controls/textBlock";
-    import { Image } from "babylonjs-gui/2D/controls/image";
+declare module 'babylonjs-gui/src/2D/controls/button' {
+    import { Rectangle } from "babylonjs-gui/src/2D/controls/rectangle";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { TextBlock } from "babylonjs-gui/src/2D/controls/textBlock";
+    import { Image } from "babylonjs-gui/src/2D/controls/image";
     import { Vector2, Nullable } from "babylonjs";
     /**
         * Class used to create 2D buttons
@@ -743,11 +743,11 @@ declare module 'babylonjs-gui/2D/controls/button' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/checkbox' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/checkbox' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     import { Observable, Vector2 } from "babylonjs";
-    import { StackPanel } from "babylonjs-gui/2D/controls/stackPanel";
+    import { StackPanel } from "babylonjs-gui/src/2D/controls/stackPanel";
     /**
         * Class used to represent a 2D checkbox
         */
@@ -785,10 +785,10 @@ declare module 'babylonjs-gui/2D/controls/checkbox' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/colorpicker' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
+declare module 'babylonjs-gui/src/2D/controls/colorpicker' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     import { Color3, Observable, Vector2 } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /** Class used to create color pickers */
     export class ColorPicker extends Control {
             name?: string | undefined;
@@ -818,11 +818,11 @@ declare module 'babylonjs-gui/2D/controls/colorpicker' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/container' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/container' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     import { Nullable } from "babylonjs";
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
     /**
         * Root class for 2D containers
         * @see http://doc.babylonjs.com/how_to/gui#containers
@@ -911,14 +911,14 @@ declare module 'babylonjs-gui/2D/controls/container' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/control' {
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
-    import { ValueAndUnit } from "babylonjs-gui/2D/valueAndUnit";
+declare module 'babylonjs-gui/src/2D/controls/control' {
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
+    import { ValueAndUnit } from "babylonjs-gui/src/2D/valueAndUnit";
     import { Nullable, Vector2, AbstractMesh, Observable, Vector3, Scene } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { Style } from "babylonjs-gui/2D/style";
-    import { Matrix2D, Vector2WithInfo } from "babylonjs-gui/2D/math2D";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { Style } from "babylonjs-gui/src/2D/style";
+    import { Matrix2D, Vector2WithInfo } from "babylonjs-gui/src/2D/math2D";
     /**
         * Root class used for all 2D controls
         * @see http://doc.babylonjs.com/how_to/gui#controls
@@ -1339,9 +1339,9 @@ declare module 'babylonjs-gui/2D/controls/control' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/ellipse' {
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/ellipse' {
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /** Class used to create 2D ellipse containers */
     export class Ellipse extends Container {
             name?: string | undefined;
@@ -1359,10 +1359,10 @@ declare module 'babylonjs-gui/2D/controls/ellipse' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/grid' {
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/grid' {
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     import { Nullable } from "babylonjs";
     /**
         * Class used to create a 2D grid container
@@ -1454,10 +1454,10 @@ declare module 'babylonjs-gui/2D/controls/grid' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/image' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
+declare module 'babylonjs-gui/src/2D/controls/image' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     import { Nullable, Observable } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /**
         * Class used to create 2D images
         */
@@ -1539,12 +1539,12 @@ declare module 'babylonjs-gui/2D/controls/image' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/inputText' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { IFocusableControl } from "babylonjs-gui/2D/advancedDynamicTexture";
+declare module 'babylonjs-gui/src/2D/controls/inputText' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { IFocusableControl } from "babylonjs-gui/src/2D/advancedDynamicTexture";
     import { Nullable, Observable, Vector2 } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { VirtualKeyboard } from "babylonjs-gui/2D/controls/virtualKeyboard";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { VirtualKeyboard } from "babylonjs-gui/src/2D/controls/virtualKeyboard";
     /**
         * Class used to create input text control
         */
@@ -1620,8 +1620,8 @@ declare module 'babylonjs-gui/2D/controls/inputText' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/inputPassword' {
-    import { InputText } from "babylonjs-gui/2D/controls/inputText";
+declare module 'babylonjs-gui/src/2D/controls/inputPassword' {
+    import { InputText } from "babylonjs-gui/src/2D/controls/inputText";
     /**
       * Class used to create a password control
       */
@@ -1630,10 +1630,10 @@ declare module 'babylonjs-gui/2D/controls/inputPassword' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/line' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
+declare module 'babylonjs-gui/src/2D/controls/line' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     import { Vector3, Scene } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /** Class used to render 2D lines */
     export class Line extends Control {
             name?: string | undefined;
@@ -1680,11 +1680,11 @@ declare module 'babylonjs-gui/2D/controls/line' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/multiLine' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { MultiLinePoint } from "babylonjs-gui/2D/multiLinePoint";
+declare module 'babylonjs-gui/src/2D/controls/multiLine' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { MultiLinePoint } from "babylonjs-gui/src/2D/multiLinePoint";
     import { AbstractMesh } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /**
         * Class used to create multi line control
         */
@@ -1749,11 +1749,11 @@ declare module 'babylonjs-gui/2D/controls/multiLine' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/radioButton' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
+declare module 'babylonjs-gui/src/2D/controls/radioButton' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     import { Observable, Vector2 } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { StackPanel } from "babylonjs-gui/2D/controls";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { StackPanel } from "babylonjs-gui/src/2D/controls";
     /**
         * Class used to create radio button controls
         */
@@ -1791,9 +1791,9 @@ declare module 'babylonjs-gui/2D/controls/radioButton' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/stackPanel' {
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/stackPanel' {
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /**
         * Class used to create a 2D stack panel container
         */
@@ -1821,9 +1821,9 @@ declare module 'babylonjs-gui/2D/controls/stackPanel' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/selector' {
-    import { Rectangle } from "babylonjs-gui/2D/controls/rectangle";
-    import { StackPanel } from "babylonjs-gui/2D/controls/stackPanel";
+declare module 'babylonjs-gui/src/2D/controls/selector' {
+    import { Rectangle } from "babylonjs-gui/src/2D/controls/rectangle";
+    import { StackPanel } from "babylonjs-gui/src/2D/controls/stackPanel";
     /** Class used to create a RadioGroup
         * which contains groups of radio buttons
      */
@@ -1998,10 +1998,10 @@ declare module 'babylonjs-gui/2D/controls/selector' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/textBlock' {
+declare module 'babylonjs-gui/src/2D/controls/textBlock' {
     import { Observable } from "babylonjs";
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { Control } from "babylonjs-gui/2D/controls/control";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     /**
         * Enum that determines the text-wrapping mode to use.
         */
@@ -2100,10 +2100,10 @@ declare module 'babylonjs-gui/2D/controls/textBlock' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/virtualKeyboard' {
-    import { StackPanel } from "babylonjs-gui/2D/controls/stackPanel";
+declare module 'babylonjs-gui/src/2D/controls/virtualKeyboard' {
+    import { StackPanel } from "babylonjs-gui/src/2D/controls/stackPanel";
     import { Observable, Nullable } from "babylonjs";
-    import { InputText } from "babylonjs-gui/2D/controls/inputText";
+    import { InputText } from "babylonjs-gui/src/2D/controls/inputText";
     /**
         * Class used to store key control properties
         */
@@ -2193,9 +2193,9 @@ declare module 'babylonjs-gui/2D/controls/virtualKeyboard' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/rectangle' {
-    import { Container } from "babylonjs-gui/2D/controls/container";
-    import { Measure } from "babylonjs-gui/2D/measure";
+declare module 'babylonjs-gui/src/2D/controls/rectangle' {
+    import { Container } from "babylonjs-gui/src/2D/controls/container";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
     /** Class used to create rectangle container */
     export class Rectangle extends Container {
             name?: string | undefined;
@@ -2215,9 +2215,9 @@ declare module 'babylonjs-gui/2D/controls/rectangle' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/displayGrid' {
-    import { Control } from "babylonjs-gui/2D/controls";
-    import { Measure } from "babylonjs-gui/2D";
+declare module 'babylonjs-gui/src/2D/controls/displayGrid' {
+    import { Control } from "babylonjs-gui/src/2D/controls";
+    import { Measure } from "babylonjs-gui/src/2D";
     /** Class used to render a grid  */
     export class DisplayGrid extends Control {
             name?: string | undefined;
@@ -2251,9 +2251,9 @@ declare module 'babylonjs-gui/2D/controls/displayGrid' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/baseSlider' {
-    import { Control } from "babylonjs-gui/2D/controls/control";
-    import { ValueAndUnit } from "babylonjs-gui/2D/valueAndUnit";
+declare module 'babylonjs-gui/src/2D/controls/baseSlider' {
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
+    import { ValueAndUnit } from "babylonjs-gui/src/2D/valueAndUnit";
     import { Observable, Vector2 } from "babylonjs";
     /**
         * Class used to create slider controls
@@ -2308,9 +2308,9 @@ declare module 'babylonjs-gui/2D/controls/baseSlider' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/slider' {
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { BaseSlider } from "babylonjs-gui/2D/controls/baseSlider";
+declare module 'babylonjs-gui/src/2D/controls/slider' {
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { BaseSlider } from "babylonjs-gui/src/2D/controls/baseSlider";
     /**
         * Class used to create slider controls
         */
@@ -2332,10 +2332,10 @@ declare module 'babylonjs-gui/2D/controls/slider' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/imageBasedSlider' {
-    import { BaseSlider } from "babylonjs-gui/2D/controls/baseSlider";
-    import { Measure } from "babylonjs-gui/2D/measure";
-    import { Image } from "babylonjs-gui/2D/controls/image";
+declare module 'babylonjs-gui/src/2D/controls/imageBasedSlider' {
+    import { BaseSlider } from "babylonjs-gui/src/2D/controls/baseSlider";
+    import { Measure } from "babylonjs-gui/src/2D/measure";
+    import { Image } from "babylonjs-gui/src/2D/controls/image";
     /**
         * Class used to create slider controls based on images
         */
@@ -2364,7 +2364,7 @@ declare module 'babylonjs-gui/2D/controls/imageBasedSlider' {
     }
 }
 
-declare module 'babylonjs-gui/2D/controls/statics' {
+declare module 'babylonjs-gui/src/2D/controls/statics' {
     /**
       * Forcing an export so that this code will execute
       * @hidden
@@ -2373,8 +2373,8 @@ declare module 'babylonjs-gui/2D/controls/statics' {
     export { name };
 }
 
-declare module 'babylonjs-gui/3D/controls/abstractButton3D' {
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+declare module 'babylonjs-gui/src/3D/controls/abstractButton3D' {
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     import { TransformNode, Scene } from "babylonjs";
     /**
         * Class used as a root to all buttons
@@ -2390,11 +2390,11 @@ declare module 'babylonjs-gui/3D/controls/abstractButton3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/button3D' {
-    import { AbstractButton3D } from "babylonjs-gui/3D/controls/abstractButton3D";
+declare module 'babylonjs-gui/src/3D/controls/button3D' {
+    import { AbstractButton3D } from "babylonjs-gui/src/3D/controls/abstractButton3D";
     import { Material, int, Scene, TransformNode, AbstractMesh } from "babylonjs";
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
-    import { Control } from "babylonjs-gui/2D/controls/control";
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
+    import { Control } from "babylonjs-gui/src/2D/controls/control";
     /**
         * Class used to create a button in 3D
         */
@@ -2436,8 +2436,8 @@ declare module 'babylonjs-gui/3D/controls/button3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/container3D' {
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+declare module 'babylonjs-gui/src/3D/controls/container3D' {
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     import { Scene, Nullable, TransformNode } from "babylonjs";
     /**
         * Class used to create containers for controls
@@ -2507,11 +2507,11 @@ declare module 'babylonjs-gui/3D/controls/container3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/control3D' {
+declare module 'babylonjs-gui/src/3D/controls/control3D' {
     import { IDisposable, IBehaviorAware, Nullable, TransformNode, Vector3, Observable, Behavior, AbstractMesh, Scene } from "babylonjs";
-    import { GUI3DManager } from "babylonjs-gui/3D/gui3DManager";
-    import { Vector3WithInfo } from "babylonjs-gui/3D/vector3WithInfo";
-    import { Container3D } from "babylonjs-gui/3D/controls/container3D";
+    import { GUI3DManager } from "babylonjs-gui/src/3D/gui3DManager";
+    import { Vector3WithInfo } from "babylonjs-gui/src/3D/vector3WithInfo";
+    import { Container3D } from "babylonjs-gui/src/3D/controls/container3D";
     /**
         * Class used as base class for controls
         */
@@ -2651,10 +2651,10 @@ declare module 'babylonjs-gui/3D/controls/control3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/cylinderPanel' {
-    import { VolumeBasedPanel } from "babylonjs-gui/3D/controls/volumeBasedPanel";
+declare module 'babylonjs-gui/src/3D/controls/cylinderPanel' {
+    import { VolumeBasedPanel } from "babylonjs-gui/src/3D/controls/volumeBasedPanel";
     import { float, Vector3 } from "babylonjs";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     /**
         * Class used to create a container panel deployed on the surface of a cylinder
         */
@@ -2667,11 +2667,11 @@ declare module 'babylonjs-gui/3D/controls/cylinderPanel' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/holographicButton' {
-    import { Button3D } from "babylonjs-gui/3D/controls/button3D";
+declare module 'babylonjs-gui/src/3D/controls/holographicButton' {
+    import { Button3D } from "babylonjs-gui/src/3D/controls/button3D";
     import { Mesh, StandardMaterial, Nullable, Scene, TransformNode } from "babylonjs";
-    import { FluentMaterial } from "babylonjs-gui/3D/materials/fluentMaterial";
-    import { AdvancedDynamicTexture } from "babylonjs-gui/2D/advancedDynamicTexture";
+    import { FluentMaterial } from "babylonjs-gui/src/3D/materials/fluentMaterial";
+    import { AdvancedDynamicTexture } from "babylonjs-gui/src/2D/advancedDynamicTexture";
     /**
         * Class used to create a holographic button in 3D
         */
@@ -2720,9 +2720,9 @@ declare module 'babylonjs-gui/3D/controls/holographicButton' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/meshButton3D' {
+declare module 'babylonjs-gui/src/3D/controls/meshButton3D' {
     import { Scene, TransformNode, AbstractMesh, Mesh } from "babylonjs";
-    import { Button3D } from "babylonjs-gui/3D/controls/button3D";
+    import { Button3D } from "babylonjs-gui/src/3D/controls/button3D";
     /**
         * Class used to create an interactable object. It's a 3D button using a mesh coming from the current scene
         */
@@ -2741,10 +2741,10 @@ declare module 'babylonjs-gui/3D/controls/meshButton3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/planePanel' {
+declare module 'babylonjs-gui/src/3D/controls/planePanel' {
     import { Vector3 } from "babylonjs";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
-    import { VolumeBasedPanel } from "babylonjs-gui/3D/controls/volumeBasedPanel";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
+    import { VolumeBasedPanel } from "babylonjs-gui/src/3D/controls/volumeBasedPanel";
     /**
       * Class used to create a container panel deployed on the surface of a plane
       */
@@ -2753,10 +2753,10 @@ declare module 'babylonjs-gui/3D/controls/planePanel' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/scatterPanel' {
-    import { VolumeBasedPanel } from "babylonjs-gui/3D/controls/volumeBasedPanel";
+declare module 'babylonjs-gui/src/3D/controls/scatterPanel' {
+    import { VolumeBasedPanel } from "babylonjs-gui/src/3D/controls/volumeBasedPanel";
     import { float, Vector3 } from "babylonjs";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     /**
         * Class used to create a container panel where items get randomized planar mapping
         */
@@ -2770,10 +2770,10 @@ declare module 'babylonjs-gui/3D/controls/scatterPanel' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/spherePanel' {
-    import { VolumeBasedPanel } from "babylonjs-gui/3D/controls/volumeBasedPanel";
+declare module 'babylonjs-gui/src/3D/controls/spherePanel' {
+    import { VolumeBasedPanel } from "babylonjs-gui/src/3D/controls/volumeBasedPanel";
     import { float, Vector3 } from "babylonjs";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     /**
         * Class used to create a container panel deployed on the surface of a sphere
         */
@@ -2786,8 +2786,8 @@ declare module 'babylonjs-gui/3D/controls/spherePanel' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/stackPanel3D' {
-    import { Container3D } from "babylonjs-gui/3D/controls/container3D";
+declare module 'babylonjs-gui/src/3D/controls/stackPanel3D' {
+    import { Container3D } from "babylonjs-gui/src/3D/controls/container3D";
     /**
         * Class used to create a stack panel in 3D on XY plane
         */
@@ -2809,10 +2809,10 @@ declare module 'babylonjs-gui/3D/controls/stackPanel3D' {
     }
 }
 
-declare module 'babylonjs-gui/3D/controls/volumeBasedPanel' {
-    import { Container3D } from "babylonjs-gui/3D/controls/container3D";
+declare module 'babylonjs-gui/src/3D/controls/volumeBasedPanel' {
+    import { Container3D } from "babylonjs-gui/src/3D/controls/container3D";
     import { int, Vector3 } from "babylonjs";
-    import { Control3D } from "babylonjs-gui/3D/controls/control3D";
+    import { Control3D } from "babylonjs-gui/src/3D/controls/control3D";
     /**
         * Abstract class used to create a container panel deployed on the surface of a volume
         */
@@ -2856,7 +2856,7 @@ declare module 'babylonjs-gui/3D/controls/volumeBasedPanel' {
     }
 }
 
-declare module 'babylonjs-gui/3D/materials/fluentMaterial' {
+declare module 'babylonjs-gui/src/3D/materials/fluentMaterial' {
     import { MaterialDefines, PushMaterial, Color3, Color4, Vector3, Scene, Nullable, BaseTexture, AbstractMesh, SubMesh, Matrix, Mesh } from "babylonjs";
     /** @hidden */
     export class FluentMaterialDefines extends MaterialDefines {
@@ -2946,14 +2946,6 @@ declare module 'babylonjs-gui/3D/materials/fluentMaterial' {
 // Dependencies for this module:
 //   ../../../../Tools/Gulp/babylonjs
 declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
     /**
         * Interface used to define a control that can receive focus
         */
@@ -3442,10 +3434,6 @@ declare module BABYLON.GUI {
     }
 }
 declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
-}
-declare module BABYLON.GUI {
     /**
         * Class used to manage 3D user interface
         * @see http://doc.babylonjs.com/how_to/gui3d

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

@@ -2,26 +2,6 @@
 // Dependencies for this module:
 //   ../../../../Tools/Gulp/babylonjs
 declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
-}
-declare module INSPECTOR {
     export class Inspector {
             /** The HTML document relative to this inspector (the window or the popup depending on its mode) */
             static DOCUMENT: HTMLDocument;

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

@@ -5,6 +5,7 @@ declare module "babylonjs-loaders"{ export=BABYLON;}
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
 //   ../../../../../Tools/Gulp/babylonjs
+//   ../../../../../Tools/Gulp/babylonjs-gltf2interface
 //   ../../../../../Tools/Gulp/babylonjs-loaders
 declare module BabylonViewer {
     /**
@@ -586,7 +587,7 @@ declare module BabylonViewer {
                 * A loadID provided by the modelLoader, unique to ths (Abstract)Viewer instance.
                 */
             loadId: number;
-            loadInfo: BABYLON.GLTF2.IAsset;
+            loadInfo: IAsset;
             constructor(_observablesManager: ObservablesManager, modelConfiguration: IModelConfiguration, _configurationContainer?: ConfigurationContainer | undefined);
             shadowsRenderedAfterLoad: boolean;
             getViewerId(): string | undefined;
@@ -941,8 +942,6 @@ declare module BabylonViewer {
     export function InitTags(selector?: string): void;
 }
 declare module BabylonViewer {
-}
-declare module BabylonViewer {
     export function getConfigurationKey(key: string, configObject: any): any;
     export interface ViewerConfiguration {
             version?: string;
@@ -1558,8 +1557,6 @@ declare module BabylonViewer {
     export function addLoaderPlugin(name: string, plugin: ILoaderPlugin): void;
 }
 declare module BabylonViewer {
-}
-declare module BabylonViewer {
     export interface IEnvironmentMapConfiguration {
             /**
                 * Environment map texture path in relative to the asset folder.

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

@@ -6,6 +6,7 @@ declare module "babylonjs-loaders"{ export=BABYLON;}
 // Generated by dts-bundle v0.7.3
 // Dependencies for this module:
 //   ../../../../../Tools/Gulp/babylonjs
+//   ../../../../../Tools/Gulp/babylonjs-gltf2interface
 //   ../../../../../Tools/Gulp/babylonjs-loaders
 
 declare module 'babylonjs-viewer' {
@@ -567,7 +568,7 @@ declare module 'babylonjs-viewer/loader/modelLoader' {
 
 declare module 'babylonjs-viewer/model/viewerModel' {
     import { ISceneLoaderPlugin, ISceneLoaderPluginAsync, AnimationGroup, AbstractMesh, Observable, SceneLoaderProgressEvent, IParticleSystem, Skeleton, IDisposable, Nullable, Animation, Material } from "babylonjs";
-    import { GLTF2 } from "babylonjs-loaders";
+    import { IAsset } from "babylonjs-gltf2interface";
     import { IModelConfiguration } from "babylonjs-viewer/configuration/interfaces/modelConfiguration";
     import { IModelAnimation } from "babylonjs-viewer/model/modelAnimation";
     import { ObservablesManager } from "babylonjs-viewer/managers/observablesManager";
@@ -643,7 +644,7 @@ declare module 'babylonjs-viewer/model/viewerModel' {
                 * A loadID provided by the modelLoader, unique to ths (Abstract)Viewer instance.
                 */
             loadId: number;
-            loadInfo: GLTF2.IAsset;
+            loadInfo: IAsset;
             constructor(_observablesManager: ObservablesManager, modelConfiguration: IModelConfiguration, _configurationContainer?: ConfigurationContainer | undefined);
             shadowsRenderedAfterLoad: boolean;
             getViewerId(): string | undefined;

gui/src/3D/materials/shaders/fluent.fragment.fx.ts

@@ -33,7 +33,7 @@ albedo=clamp(albedo+hoverColor.rgb*pointToHover,0.,1.);
 #else
 float pointToHover=1.0;
 #endif
-#ifdef BORDER 
+#ifdef BORDER
 float borderPower=10.0;
 float inverseBorderPower=1.0/borderPower;
 vec3 borderColor=albedo*borderPower;
@@ -42,7 +42,7 @@ distanceToEdge.x=abs(vUV.x-0.5)*2.0;
 distanceToEdge.y=abs(vUV.y-0.5)*2.0;
 float borderValue=max(smoothstep(scaleInfo.x-edgeSmoothingValue,scaleInfo.x+edgeSmoothingValue,distanceToEdge.x),
 smoothstep(scaleInfo.y-edgeSmoothingValue,scaleInfo.y+edgeSmoothingValue,distanceToEdge.y));
-borderColor=borderColor*borderValue*max(borderMinValue*inverseBorderPower,pointToHover); 
+borderColor=borderColor*borderValue*max(borderMinValue*inverseBorderPower,pointToHover);
 albedo+=borderColor;
 alpha=max(alpha,borderValue);
 #endif
@@ -51,7 +51,7 @@ alpha=max(alpha,borderValue);
 vec2 uvGlow=(vUV-vec2(0.5,0.5))*(innerGlowColor.a*2.0);
 uvGlow=uvGlow*uvGlow;
 uvGlow=uvGlow*uvGlow;
-albedo+=mix(vec3(0.0,0.0,0.0),innerGlowColor.rgb,uvGlow.x+uvGlow.y); 
+albedo+=mix(vec3(0.0,0.0,0.0),innerGlowColor.rgb,uvGlow.x+uvGlow.y);
 #endif
 gl_FragColor=vec4(albedo,alpha);
 }`;

gui/src/3D/materials/shaders/fluent.vertex.fx.ts

@@ -28,8 +28,8 @@ float minOverMiddleScale=minScale/(scale.x+scale.y+scale.z-minScale-maxScale);
 float areaYZ=scale.y*scale.z;
 float areaXZ=scale.x*scale.z;
 float areaXY=scale.x*scale.y;
-float scaledBorderWidth=borderWidth; 
-if (abs(normal.x) == 1.0) 
+float scaledBorderWidth=borderWidth;
+if (abs(normal.x) == 1.0)
 {
 scale.x=scale.y;
 scale.y=scale.z;
@@ -38,7 +38,7 @@ if (areaYZ>areaXZ && areaYZ>areaXY)
 scaledBorderWidth*=minOverMiddleScale;
 }
 }
-else if (abs(normal.y) == 1.0) 
+else if (abs(normal.y) == 1.0)
 {
 scale.x=scale.z;
 if (areaXZ>areaXY && areaXZ>areaYZ)
@@ -46,7 +46,7 @@ if (areaXZ>areaXY && areaXZ>areaYZ)
 scaledBorderWidth*=minOverMiddleScale;
 }
 }
-else 
+else
 {
 if (areaXY>areaYZ && areaXY>areaXZ)
 {
@@ -63,8 +63,8 @@ else
 {
 scaleInfo.x=1.0-scaledBorderWidth;
 scaleInfo.y=1.0-(scaledBorderWidth*scaleRatio);
-} 
-#endif 
+}
+#endif
 vec4 worldPos=world*vec4(position,1.0);
 #ifdef HOVERLIGHT
 worldPosition=worldPos.xyz;

materialsLibrary/src/cell/cell.fragment.fx.ts

@@ -106,7 +106,7 @@ float shadow=1.;
 float glossiness=0.;
 #ifdef SPECULARTERM
 vec3 specularBase=vec3(0.,0.,0.);
-#endif 
+#endif
 #include<lightFragment>[0..maxSimultaneousLights]
 #ifdef VERTEXALPHA
 alpha*=vColor.a;

materialsLibrary/src/fur/fur.vertex.fx.ts

@@ -69,7 +69,7 @@ vfur_length=furLength*texture(heightTexture,uv).x;
 #else
 vfur_length=furLength*texture2D(heightTexture,uv).r;
 #endif
-#else 
+#else
 vfur_length=(furLength*r);
 #endif
 vec3 tangent1=vec3(normal.y,-normal.x,0);

materialsLibrary/src/gradient/gradient.vertex.fx.ts

@@ -43,7 +43,7 @@ varying vec4 vColor;
 #include<__decl__lightFragment>[0..maxSimultaneousLights]
 void main(void) {
 #include<instancesVertex>
-#include<bonesVertex> 
+#include<bonesVertex>
 gl_Position=viewProjection*finalWorld*vec4(position,1.0);
 vec4 worldPos=finalWorld*vec4(position,1.0);
 vPositionW=vec3(worldPos);

materialsLibrary/src/grid/grid.fragment.fx.ts

@@ -22,7 +22,7 @@ float majorGridFrequency=gridControl.y;
 if (floor(position+0.5) == floor(position/majorGridFrequency+0.5)*majorGridFrequency)
 {
 return 1.0;
-} 
+}
 return gridControl.z;
 }
 float getAnisotropicAttenuation(float differentialLength) {
@@ -30,15 +30,15 @@ const float maxNumberOfLines=10.0;
 return clamp(1.0/(differentialLength+1.0)-1.0/maxNumberOfLines,0.0,1.0);
 }
 float isPointOnLine(float position,float differentialLength) {
-float fractionPartOfPosition=position-floor(position+0.5); 
-fractionPartOfPosition/=differentialLength; 
+float fractionPartOfPosition=position-floor(position+0.5);
+fractionPartOfPosition/=differentialLength;
 fractionPartOfPosition=clamp(fractionPartOfPosition,-1.,1.);
-float result=0.5+0.5*cos(fractionPartOfPosition*PI); 
-return result; 
+float result=0.5+0.5*cos(fractionPartOfPosition*PI);
+return result;
 }
 float contributionOnAxis(float position) {
 float differentialLength=length(vec2(dFdx(position),dFdy(position)));
-differentialLength*=SQRT2; 
+differentialLength*=SQRT2;
 
 float result=isPointOnLine(position,differentialLength);
 

materialsLibrary/src/lava/lava.vertex.fx.ts

@@ -70,12 +70,12 @@ return t*t*t*(t*(t*6.0-15.0)+10.0);
 
 float pnoise(vec3 P,vec3 rep)
 {
-vec3 Pi0=mod(floor(P),rep); 
-vec3 Pi1=mod(Pi0+vec3(1.0),rep); 
+vec3 Pi0=mod(floor(P),rep);
+vec3 Pi1=mod(Pi0+vec3(1.0),rep);
 Pi0=mod289(Pi0);
 Pi1=mod289(Pi1);
-vec3 Pf0=fract(P); 
-vec3 Pf1=Pf0-vec3(1.0); 
+vec3 Pf0=fract(P);
+vec3 Pf1=Pf0-vec3(1.0);
 vec4 ix=vec4(Pi0.x,Pi1.x,Pi0.x,Pi1.x);
 vec4 iy=vec4(Pi0.yy,Pi1.yy);
 vec4 iz0=Pi0.zzzz;

materialsLibrary/src/simple/simple.fragment.fx.ts

@@ -61,7 +61,7 @@ float shadow=1.;
 float glossiness=0.;
 #ifdef SPECULARTERM
 vec3 specularBase=vec3(0.,0.,0.);
-#endif 
+#endif
 #include<lightFragment>[0..maxSimultaneousLights]
 #ifdef VERTEXALPHA
 alpha*=vColor.a;

materialsLibrary/src/sky/sky.fragment.fx.ts

@@ -43,7 +43,7 @@ vec3 simplifiedRayleigh()
 return 0.0005/vec3(94,40,18);
 }
 float rayleighPhase(float cosTheta)
-{ 
+{
 return (3.0/(16.0*pi))*(1.0+pow(cosTheta,2.0));
 }
 vec3 totalMie(vec3 lambda,vec3 K,float T)
@@ -99,12 +99,12 @@ vec3 L0=vec3(0.1)*Fex;
 float sundisk=smoothstep(sunAngularDiameterCos,sunAngularDiameterCos+0.00002,cosTheta);
 L0+=(sunE*19000.0*Fex)*sundisk;
 vec3 whiteScale=1.0/Uncharted2Tonemap(vec3(W));
-vec3 texColor=(Lin+L0); 
+vec3 texColor=(Lin+L0);
 texColor*=0.04 ;
 texColor+=vec3(0.0,0.001,0.0025)*0.3;
 float g_fMaxLuminance=1.0;
-float fLumScaled=0.1/luminance; 
-float fLumCompressed=(fLumScaled*(1.0+(fLumScaled/(g_fMaxLuminance*g_fMaxLuminance))))/(1.0+fLumScaled); 
+float fLumScaled=0.1/luminance;
+float fLumCompressed=(fLumScaled*(1.0+(fLumScaled/(g_fMaxLuminance*g_fMaxLuminance))))/(1.0+fLumScaled);
 float ExposureBias=fLumCompressed;
 vec3 curr=Uncharted2Tonemap((log2(2.0/pow(luminance,4.0)))*texColor);
 

materialsLibrary/src/terrain/terrain.fragment.fx.ts

@@ -64,7 +64,7 @@ float invmax=inversesqrt(max(dot(tangent,tangent),dot(binormal,binormal)));
 return mat3(tangent*invmax,binormal*invmax,normal);
 }
 vec3 perturbNormal(vec3 viewDir,vec3 mixColor)
-{ 
+{
 vec3 bump1Color=texture2D(bump1Sampler,vTextureUV*diffuse1Infos).xyz;
 vec3 bump2Color=texture2D(bump2Sampler,vTextureUV*diffuse2Infos).xyz;
 vec3 bump3Color=texture2D(bump3Sampler,vTextureUV*diffuse3Infos).xyz;

materialsLibrary/src/water/water.fragment.fx.ts

@@ -133,7 +133,7 @@ vec3 finalSpecular=specularBase*specularColor;
 #else
 vec3 finalSpecular=vec3(0.0);
 #endif
-#else 
+#else
 #ifdef REFLECTION
 
 vec3 eyeVector=normalize(vEyePosition-vPosition);

postProcessLibrary/src/asciiArt/asciiart.fragment.fx.ts

@@ -14,7 +14,7 @@ float getLuminance(vec3 color)
 return clamp(dot(color,vec3(0.2126,0.7152,0.0722)),0.,1.);
 }
 
-void main(void) 
+void main(void)
 {
 float caracterSize=asciiArtFontInfos.x;
 float numChar=asciiArtFontInfos.y-1.0;

postProcessLibrary/src/digitalRain/digitalrain.fragment.fx.ts

@@ -16,7 +16,7 @@ float getLuminance(vec3 color)
 return clamp(dot(color,vec3(0.2126,0.7152,0.0722)),0.,1.);
 }
 
-void main(void) 
+void main(void)
 {
 float caracterSize=digitalRainFontInfos.x;
 float numChar=digitalRainFontInfos.y-1.0;
@@ -33,7 +33,7 @@ vec4 tileColor=texture2D(textureSampler,tileUV);
 vec4 baseColor=texture2D(textureSampler,vUV);
 float tileLuminance=getLuminance(tileColor.rgb);
 int st=int(mod(columnx,4.0));
-float speed=cosTimeZeroOne*(sin(tileX*314.5)*0.5+0.6); 
+float speed=cosTimeZeroOne*(sin(tileX*314.5)*0.5+0.6);
 float x=float(mod(gl_FragCoord.x,caracterSize))/fontx;
 float y=float(mod(speed+gl_FragCoord.y/screeny,1.0));
 y*=ratio;

proceduralTexturesLibrary/src/marble/marbleProceduralTexture.fragment.fx.ts

@@ -37,11 +37,11 @@ vec3 marble_color(float x)
 {
 vec3 col;
 x=0.5*(x+1.);
-x=sqrt(x); 
 x=sqrt(x);
 x=sqrt(x);
-col=vec3(.2+.75*x); 
-col.b*=0.95; 
+x=sqrt(x);
+col=vec3(.2+.75*x);
+col.b*=0.95;
 return col;
 }
 void main()

proceduralTexturesLibrary/src/perlinNoise/perlinNoiseProceduralTexture.fragment.fx.ts

@@ -16,7 +16,7 @@ return fract(cos(n*89.42)*343.42);
 }
 vec2 r(vec2 n)
 {
-return vec2(r(n.x*23.62-300.0+n.y*34.35),r(n.x*45.13+256.0+n.y*38.89)); 
+return vec2(r(n.x*23.62-300.0+n.y*34.35),r(n.x*45.13+256.0+n.y*38.89));
 }
 float worley(vec2 n,float s)
 {

proceduralTexturesLibrary/src/road/roadProceduralTexture.fragment.fx.ts

@@ -2,7 +2,7 @@ import { Effect } from "babylonjs";
 
 let name = 'roadProceduralTexturePixelShader';
 let shader = `precision highp float;
-varying vec2 vUV; 
+varying vec2 vUV;
 uniform vec3 roadColor;
 float rand(vec2 n) {
 return fract(cos(dot(n,vec2(12.9898,4.1414)))*43758.5453);

proceduralTexturesLibrary/src/starfield/starfieldProceduralTexture.fragment.fx.ts

@@ -36,23 +36,23 @@ float s=0.1,fade=1.;
 vec3 v=vec3(0.);
 for (int r=0; r<volsteps; r++) {
 vec3 p=from+s*dir*.5;
-p=abs(vec3(tile)-mod(p,vec3(tile*2.))); 
+p=abs(vec3(tile)-mod(p,vec3(tile*2.)));
 float pa,a=pa=0.;
 for (int i=0; i<iterations; i++) {
-p=abs(p)/dot(p,p)-formuparam; 
-a+=abs(length(p)-pa); 
+p=abs(p)/dot(p,p)-formuparam;
+a+=abs(length(p)-pa);
 pa=length(p);
 }
-float dm=max(0.,darkmatter-a*a*.001); 
-a*=a*a; 
-if (r>6) fade*=1.-dm; 
+float dm=max(0.,darkmatter-a*a*.001);
+a*=a*a;
+if (r>6) fade*=1.-dm;
 
 v+=fade;
-v+=vec3(s,s*s,s*s*s*s)*a*brightness*fade; 
-fade*=distfading; 
+v+=vec3(s,s*s,s*s*s*s)*a*brightness*fade;
+fade*=distfading;
 s+=stepsize;
 }
-v=mix(vec3(length(v)),v,saturation); 
+v=mix(vec3(length(v)),v,saturation);
 gl_FragColor=vec4(v*.01,1.);
 }`;