Move Legacy to Legacy Folder

Tools/Gulp/config.json

@@ -1511,7 +1511,7 @@
         "libraries": [
             {
                 "output": "babylonjs.materials.min.js",
-                "entry": "./src/legacy.ts"
+                "entry": "./legacy/legacy.ts"
             },
             {
                 "output": "babylon.cellMaterial.min.js",
@@ -1617,7 +1617,7 @@
         "libraries": [
             {
                 "output": "babylonjs.postProcess.min.js",
-                "entry": "./src/legacy.ts"
+                "entry": "./legacy/legacy.ts"
             },
             {
                 "output": "babylon.asciiArtPostProcess.min.js",
@@ -1658,7 +1658,7 @@
         "libraries": [
             {
                 "output": "babylonjs.proceduralTextures.min.js",
-                "entry": "./src/legacy.ts"
+                "entry": "./legacy/legacy.ts"
             },
             {
                 "output": "babylon.brickProceduralTexture.min.js",
@@ -1739,7 +1739,7 @@
         "libraries": [
             {
                 "output": "babylonjs.loaders.min.js",
-                "entry": "./src/legacy.ts"
+                "entry": "./legacy/legacy.ts"
             },
             {
                 "output": "babylon.objFileLoader.min.js",
@@ -1868,7 +1868,7 @@
         "libraries": [
             {
                 "output": "babylon.gui.min.js",
-                "entry": "././src/legacy.ts"
+                "entry": "././legacy/legacy.ts"
             }
         ],
         "build": {
@@ -1899,7 +1899,7 @@
         "libraries": [
             {
                 "output": "babylon.inspector.bundle.js",
-                "entry": "././src/legacy.ts",
+                "entry": "././legacy/legacy.ts",
                 "extendsRoot": true
             }
         ],

gui/src/legacy.ts

@@ -1,4 +1,4 @@
-import * as GUI from "./index";
+import * as GUI from "../src/index";
 
 /**
  * Legacy support, defining window.BABYLON.GUI (global variable).
@@ -12,4 +12,4 @@ if (typeof globalObject !== "undefined") {
     (<any>globalObject).BABYLON.GUI = GUI;
 }
 
-export * from "./index";
+export * from "../src/index";

gui/tsconfig.json

@@ -20,12 +20,16 @@
         "skipDefaultLibCheck": true,
         "skipLibCheck": true,
         "baseUrl": "./src/",
-        "rootDir": "./src/",
+        "rootDir": "./",
         "paths": {
             "babylonjs": [
                 "../../dist/preview release/babylon.d.ts"
             ]
         },
-        "outDir": "./build"
+        "outDir": "./build",
+        "exclude": [
+            "node_modules",
+            "**/*.spec.ts"
+        ]
     }
 }

gui/webpack.config.js

@@ -6,7 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-gui': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-gui': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/gui'),

inspector/src/legacy.ts

@@ -1,4 +1,4 @@
-import * as INSPECTOR from "./index";
+import * as INSPECTOR from "../src/index";
 
 /**
  * Legacy support, defining window.INSPECTOR (global variable).
@@ -12,4 +12,4 @@ if (typeof globalObject !== "undefined") {
     (<any>globalObject).INSPECTOR = INSPECTOR;
 }
 
-export * from "./index";
+export * from "../src/index";

inspector/tsconfig.json

@@ -20,7 +20,7 @@
         "skipDefaultLibCheck": true,
         "skipLibCheck": true,
         "baseUrl": "./src/",
-        "rootDir": "./src/",
+        "rootDir": "./",
         "paths": {
             "babylonjs": [
                 "../../dist/preview release/babylon.d.ts"
@@ -41,6 +41,10 @@
                 "./helpers/ISplit.d.ts"
             ]
         },
-        "outDir": "./build"
+        "outDir": "./build",
+        "exclude": [
+            "node_modules",
+            "**/*.spec.ts"
+        ]
     }
 }

inspector/webpack.config.js

@@ -7,7 +7,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-inspector': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-inspector': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/inspector'),

loaders/legacy/legacy-glTF.ts

@@ -0,0 +1,15 @@
+import * as FileLoader from "../src/glTF/glTFFileLoader";
+
+/**
+ * This is the entry point for the UMD module.
+ * The entry point for a future ESM package should be index.ts
+ */
+var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
+if (typeof globalObject !== "undefined") {
+    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
+    for (var key in FileLoader) {
+        (<any>globalObject).BABYLON[key] = (<any>FileLoader)[key];
+    }
+}
+
+export * from "../src/glTF/glTFFileLoader";

loaders/legacy/legacy-glTF1.ts

@@ -0,0 +1,16 @@
+import * as GLTF1 from "../src/glTF/1.0";
+
+/**
+ * This is the entry point for the UMD module.
+ * The entry point for a future ESM package should be index.ts
+ */
+var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
+if (typeof globalObject !== "undefined") {
+    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
+    (<any>globalObject).BABYLON.GLTF1 = (<any>globalObject).BABYLON.GLTF1 || { };
+    for (var key in GLTF1) {
+        (<any>globalObject).BABYLON.GLTF1[key] = (<any>GLTF1)[key];
+    }
+}
+
+export { GLTF1 };

loaders/legacy/legacy-glTF1FileLoader.ts

@@ -1,21 +1,2 @@
-import * as FileLoader from "../src/glTF/glTFFileLoader";
-import * as GLTF1 from "../src/glTF/1.0";
-
-/**
- * This is the entry point for the UMD module.
- * The entry point for a future ESM package should be index.ts
- */
-var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
-if (typeof globalObject !== "undefined") {
-    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
-    for (var key in FileLoader) {
-        (<any>globalObject).BABYLON[key] = (<any>FileLoader)[key];
-    }
-    (<any>globalObject).BABYLON.GLTF1 = (<any>globalObject).BABYLON.GLTF1 || { };
-    for (var key in GLTF1) {
-        (<any>globalObject).BABYLON.GLTF1[key] = (<any>GLTF1)[key];
-    }
-}
-
-export * from "../src/glTF/glTFFileLoader";
-export { GLTF1 };
+export * from "./legacy-glTF";
+export * from "./legacy-glTF1";

loaders/legacy/legacy-glTF2.ts

@@ -0,0 +1,32 @@
+import * as Extensions from "../src/glTF/2.0/Extensions";
+import * as GLTF2 from "../src/glTF/2.0";
+
+/**
+ * This is the entry point for the UMD module.
+ * The entry point for a future ESM package should be index.ts
+ */
+var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
+if (typeof globalObject !== "undefined") {
+    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
+    var BABYLON = (<any>globalObject).BABYLON;
+    BABYLON.GLTF2 = BABYLON.GLTF2 || { };
+    BABYLON.GLTF2.Loader = BABYLON.GLTF2.Loader || { };
+    BABYLON.GLTF2.Loader.Extensions = BABYLON.GLTF2.Loader.Extensions || { };
+
+    const keys = [];
+    for (var key in Extensions) {
+        BABYLON.GLTF2.Loader.Extensions[key] = (<any>Extensions)[key];
+        keys.push(key);
+    }
+
+    for (var key in GLTF2) {
+        // Prevent Reassignment.
+        if (keys.indexOf(key) > -1) {
+            continue;
+        }
+
+        BABYLON.GLTF2[key] = (<any>GLTF2)[key];
+    }
+}
+
+export { GLTF2 };

loaders/legacy/legacy-glTF2FileLoader.ts

@@ -1,20 +1,2 @@
-import * as FileLoader from "../src/glTF/glTFFileLoader";
-import * as GLTF2 from "../src/glTF/2.0";
-
-/**
- * This is the entry point for the UMD module.
- * The entry point for a future ESM package should be index.ts
- */
-var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
-if (typeof globalObject !== "undefined") {
-    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
-    for (var key in FileLoader) {
-        (<any>globalObject).BABYLON[key] = (<any>FileLoader)[key];
-    }
-    for (var key in GLTF2) {
-        (<any>globalObject).BABYLON[key] = (<any>GLTF2)[key];
-    }
-}
-
-export * from "../src/glTF/glTFFileLoader";
-export { GLTF2 };
+export * from "./legacy-glTF";
+export * from "./legacy-glTF2";

loaders/legacy/legacy-glTFFileLoader.ts

@@ -1,28 +1,3 @@
-import * as FileLoader from "../src/glTF/glTFFileLoader";
-import * as GLTF1 from "../src/glTF/1.0";
-import * as GLTF2 from "../src/glTF/2.0";
-
-/**
- * This is the entry point for the UMD module.
- * The entry point for a future ESM package should be index.ts
- */
-var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
-if (typeof globalObject !== "undefined") {
-    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
-    for (var key in FileLoader) {
-        (<any>globalObject).BABYLON[key] = (<any>FileLoader)[key];
-    }
-    (<any>globalObject).BABYLON.GLTF1 = (<any>globalObject).BABYLON.GLTF1 || { };
-    for (var key in GLTF1) {
-        (<any>globalObject).BABYLON.GLTF1[key] = (<any>GLTF1)[key];
-    }
-    for (var key in GLTF2) {
-        (<any>globalObject).BABYLON[key] = (<any>GLTF2)[key];
-    }
-}
-
-export * from "../src/glTF/glTFFileLoader";
-export {
-    GLTF1,
-    GLTF2
-};
+export * from "./legacy-glTF";
+export * from "./legacy-glTF1";
+export * from "./legacy-glTF2";

loaders/legacy/legacy.ts

@@ -0,0 +1,6 @@
+import "../src";
+export * from "./legacy-glTF";
+export * from "./legacy-glTF1";
+export * from "./legacy-glTF2";
+export * from "./legacy-objFileLoader";
+export * from "./legacy-stlFileLoader";

loaders/src/legacy.ts

@@ -1,34 +0,0 @@
-import * as FileLoader from "./glTF/glTFFileLoader";
-import * as LoadersV1 from "./glTF/1.0";
-import * as LoadersV2 from "./glTF/2.0";
-import * as LoadersOBJ from "./OBJ";
-import * as LoadersSTL from "./STL";
-
-/**
- * Legacy support, defining window.BABYLON.OBJLoader... (global variable).
- *
- * This is the entry point for the UMD module.
- * The entry point for a future ESM package should be index.ts
- */
-var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
-if (typeof globalObject !== "undefined") {
-    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || { };
-    for (var key in FileLoader) {
-        (<any>globalObject).BABYLON[key] = (<any>FileLoader)[key];
-    }
-    (<any>globalObject).BABYLON.GLTF1 = (<any>globalObject).BABYLON.GLTF1 || { };
-    for (var key in LoadersV1) {
-        (<any>globalObject).BABYLON.GLTF1[key] = (<any>LoadersV1)[key];
-    }
-    for (var key in LoadersV2) {
-        (<any>globalObject).BABYLON[key] = (<any>LoadersV2)[key];
-    }
-    for (var key in LoadersOBJ) {
-        (<any>globalObject).BABYLON[key] = (<any>LoadersOBJ)[key];
-    }
-    for (var key in LoadersSTL) {
-        (<any>globalObject).BABYLON[key] = (<any>LoadersSTL)[key];
-    }
-}
-
-export * from "./index";

loaders/webpack.config.js

@@ -6,7 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-loaders': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-loaders': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/loaders'),

materialsLibrary/src/legacy.ts

@@ -1,4 +1,4 @@
-import * as MatLib from "./index";
+import * as MatLib from "../src/index";
 
 /**
  * Legacy support, defining window.BABYLON.GridMaterial... (global variable).
@@ -16,4 +16,4 @@ if (typeof globalObject !== "undefined") {
     }
 }
 
-export * from "./index";
+export * from "../src/index";

materialsLibrary/webpack.config.js

@@ -6,7 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-materials': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-materials': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/materialsLibrary'),

postProcessLibrary/src/legacy.ts

@@ -1,4 +1,4 @@
-import * as postProcessLibrary from "./index";
+import * as postProcessLibrary from "../src/index";
 
 /**
  *
@@ -12,4 +12,4 @@ if (typeof globalObject !== "undefined") {
     }
 }
 
-export * from "./index";
+export * from "../src/index";

postProcessLibrary/webpack.config.js

@@ -6,7 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-postProcessesLibrary': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-postProcessesLibrary': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/postProcessLibrary'),

proceduralTexturesLibrary/src/legacy.ts

@@ -1,4 +1,4 @@
-import * as ProceduralTexturesLib from "./index";
+import * as ProceduralTexturesLib from "../src/index";
 
 /**
  * Legacy support, defining window.BABYLON.GridMaterial... (global variable).
@@ -16,4 +16,4 @@ if (typeof globalObject !== "undefined") {
     }
 }
 
-export * from "./index";
+export * from "../src/index";

proceduralTexturesLibrary/webpack.config.js

@@ -6,7 +6,7 @@ const CleanWebpackPlugin = require('clean-webpack-plugin');
 module.exports = {
     context: __dirname,
     entry: {
-        'babylonjs-procedural-textures': path.resolve(__dirname, './src/legacy.ts'),
+        'babylonjs-procedural-textures': path.resolve(__dirname, './legacy/legacy.ts'),
     },
     output: {
         path: path.resolve(__dirname, '../dist/preview release/gui'),