Re export trial

Tools/Gulp/config.json

@@ -1786,6 +1786,10 @@
                     {
                         "path": "babylonjs-loaders/src/glTF/1.0",
                         "namespace": "BABYLON.GLTF1"
+                    },
+                    {
+                        "path": "babylonjs-loaders/src/glTF/2.0/Extensions",
+                        "namespace": "BABYLON.GLTF2.Loader.Extensions"
                     }
                 ],
                 "importsToRemove": [],

dist/preview release/loaders/babylonjs.loaders.d.ts

@@ -1098,7 +1098,7 @@ declare module BABYLON {
                 * @param name The name of the loader extension.
                 * @param factory The factory function that creates the loader extension.
                 */
-            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtensionV2): void;
+            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtension): void;
             /**
                 * Unregisters a loader extension.
                 * @param name The name of the loader extenion.
@@ -1261,11 +1261,11 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
-    export var __IGLTFLoaderExtensionV2: number;
+    export var __IGLTFLoaderExtension: number;
     /**
         * Interface for a glTF loader extension.
         */
-    export interface IGLTFLoaderExtensionV2 extends IGLTFLoaderExtension, BABYLON.IDisposable {
+    export interface IGLTFLoaderExtension extends IGLTFBaseLoaderExtension, BABYLON.IDisposable {
             /**
                 * Called after the loader state changes to LOADING.
                 */
@@ -1547,11 +1547,11 @@ declare module BABYLON {
             textures?: ITexture[];
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/eb3e32332042e04691a5f35103f8c261e50d8f1e/extensions/2.0/Khronos/EXT_lights_image_based/README.md) (Experimental)
       */
-    export class EXT_lights_image_based implements IGLTFLoaderExtensionV2 {
+    export class EXT_lights_image_based implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1566,11 +1566,11 @@ declare module BABYLON {
         loadSceneAsync(context: string, scene: IScene): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression)
       */
-    export class KHR_draco_mesh_compression implements IGLTFLoaderExtensionV2 {
+    export class KHR_draco_mesh_compression implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1583,11 +1583,11 @@ declare module BABYLON {
         _loadVertexDataAsync(context: string, primitive: IMeshPrimitive, babylonMesh: BABYLON.Mesh): BABYLON.Nullable<Promise<BABYLON.Geometry>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/1048d162a44dbcb05aefc1874bfd423cf60135a6/extensions/2.0/Khronos/KHR_lights_punctual/README.md) (Experimental)
       */
-    export class KHR_lights implements IGLTFLoaderExtensionV2 {
+    export class KHR_lights implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1602,11 +1602,11 @@ declare module BABYLON {
         loadNodeAsync(context: string, node: INode, assign: (babylonMesh: BABYLON.Mesh) => void): BABYLON.Nullable<Promise<BABYLON.Mesh>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
       */
-    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1619,11 +1619,11 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit)
       */
-    export class KHR_materials_unlit implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_unlit implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1636,11 +1636,11 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_transform/README.md)
       */
-    export class KHR_texture_transform implements IGLTFLoaderExtensionV2 {
+    export class KHR_texture_transform implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1653,11 +1653,11 @@ declare module BABYLON {
         loadTextureInfoAsync(context: string, textureInfo: ITextureInfo, assign: (babylonTexture: BABYLON.BaseTexture) => void): BABYLON.Nullable<Promise<BABYLON.BaseTexture>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/najadojo/glTF/tree/MSFT_audio_emitter/extensions/2.0/Vendor/MSFT_audio_emitter)
       */
-    export class MSFT_audio_emitter implements IGLTFLoaderExtensionV2 {
+    export class MSFT_audio_emitter implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1676,11 +1676,11 @@ declare module BABYLON {
         loadAnimationAsync(context: string, animation: IAnimation): BABYLON.Nullable<Promise<BABYLON.AnimationGroup>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
         * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/MSFT_lod)
         */
-    export class MSFT_lod implements IGLTFLoaderExtensionV2 {
+    export class MSFT_lod implements IGLTFLoaderExtension {
             /** The name of this extension. */
             readonly name: string;
             /** Defines whether this extension is enabled. */
@@ -1715,9 +1715,9 @@ declare module BABYLON {
             _loadUriAsync(context: string, uri: string): BABYLON.Nullable<Promise<ArrayBufferView>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /** @hidden */
-    export class MSFT_minecraftMesh implements IGLTFLoaderExtensionV2 {
+    export class MSFT_minecraftMesh implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);
@@ -1725,9 +1725,9 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /** @hidden */
-    export class MSFT_sRGBFactors implements IGLTFLoaderExtensionV2 {
+    export class MSFT_sRGBFactors implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);

dist/preview release/loaders/babylonjs.loaders.js

@@ -6575,7 +6575,7 @@ glTFFileLoader_1.GLTFFileLoader._CreateGLTF2Loader = function (parent) { return
 
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @hidden */
-exports.__IGLTFLoaderExtensionV2 = 0; // I am here to allow dts to be created
+exports.__IGLTFLoaderExtension = 0; // I am here to allow dts to be created
 
 
 /***/ }),
@@ -7392,8 +7392,10 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(__webpack_require__(/*! ./glTFFileLoader */ "./src/glTF/glTFFileLoader.ts"));
-__export(__webpack_require__(/*! ./1.0 */ "./src/glTF/1.0/index.ts"));
-__export(__webpack_require__(/*! ./2.0 */ "./src/glTF/2.0/index.ts"));
+var GLTF1 = __webpack_require__(/*! ./1.0 */ "./src/glTF/1.0/index.ts");
+exports.GLTF1 = GLTF1;
+var GLTF2 = __webpack_require__(/*! ./2.0 */ "./src/glTF/2.0/index.ts");
+exports.GLTF2 = GLTF2;
 
 
 /***/ }),

dist/preview release/loaders/babylonjs.loaders.module.d.ts

@@ -11,8 +11,9 @@ declare module 'babylonjs-loaders' {
 
 declare module 'babylonjs-loaders/src/glTF' {
     export * from "babylonjs-loaders/src/glTF/glTFFileLoader";
-    export * from "babylonjs-loaders/src/glTF/1.0";
-    export * from "babylonjs-loaders/src/glTF/2.0";
+    import * as GLTF1 from "babylonjs-loaders/src/glTF/1.0";
+    import * as GLTF2 from "babylonjs-loaders/src/glTF/2.0";
+    export { GLTF1, GLTF2 };
 }
 
 declare module 'babylonjs-loaders/src/OBJ' {
@@ -1135,7 +1136,7 @@ declare module 'babylonjs-loaders/src/glTF/2.0/glTF2Loader' {
     import { Scene, Nullable, Mesh, Material, SceneLoaderProgressEvent, AbstractMesh, IParticleSystem, Skeleton, AnimationGroup, Camera, BaseTexture } from "babylonjs";
     import { IProperty } from "babylonjs-gltf2interface";
     import { IGLTF, INode, IScene, ICamera, IAnimation, IBufferView, IMaterial, ITextureInfo, IImage, IArrayItem } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData } from "babylonjs-loaders/src/glTF/glTFFileLoader";
     /**
         * Helper class for working with arrays when loading the glTF asset
@@ -1170,7 +1171,7 @@ declare module 'babylonjs-loaders/src/glTF/2.0/glTF2Loader' {
                 * @param name The name of the loader extension.
                 * @param factory The factory function that creates the loader extension.
                 */
-            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtensionV2): void;
+            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtension): void;
             /**
                 * Unregisters a loader extension.
                 * @param name The name of the loader extenion.
@@ -1335,13 +1336,13 @@ declare module 'babylonjs-loaders/src/glTF/2.0/glTF2Loader' {
 declare module 'babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension' {
     import { IDisposable, Nullable, Mesh, Camera, Geometry, Material, BaseTexture, AnimationGroup } from "babylonjs";
     import { IScene, INode, ICamera, IMeshPrimitive, IMaterial, ITextureInfo, IAnimation } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/glTFFileLoader";
+    import { IGLTFLoaderExtension as IGLTFBaseLoaderExtension } from "babylonjs-loaders/src/glTF/glTFFileLoader";
     /** @hidden */
-    export var __IGLTFLoaderExtensionV2: number;
+    export var __IGLTFLoaderExtension: number;
     /**
         * Interface for a glTF loader extension.
         */
-    export interface IGLTFLoaderExtensionV2 extends IGLTFLoaderExtension, IDisposable {
+    export interface IGLTFLoaderExtension extends IGLTFBaseLoaderExtension, IDisposable {
             /**
                 * Called after the loader state changes to LOADING.
                 */
@@ -1643,12 +1644,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/EXT_lights_image_based' {
     import { Nullable } from "babylonjs";
     import { IScene } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/eb3e32332042e04691a5f35103f8c261e50d8f1e/extensions/2.0/Khronos/EXT_lights_image_based/README.md) (Experimental)
       */
-    export class EXT_lights_image_based implements IGLTFLoaderExtensionV2 {
+    export class EXT_lights_image_based implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1667,12 +1668,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/EXT_lights_image_based
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_draco_mesh_compression' {
     import { Geometry, Mesh, Nullable } from "babylonjs";
     import { IMeshPrimitive } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression)
       */
-    export class KHR_draco_mesh_compression implements IGLTFLoaderExtensionV2 {
+    export class KHR_draco_mesh_compression implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1689,12 +1690,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_draco_mesh_compres
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_lights_punctual' {
     import { Mesh, Nullable } from "babylonjs";
     import { INode } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/1048d162a44dbcb05aefc1874bfd423cf60135a6/extensions/2.0/Khronos/KHR_lights_punctual/README.md) (Experimental)
       */
-    export class KHR_lights implements IGLTFLoaderExtensionV2 {
+    export class KHR_lights implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1713,12 +1714,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_lights_punctual' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_materials_pbrSpecularGlossiness' {
     import { Material, Nullable } from "babylonjs";
     import { IMaterial } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
       */
-    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1735,12 +1736,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_materials_pbrSpecu
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_materials_unlit' {
     import { Material, Nullable } from "babylonjs";
     import { IMaterial } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit)
       */
-    export class KHR_materials_unlit implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_unlit implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1757,12 +1758,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_materials_unlit' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_texture_transform' {
     import { BaseTexture, Nullable } from "babylonjs";
     import { ITextureInfo } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_transform/README.md)
       */
-    export class KHR_texture_transform implements IGLTFLoaderExtensionV2 {
+    export class KHR_texture_transform implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1779,12 +1780,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/KHR_texture_transform'
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter' {
     import { Nullable, Mesh, AnimationGroup } from "babylonjs";
     import { IScene, INode, IAnimation } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
       * [Specification](https://github.com/najadojo/glTF/tree/MSFT_audio_emitter/extensions/2.0/Vendor/MSFT_audio_emitter)
       */
-    export class MSFT_audio_emitter implements IGLTFLoaderExtensionV2 {
+    export class MSFT_audio_emitter implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -1807,12 +1808,12 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_lod' {
     import { Observable, Nullable, Mesh, Material } from "babylonjs";
     import { INode, IMaterial } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /**
         * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/MSFT_lod)
         */
-    export class MSFT_lod implements IGLTFLoaderExtensionV2 {
+    export class MSFT_lod implements IGLTFLoaderExtension {
             /** The name of this extension. */
             readonly name: string;
             /** Defines whether this extension is enabled. */
@@ -1851,10 +1852,10 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_lod' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_minecraftMesh' {
     import { Material, Nullable } from "babylonjs";
     import { IMaterial } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /** @hidden */
-    export class MSFT_minecraftMesh implements IGLTFLoaderExtensionV2 {
+    export class MSFT_minecraftMesh implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);
@@ -1866,10 +1867,10 @@ declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_minecraftMesh' {
 declare module 'babylonjs-loaders/src/glTF/2.0/Extensions/MSFT_sRGBFactors' {
     import { Material, Nullable } from "babylonjs";
     import { IMaterial } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderInterfaces";
-    import { IGLTFLoaderExtensionV2 } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
+    import { IGLTFLoaderExtension } from "babylonjs-loaders/src/glTF/2.0/glTFLoaderExtension";
     import { GLTF2Loader } from "babylonjs-loaders/src/glTF/2.0/glTF2Loader";
     /** @hidden */
-    export class MSFT_sRGBFactors implements IGLTFLoaderExtensionV2 {
+    export class MSFT_sRGBFactors implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);
@@ -2979,7 +2980,7 @@ declare module BABYLON {
                 * @param name The name of the loader extension.
                 * @param factory The factory function that creates the loader extension.
                 */
-            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtensionV2): void;
+            static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtension): void;
             /**
                 * Unregisters a loader extension.
                 * @param name The name of the loader extenion.
@@ -3142,11 +3143,11 @@ declare module BABYLON {
 }
 declare module BABYLON {
     /** @hidden */
-    export var __IGLTFLoaderExtensionV2: number;
+    export var __IGLTFLoaderExtension: number;
     /**
         * Interface for a glTF loader extension.
         */
-    export interface IGLTFLoaderExtensionV2 extends IGLTFLoaderExtension, BABYLON.IDisposable {
+    export interface IGLTFLoaderExtension extends IGLTFBaseLoaderExtension, BABYLON.IDisposable {
             /**
                 * Called after the loader state changes to LOADING.
                 */
@@ -3428,11 +3429,11 @@ declare module BABYLON {
             textures?: ITexture[];
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/eb3e32332042e04691a5f35103f8c261e50d8f1e/extensions/2.0/Khronos/EXT_lights_image_based/README.md) (Experimental)
       */
-    export class EXT_lights_image_based implements IGLTFLoaderExtensionV2 {
+    export class EXT_lights_image_based implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3447,11 +3448,11 @@ declare module BABYLON {
         loadSceneAsync(context: string, scene: IScene): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression)
       */
-    export class KHR_draco_mesh_compression implements IGLTFLoaderExtensionV2 {
+    export class KHR_draco_mesh_compression implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3464,11 +3465,11 @@ declare module BABYLON {
         _loadVertexDataAsync(context: string, primitive: IMeshPrimitive, babylonMesh: BABYLON.Mesh): BABYLON.Nullable<Promise<BABYLON.Geometry>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/1048d162a44dbcb05aefc1874bfd423cf60135a6/extensions/2.0/Khronos/KHR_lights_punctual/README.md) (Experimental)
       */
-    export class KHR_lights implements IGLTFLoaderExtensionV2 {
+    export class KHR_lights implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3483,11 +3484,11 @@ declare module BABYLON {
         loadNodeAsync(context: string, node: INode, assign: (babylonMesh: BABYLON.Mesh) => void): BABYLON.Nullable<Promise<BABYLON.Mesh>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
       */
-    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3500,11 +3501,11 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit)
       */
-    export class KHR_materials_unlit implements IGLTFLoaderExtensionV2 {
+    export class KHR_materials_unlit implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3517,11 +3518,11 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_transform/README.md)
       */
-    export class KHR_texture_transform implements IGLTFLoaderExtensionV2 {
+    export class KHR_texture_transform implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3534,11 +3535,11 @@ declare module BABYLON {
         loadTextureInfoAsync(context: string, textureInfo: ITextureInfo, assign: (babylonTexture: BABYLON.BaseTexture) => void): BABYLON.Nullable<Promise<BABYLON.BaseTexture>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
       * [Specification](https://github.com/najadojo/glTF/tree/MSFT_audio_emitter/extensions/2.0/Vendor/MSFT_audio_emitter)
       */
-    export class MSFT_audio_emitter implements IGLTFLoaderExtensionV2 {
+    export class MSFT_audio_emitter implements IGLTFLoaderExtension {
         /** The name of this extension. */
         readonly name: string;
         /** Defines whether this extension is enabled. */
@@ -3557,11 +3558,11 @@ declare module BABYLON {
         loadAnimationAsync(context: string, animation: IAnimation): BABYLON.Nullable<Promise<BABYLON.AnimationGroup>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /**
         * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/MSFT_lod)
         */
-    export class MSFT_lod implements IGLTFLoaderExtensionV2 {
+    export class MSFT_lod implements IGLTFLoaderExtension {
             /** The name of this extension. */
             readonly name: string;
             /** Defines whether this extension is enabled. */
@@ -3596,9 +3597,9 @@ declare module BABYLON {
             _loadUriAsync(context: string, uri: string): BABYLON.Nullable<Promise<ArrayBufferView>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /** @hidden */
-    export class MSFT_minecraftMesh implements IGLTFLoaderExtensionV2 {
+    export class MSFT_minecraftMesh implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);
@@ -3606,9 +3607,9 @@ declare module BABYLON {
         loadMaterialPropertiesAsync(context: string, material: IMaterial, babylonMaterial: BABYLON.Material): BABYLON.Nullable<Promise<void>>;
     }
 }
-declare module BABYLON {
+declare module BABYLON.GLTF2.Loader.Extensions {
     /** @hidden */
-    export class MSFT_sRGBFactors implements IGLTFLoaderExtensionV2 {
+    export class MSFT_sRGBFactors implements IGLTFLoaderExtension {
         readonly name: string;
         enabled: boolean;
         constructor(loader: GLTF2Loader);

loaders/src/glTF/2.0/Extensions/EXT_lights_image_based.ts

@@ -1,7 +1,7 @@
 import { BaseTexture, Nullable, RawCubeTexture, Quaternion, Matrix, SphericalHarmonics, SphericalPolynomial, Scalar } from "babylonjs";
 import { IChildRootProperty } from "babylonjs-gltf2interface";
 import { IScene } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader, ArrayItem } from "../glTF2Loader";
 
 const NAME = "EXT_lights_image_based";
@@ -28,7 +28,7 @@ interface ILights {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/blob/eb3e32332042e04691a5f35103f8c261e50d8f1e/extensions/2.0/Khronos/EXT_lights_image_based/README.md) (Experimental)
  */
-export class EXT_lights_image_based implements IGLTFLoaderExtensionV2 {
+export class EXT_lights_image_based implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/KHR_draco_mesh_compression.ts

@@ -1,7 +1,7 @@
 import { Geometry, DracoCompression, Mesh, Nullable, VertexBuffer } from "babylonjs";
 import { MeshPrimitiveMode } from "babylonjs-gltf2interface";
 import { IBufferView, IMeshPrimitive } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader, ArrayItem } from "../glTF2Loader";
 
 const NAME = "KHR_draco_mesh_compression";
@@ -18,7 +18,7 @@ interface IBufferViewDraco extends IBufferView {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_draco_mesh_compression)
  */
-export class KHR_draco_mesh_compression implements IGLTFLoaderExtensionV2 {
+export class KHR_draco_mesh_compression implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/KHR_lights_punctual.ts

@@ -1,7 +1,7 @@
 import { Mesh, Nullable, Light, DirectionalLight, Vector3, PointLight, SpotLight, Color3 } from "babylonjs";
 import { IChildRootProperty } from "babylonjs-gltf2interface";
 import { INode } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader, ArrayItem } from "../glTF2Loader";
 
 const NAME = "KHR_lights_punctual";
@@ -34,7 +34,7 @@ interface ILights {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/blob/1048d162a44dbcb05aefc1874bfd423cf60135a6/extensions/2.0/Khronos/KHR_lights_punctual/README.md) (Experimental)
  */
-export class KHR_lights implements IGLTFLoaderExtensionV2 {
+export class KHR_lights implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/KHR_materials_pbrSpecularGlossiness.ts

@@ -1,6 +1,6 @@
 import { Material, Nullable, PBRMaterial, Color3 } from "babylonjs";
 import { ITextureInfo, IMaterial } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader } from "../glTF2Loader";
 
 const NAME = "KHR_materials_pbrSpecularGlossiness";
@@ -16,7 +16,7 @@ interface IKHRMaterialsPbrSpecularGlossiness {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_pbrSpecularGlossiness)
  */
-export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtensionV2 {
+export class KHR_materials_pbrSpecularGlossiness implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/KHR_materials_unlit.ts

@@ -1,6 +1,6 @@
 import { Material, Nullable, PBRMaterial, Color3 } from "babylonjs";
 import { IMaterial } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader } from "../glTF2Loader";
 
 const NAME = "KHR_materials_unlit";
@@ -8,7 +8,7 @@ const NAME = "KHR_materials_unlit";
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_materials_unlit)
  */
-export class KHR_materials_unlit implements IGLTFLoaderExtensionV2 {
+export class KHR_materials_unlit implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/KHR_texture_transform.ts

@@ -1,6 +1,6 @@
 import { BaseTexture, Nullable, Texture } from "babylonjs";
 import { ITextureInfo } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader } from "../glTF2Loader";
 
 const NAME = "KHR_texture_transform";
@@ -15,7 +15,7 @@ interface IKHRTextureTransform {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_texture_transform/README.md)
  */
-export class KHR_texture_transform implements IGLTFLoaderExtensionV2 {
+export class KHR_texture_transform implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/MSFT_audio_emitter.ts

@@ -1,6 +1,6 @@
 import { WeightedSound, Sound, Nullable, Mesh, Vector3, Tools, AnimationGroup, AnimationEvent } from "babylonjs";
 import { IArrayItem, IScene, INode, IAnimation } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader, ArrayItem } from "../glTF2Loader";
 
 const NAME = "MSFT_audio_emitter";
@@ -83,7 +83,7 @@ interface ILoaderAnimationEvents {
 /**
  * [Specification](https://github.com/najadojo/glTF/tree/MSFT_audio_emitter/extensions/2.0/Vendor/MSFT_audio_emitter)
  */
-export class MSFT_audio_emitter implements IGLTFLoaderExtensionV2 {
+export class MSFT_audio_emitter implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/MSFT_lod.ts

@@ -1,6 +1,6 @@
 import { Observable, Nullable, Deferred, Mesh, Material } from "babylonjs";
 import { INode, IMaterial } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader, ArrayItem } from "../glTF2Loader";
 
 const NAME = "MSFT_lod";
@@ -12,7 +12,7 @@ interface IMSFTLOD {
 /**
  * [Specification](https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Vendor/MSFT_lod)
  */
-export class MSFT_lod implements IGLTFLoaderExtensionV2 {
+export class MSFT_lod implements IGLTFLoaderExtension {
     /** The name of this extension. */
     public readonly name = NAME;
 

loaders/src/glTF/2.0/Extensions/MSFT_minecraftMesh.ts

@@ -1,12 +1,12 @@
 import { Material, Nullable, PBRMaterial } from "babylonjs";
 import { IMaterial } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader } from "../glTF2Loader";
 
 const NAME = "MSFT_minecraftMesh";
 
 /** @hidden */
-export class MSFT_minecraftMesh implements IGLTFLoaderExtensionV2 {
+export class MSFT_minecraftMesh implements IGLTFLoaderExtension {
     public readonly name = NAME;
     public enabled = true;
 

loaders/src/glTF/2.0/Extensions/MSFT_sRGBFactors.ts

@@ -1,12 +1,12 @@
 import { Material, Nullable, PBRMaterial } from "babylonjs";
 import { IMaterial } from "../glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "../glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "../glTFLoaderExtension";
 import { GLTF2Loader } from "../glTF2Loader";
 
 const NAME = "MSFT_sRGBFactors";
 
 /** @hidden */
-export class MSFT_sRGBFactors implements IGLTFLoaderExtensionV2 {
+export class MSFT_sRGBFactors implements IGLTFLoaderExtension {
     public readonly name = NAME;
     public enabled = true;
 

loaders/src/glTF/2.0/glTF2Loader.ts

@@ -1,7 +1,7 @@
 import { IFileRequest, Buffer, Animation, Scene, Nullable, Mesh, Material, SceneLoaderProgressEvent, Tools, AbstractMesh, IParticleSystem, Skeleton, AnimationGroup, Geometry, VertexBuffer, MorphTargetManager, MorphTarget, TransformNode, Vector3, Quaternion, Matrix, Bone, Camera, FreeCamera, IAnimationKey, AnimationKeyInterpolation, IndicesArray, PBRMaterial, Color3, BaseTexture, Deferred, Texture, LoadFileError } from "babylonjs";
 import { IProperty, AccessorType, CameraType, AnimationChannelTargetPath, AnimationSamplerInterpolation, AccessorComponentType, MaterialAlphaMode, TextureMinFilter, TextureWrapMode, TextureMagFilter, MeshPrimitiveMode } from "babylonjs-gltf2interface";
 import { _IAnimationSamplerData, IGLTF, ISampler, INode, IScene, IMesh,  IAccessor, ISkin, ICamera, IAnimation, IAnimationChannel, IAnimationSampler, IBuffer, IBufferView, IMaterialPbrMetallicRoughness, IMaterial, ITextureInfo, ITexture, IImage, IMeshPrimitive, IArrayItem, _ISamplerData } from "./glTFLoaderInterfaces";
-import { IGLTFLoaderExtensionV2 } from "./glTFLoaderExtension";
+import { IGLTFLoaderExtension } from "./glTFLoaderExtension";
 import { IGLTFLoader, GLTFFileLoader, GLTFLoaderState, IGLTFLoaderData, GLTFLoaderCoordinateSystemMode, GLTFLoaderAnimationStartMode } from "../glTFFileLoader";
 
 interface IFileRequestInfo extends IFileRequest {
@@ -62,7 +62,7 @@ export class GLTF2Loader implements IGLTFLoader {
     private _disposed = false;
     private _parent: GLTFFileLoader;
     private _state: Nullable<GLTFLoaderState> = null;
-    private _extensions: { [name: string]: IGLTFLoaderExtensionV2 } = {};
+    private _extensions: { [name: string]: IGLTFLoaderExtension } = {};
     private _rootUrl: string;
     private _fileName: string;
     private _uniqueRootUrl: string;
@@ -74,14 +74,14 @@ export class GLTF2Loader implements IGLTFLoader {
     private static readonly _DefaultSampler: ISampler = { index: -1 };
 
     private static _ExtensionNames = new Array<string>();
-    private static _ExtensionFactories: { [name: string]: (loader: GLTF2Loader) => IGLTFLoaderExtensionV2 } = {};
+    private static _ExtensionFactories: { [name: string]: (loader: GLTF2Loader) => IGLTFLoaderExtension } = {};
 
     /**
      * Registers a loader extension.
      * @param name The name of the loader extension.
      * @param factory The factory function that creates the loader extension.
      */
-    public static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtensionV2): void {
+    public static RegisterExtension(name: string, factory: (loader: GLTF2Loader) => IGLTFLoaderExtension): void {
         if (GLTF2Loader.UnregisterExtension(name)) {
             Tools.Warn(`Extension with the name '${name}' already exists`);
         }
@@ -1955,7 +1955,7 @@ export class GLTF2Loader implements IGLTFLoader {
         });
     }
 
-    private _forEachExtensions(action: (extension: IGLTFLoaderExtensionV2) => void): void {
+    private _forEachExtensions(action: (extension: IGLTFLoaderExtension) => void): void {
         for (const name of GLTF2Loader._ExtensionNames) {
             const extension = this._extensions[name];
             if (extension.enabled) {
@@ -1964,7 +1964,7 @@ export class GLTF2Loader implements IGLTFLoader {
         }
     }
 
-    private _applyExtensions<T>(property: IProperty, actionAsync: (extension: IGLTFLoaderExtensionV2) => Nullable<T> | undefined): Nullable<T> {
+    private _applyExtensions<T>(property: IProperty, actionAsync: (extension: IGLTFLoaderExtension) => Nullable<T> | undefined): Nullable<T> {
         for (const name of GLTF2Loader._ExtensionNames) {
             const extension = this._extensions[name];
             if (extension.enabled) {

loaders/src/glTF/2.0/glTFLoaderExtension.ts

@@ -1,14 +1,14 @@
 import { IDisposable, Nullable, Mesh, Camera, Geometry, Material, BaseTexture, AnimationGroup } from "babylonjs";
 import { IScene, INode, ICamera, IMeshPrimitive, IMaterial, ITextureInfo, IAnimation } from "./glTFLoaderInterfaces";
-import { IGLTFLoaderExtension } from "../glTFFileLoader";
+import { IGLTFLoaderExtension as IGLTFBaseLoaderExtension } from "../glTFFileLoader";
 
 /** @hidden */
-export var __IGLTFLoaderExtensionV2 = 0; // I am here to allow dts to be created
+export var __IGLTFLoaderExtension = 0; // I am here to allow dts to be created
 
 /**
  * Interface for a glTF loader extension.
  */
-export interface IGLTFLoaderExtensionV2 extends IGLTFLoaderExtension, IDisposable {
+export interface IGLTFLoaderExtension extends IGLTFBaseLoaderExtension, IDisposable {
     /**
      * Called after the loader state changes to LOADING.
      */

loaders/src/glTF/index.ts

@@ -1,3 +1,7 @@
 export * from "./glTFFileLoader";
-export * from "./1.0";
-export * from "./2.0";
+import * as GLTF1 from "./1.0";
+import * as GLTF2 from "./2.0";
+export {
+    GLTF1,
+    GLTF2
+};