Fixed #2561 and #2560

dist/preview release/babylon.max.js

@@ -46795,6 +46795,7 @@ var BABYLON;
                     if (onSuccess) {
                         onSuccess(scene);
                     }
+                    scene.loadingPluginName = plugin.name;
                     scene._removePendingData(loadingToken);
                 }
                 else {
@@ -46803,6 +46804,7 @@ var BABYLON;
                         if (onSuccess) {
                             onSuccess(scene);
                         }
+                        scene.loadingPluginName = plugin.name;
                         scene._removePendingData(loadingToken);
                     }, progressHandler, errorHandler);
                 }
@@ -46858,6 +46860,7 @@ var BABYLON;
             return operation + " of " + (producer ? producer.file + " from " + producer.name + " version: " + producer.version + ", exporter version: " + producer.exporter_version : "unknown");
         };
         BABYLON.SceneLoader.RegisterPlugin({
+            name: "babylon.js",
             extensions: ".babylon",
             canDirectLoad: function (data) {
                 if (data.indexOf("babylon") !== -1) {

dist/preview release/customConfigurations/minimalGLTFViewer/babylon.max.js

@@ -48173,6 +48173,7 @@ var BABYLON;
                     if (onSuccess) {
                         onSuccess(scene);
                     }
+                    scene.loadingPluginName = plugin.name;
                     scene._removePendingData(loadingToken);
                 }
                 else {
@@ -48181,6 +48182,7 @@ var BABYLON;
                         if (onSuccess) {
                             onSuccess(scene);
                         }
+                        scene.loadingPluginName = plugin.name;
                         scene._removePendingData(loadingToken);
                     }, progressHandler, errorHandler);
                 }
@@ -48236,6 +48238,7 @@ var BABYLON;
             return operation + " of " + (producer ? producer.file + " from " + producer.name + " version: " + producer.version + ", exporter version: " + producer.exporter_version : "unknown");
         };
         BABYLON.SceneLoader.RegisterPlugin({
+            name: "babylon.js",
             extensions: ".babylon",
             canDirectLoad: function (data) {
                 if (data.indexOf("babylon") !== -1) {
@@ -49060,6 +49063,7 @@ var BABYLON;
         function GLTFFileLoader() {
             // V2 options
             this.coordinateSystemMode = GLTFLoaderCoordinateSystemMode.AUTO;
+            this.name = "gltf";
             this.extensions = {
                 ".gltf": { isBinary: false },
                 ".glb": { isBinary: true }

dist/preview release/loaders/babylon.glTF1FileLoader.d.ts

@@ -22,6 +22,7 @@ declare module BABYLON {
         onTextureLoaded: (texture: BaseTexture) => void;
         onMaterialLoaded: (material: Material) => void;
         onComplete: () => void;
+        name: string;
         extensions: ISceneLoaderPluginExtensions;
         importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;
         loadAsync(scene: Scene, data: string | ArrayBuffer, rootUrl: string, onSuccess: () => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;

dist/preview release/loaders/babylon.glTF1FileLoader.js

@@ -15,6 +15,7 @@ var BABYLON;
         function GLTFFileLoader() {
             // V2 options
             this.coordinateSystemMode = GLTFLoaderCoordinateSystemMode.AUTO;
+            this.name = "gltf";
             this.extensions = {
                 ".gltf": { isBinary: false },
                 ".glb": { isBinary: true }

dist/preview release/loaders/babylon.glTF2FileLoader.d.ts

@@ -22,6 +22,7 @@ declare module BABYLON {
         onTextureLoaded: (texture: BaseTexture) => void;
         onMaterialLoaded: (material: Material) => void;
         onComplete: () => void;
+        name: string;
         extensions: ISceneLoaderPluginExtensions;
         importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;
         loadAsync(scene: Scene, data: string | ArrayBuffer, rootUrl: string, onSuccess: () => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;

dist/preview release/loaders/babylon.glTF2FileLoader.js

@@ -15,6 +15,7 @@ var BABYLON;
         function GLTFFileLoader() {
             // V2 options
             this.coordinateSystemMode = GLTFLoaderCoordinateSystemMode.AUTO;
+            this.name = "gltf";
             this.extensions = {
                 ".gltf": { isBinary: false },
                 ".glb": { isBinary: true }

dist/preview release/loaders/babylon.glTFFileLoader.d.ts

@@ -22,6 +22,7 @@ declare module BABYLON {
         onTextureLoaded: (texture: BaseTexture) => void;
         onMaterialLoaded: (material: Material) => void;
         onComplete: () => void;
+        name: string;
         extensions: ISceneLoaderPluginExtensions;
         importMeshAsync(meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;
         loadAsync(scene: Scene, data: string | ArrayBuffer, rootUrl: string, onSuccess: () => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void): void;

dist/preview release/loaders/babylon.glTFFileLoader.js

@@ -15,6 +15,7 @@ var BABYLON;
         function GLTFFileLoader() {
             // V2 options
             this.coordinateSystemMode = GLTFLoaderCoordinateSystemMode.AUTO;
+            this.name = "gltf";
             this.extensions = {
                 ".gltf": { isBinary: false },
                 ".glb": { isBinary: true }

dist/preview release/loaders/babylon.objFileLoader.d.ts

@@ -30,6 +30,7 @@ declare module BABYLON {
     }
     class OBJFileLoader implements ISceneLoaderPlugin {
         static OPTIMIZE_WITH_UV: boolean;
+        name: string;
         extensions: string;
         obj: RegExp;
         group: RegExp;

dist/preview release/loaders/babylon.objFileLoader.js

@@ -197,6 +197,7 @@ var BABYLON;
     BABYLON.MTLFileLoader = MTLFileLoader;
     var OBJFileLoader = (function () {
         function OBJFileLoader() {
+            this.name = "obj";
             this.extensions = ".obj";
             this.obj = /^o/;
             this.group = /^g/;

dist/preview release/loaders/babylon.stlFileLoader.d.ts

@@ -5,6 +5,7 @@ declare module BABYLON {
         facetsPattern: RegExp;
         normalPattern: RegExp;
         vertexPattern: RegExp;
+        name: string;
         extensions: ISceneLoaderPluginExtensions;
         importMesh(meshesNames: any, scene: Scene, data: any, rootUrl: string, meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]): boolean;
         load(scene: Scene, data: any, rootUrl: string): boolean;

dist/preview release/loaders/babylon.stlFileLoader.js

@@ -7,6 +7,7 @@ var BABYLON;
             this.facetsPattern = /facet([\s\S]*?)endfacet/g;
             this.normalPattern = /normal[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
             this.vertexPattern = /vertex[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
+            this.name = "stl";
             // force data to come in as an ArrayBuffer
             // we'll convert to string if it looks like it's an ASCII .stl
             this.extensions = {

loaders/src/OBJ/babylon.objFileLoader.ts

@@ -191,7 +191,7 @@ module BABYLON {
     export class OBJFileLoader implements ISceneLoaderPlugin {
 
         public static OPTIMIZE_WITH_UV = false;
-
+        public name = "obj";
         public extensions = ".obj";
         public obj = /^o/;
         public group = /^g/;

loaders/src/STL/babylon.stlFileLoader.ts

@@ -9,6 +9,9 @@ module BABYLON {
         public normalPattern = /normal[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
         public vertexPattern = /vertex[\s]+([\-+]?[0-9]+\.?[0-9]*([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+[\s]+([\-+]?[0-9]*\.?[0-9]+([eE][\-+]?[0-9]+)?)+/g;
 
+
+        public name = "stl";
+
         // force data to come in as an ArrayBuffer
         // we'll convert to string if it looks like it's an ASCII .stl
         public extensions: ISceneLoaderPluginExtensions = {

loaders/src/glTF/babylon.glTFFileLoader.ts

@@ -37,6 +37,8 @@ module BABYLON {
         public onMaterialLoaded: (material: Material) => void;
         public onComplete: () => void;
 
+        public name = "gltf";
+
         public extensions: ISceneLoaderPluginExtensions = {
             ".gltf": { isBinary: false },
             ".glb": { isBinary: true }

sandbox/index.css

@@ -127,7 +127,7 @@ a {
     width: 100%;
     height: 60px;
     bottom: 0;
-    background-color: #59448F;
+    background-color: #3B789A;
     padding-top: 5px;
     padding-left: 15px;
 }

sandbox/index.js

@@ -1,6 +1,4 @@
-/// <reference path="../../babylon.js" />
-
-if (BABYLON.Engine.isSupported()) {
+if (BABYLON.Engine.isSupported()) {
     var canvas = document.getElementById("renderCanvas");
     var engine = new BABYLON.Engine(canvas, true);
     var divFps = document.getElementById("fps");
@@ -54,6 +52,14 @@ if (BABYLON.Engine.isSupported()) {
         }
         currentScene.activeCamera.attachControl(canvas);
 
+        // Environment
+        if (currentScene.loadingPluginName === "gltf") {
+            var hdrTexture = BABYLON.CubeTexture.CreateFromPrefilteredData("Assets/environment.dds", currentScene);
+            hdrTexture.gammaSpace = false;
+                        
+            currentScene.createDefaultSkybox(hdrTexture, true, 100, 0.3);
+        }
+
         // In case of error during loading, meshes will be empty and clearColor is set to red
         if (currentScene.meshes.length === 0 && currentScene.clearColor.r === 1 && currentScene.clearColor.g === 0 && currentScene.clearColor.b === 0) {
             document.getElementById("logo").className = "";

src/Loading/Plugins/babylon.babylonFileLoader.ts

@@ -30,6 +30,7 @@
     }
 
     SceneLoader.RegisterPlugin({
+        name: "babylon.js",
         extensions: ".babylon",
         canDirectLoad: (data: string) => {
             if (data.indexOf("babylon") !== -1) { // We consider that the producer string is filled

src/Loading/babylon.sceneLoader.ts

@@ -6,6 +6,7 @@
     }
 
     export interface ISceneLoaderPlugin {
+        name: string;
         extensions: string | ISceneLoaderPluginExtensions;
         importMesh: (meshesNames: any, scene: Scene, data: any, rootUrl: string, meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[], onError: (message: string) => void) => boolean;
         load: (scene: Scene, data: string, rootUrl: string, onError: (message: string) => void) => boolean;
@@ -13,6 +14,7 @@
     }
 
     export interface ISceneLoaderPluginAsync {
+        name: string;
         extensions: string | ISceneLoaderPluginExtensions;
         importMeshAsync: (meshesNames: any, scene: Scene, data: any, rootUrl: string, onSuccess: (meshes: AbstractMesh[], particleSystems: ParticleSystem[], skeletons: Skeleton[]) => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void) => void;
         loadAsync: (scene: Scene, data: string, rootUrl: string, onSuccess: () => void, onProgress: (event: ProgressEvent) => void, onError: (message: string) => void) => void;
@@ -318,6 +320,8 @@
                     if (onSuccess) {
                         onSuccess(scene);
                     }
+
+                    scene.loadingPluginName = plugin.name;
                     scene._removePendingData(loadingToken);
                 } else {
                     var asyncedPlugin = <ISceneLoaderPluginAsync>plugin;
@@ -325,7 +329,8 @@
                         if (onSuccess) {
                             onSuccess(scene);
                         }
-
+                        
+                        scene.loadingPluginName = plugin.name;
                         scene._removePendingData(loadingToken);
                     }, progressHandler, errorHandler);
                 }

src/babylon.scene.ts

@@ -246,6 +246,7 @@
 
         // Metadata
         public metadata: any = null;
+        public loadingPluginName: string;
 
         // Events