Selaa lähdekoodia

Serializers Legacy

sebastien 6 vuotta sitten
vanhempi
commit
5d95e36e13

+ 1 - 1
Tools/Gulp/config.json

@@ -1808,7 +1808,7 @@
         "libraries": [
             {
                 "output": "babylonjs.serializers.min.js",
-                "entry": "./src/legacy.ts"
+                "entry": "./legacy/legacy.ts"
             },
             {
                 "output": "babylon.objSerializer.min.js",

+ 31 - 5
dist/preview release/serializers/babylon.glTF2Serializer.js

@@ -141,18 +141,44 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var Exporters = __webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts");
-var Serializers = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
+var Datas = __webpack_require__(/*! ../src/glTF/2.0/glTFData */ "./src/glTF/2.0/glTFData.ts");
+var Serializers = __webpack_require__(/*! ../src/glTF/2.0/glTFSerializer */ "./src/glTF/2.0/glTFSerializer.ts");
+var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 /**
  * 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") {
-    for (var exporter in Exporters) {
-        globalObject.BABYLON[exporter] = Exporters[exporter];
+    globalObject.BABYLON = globalObject.BABYLON || {};
+    var BABYLON = globalObject.BABYLON;
+    BABYLON.GLTF2 = BABYLON.GLTF2 || {};
+    BABYLON.GLTF2.Exporter = BABYLON.GLTF2.Exporter || {};
+    BABYLON.GLTF2.Exporter.Extensions = BABYLON.GLTF2.Exporter.Extensions || {};
+    var keys = [];
+    for (var key in Exporters) {
+        BABYLON[key] = Exporters[key];
+        keys.push(key);
     }
-    for (var serializer in Serializers) {
-        globalObject.BABYLON[serializer] = Serializers[serializer];
+    for (var key in Datas) {
+        BABYLON[key] = Datas[key];
+        keys.push(key);
+    }
+    for (var key in Serializers) {
+        BABYLON[key] = Serializers[key];
+        keys.push(key);
+    }
+    for (var key in Extensions) {
+        BABYLON.GLTF2.Exporter.Extensions[key] = Extensions[key];
+        keys.push(key);
+    }
+    for (var key in GLTF2) {
+        // Prevent Reassignment.
+        if (keys.indexOf(key) > -1) {
+            continue;
+        }
+        BABYLON.GLTF2.Exporter[key] = GLTF2[key];
     }
 }
 __export(__webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts"));

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/serializers/babylon.glTF2Serializer.js.map


+ 31 - 5
dist/preview release/serializers/babylon.glTF2Serializer.min.js

@@ -141,18 +141,44 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 var Exporters = __webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts");
-var Serializers = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
+var Datas = __webpack_require__(/*! ../src/glTF/2.0/glTFData */ "./src/glTF/2.0/glTFData.ts");
+var Serializers = __webpack_require__(/*! ../src/glTF/2.0/glTFSerializer */ "./src/glTF/2.0/glTFSerializer.ts");
+var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
 /**
  * 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") {
-    for (var exporter in Exporters) {
-        globalObject.BABYLON[exporter] = Exporters[exporter];
+    globalObject.BABYLON = globalObject.BABYLON || {};
+    var BABYLON = globalObject.BABYLON;
+    BABYLON.GLTF2 = BABYLON.GLTF2 || {};
+    BABYLON.GLTF2.Exporter = BABYLON.GLTF2.Exporter || {};
+    BABYLON.GLTF2.Exporter.Extensions = BABYLON.GLTF2.Exporter.Extensions || {};
+    var keys = [];
+    for (var key in Exporters) {
+        BABYLON[key] = Exporters[key];
+        keys.push(key);
     }
-    for (var serializer in Serializers) {
-        globalObject.BABYLON[serializer] = Serializers[serializer];
+    for (var key in Datas) {
+        BABYLON[key] = Datas[key];
+        keys.push(key);
+    }
+    for (var key in Serializers) {
+        BABYLON[key] = Serializers[key];
+        keys.push(key);
+    }
+    for (var key in Extensions) {
+        BABYLON.GLTF2.Exporter.Extensions[key] = Extensions[key];
+        keys.push(key);
+    }
+    for (var key in GLTF2) {
+        // Prevent Reassignment.
+        if (keys.indexOf(key) > -1) {
+            continue;
+        }
+        BABYLON.GLTF2.Exporter[key] = GLTF2[key];
     }
 }
 __export(__webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts"));

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/serializers/babylon.glTF2Serializer.min.js.map


+ 112 - 36
dist/preview release/serializers/babylonjs.serializers.js

@@ -91,7 +91,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "./src/legacy.ts");
+/******/ 	return __webpack_require__(__webpack_require__.s = "./legacy/legacy.ts");
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -127,6 +127,117 @@ module.exports = g;
 
 /***/ }),
 
+/***/ "./legacy/legacy-glTF2Serializer.ts":
+/*!******************************************!*\
+  !*** ./legacy/legacy-glTF2Serializer.ts ***!
+  \******************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(global) {
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+var Exporters = __webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts");
+var Datas = __webpack_require__(/*! ../src/glTF/2.0/glTFData */ "./src/glTF/2.0/glTFData.ts");
+var Serializers = __webpack_require__(/*! ../src/glTF/2.0/glTFSerializer */ "./src/glTF/2.0/glTFSerializer.ts");
+var Extensions = __webpack_require__(/*! ../src/glTF/2.0/Extensions */ "./src/glTF/2.0/Extensions/index.ts");
+var GLTF2 = __webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts");
+/**
+ * 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") {
+    globalObject.BABYLON = globalObject.BABYLON || {};
+    var BABYLON = globalObject.BABYLON;
+    BABYLON.GLTF2 = BABYLON.GLTF2 || {};
+    BABYLON.GLTF2.Exporter = BABYLON.GLTF2.Exporter || {};
+    BABYLON.GLTF2.Exporter.Extensions = BABYLON.GLTF2.Exporter.Extensions || {};
+    var keys = [];
+    for (var key in Exporters) {
+        BABYLON[key] = Exporters[key];
+        keys.push(key);
+    }
+    for (var key in Datas) {
+        BABYLON[key] = Datas[key];
+        keys.push(key);
+    }
+    for (var key in Serializers) {
+        BABYLON[key] = Serializers[key];
+        keys.push(key);
+    }
+    for (var key in Extensions) {
+        BABYLON.GLTF2.Exporter.Extensions[key] = Extensions[key];
+        keys.push(key);
+    }
+    for (var key in GLTF2) {
+        // Prevent Reassignment.
+        if (keys.indexOf(key) > -1) {
+            continue;
+        }
+        BABYLON.GLTF2.Exporter[key] = GLTF2[key];
+    }
+}
+__export(__webpack_require__(/*! ../src/glTF/glTFFileExporter */ "./src/glTF/glTFFileExporter.ts"));
+__export(__webpack_require__(/*! ../src/glTF/2.0 */ "./src/glTF/2.0/index.ts"));
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../node_modules/webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js")))
+
+/***/ }),
+
+/***/ "./legacy/legacy-objSerializer.ts":
+/*!****************************************!*\
+  !*** ./legacy/legacy-objSerializer.ts ***!
+  \****************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(global) {
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+var Serializers = __webpack_require__(/*! ../src/OBJ */ "./src/OBJ/index.ts");
+/**
+ * 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") {
+    for (var serializer in Serializers) {
+        globalObject.BABYLON[serializer] = Serializers[serializer];
+    }
+}
+__export(__webpack_require__(/*! ../src/OBJ */ "./src/OBJ/index.ts"));
+
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../node_modules/webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js")))
+
+/***/ }),
+
+/***/ "./legacy/legacy.ts":
+/*!**************************!*\
+  !*** ./legacy/legacy.ts ***!
+  \**************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+function __export(m) {
+    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+__webpack_require__(/*! ../src */ "./src/index.ts");
+__export(__webpack_require__(/*! ./legacy-glTF2Serializer */ "./legacy/legacy-glTF2Serializer.ts"));
+__export(__webpack_require__(/*! ./legacy-objSerializer */ "./legacy/legacy-objSerializer.ts"));
+
+
+/***/ }),
+
 /***/ "./src/OBJ/index.ts":
 /*!**************************!*\
   !*** ./src/OBJ/index.ts ***!
@@ -3996,41 +4107,6 @@ __export(__webpack_require__(/*! ./glTF */ "./src/glTF/index.ts"));
 
 /***/ }),
 
-/***/ "./src/legacy.ts":
-/*!***********************!*\
-  !*** ./src/legacy.ts ***!
-  \***********************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-/* WEBPACK VAR INJECTION */(function(global) {
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-var Serializers = __webpack_require__(/*! ./index */ "./src/index.ts");
-/**
- * Legacy support, defining window.BABYLON.OBJSerializer... (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") {
-    globalObject.BABYLON = globalObject.BABYLON || {};
-    for (var serializer in Serializers) {
-        if (Serializers.hasOwnProperty(serializer)) {
-            globalObject.BABYLON[serializer] = Serializers[serializer];
-        }
-    }
-}
-__export(__webpack_require__(/*! ./index */ "./src/index.ts"));
-
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../node_modules/webpack/buildin/global.js */ "../node_modules/webpack/buildin/global.js")))
-
-/***/ }),
-
 /***/ "babylonjs":
 /*!****************************************************************************************************!*\
   !*** external {"root":"BABYLON","commonjs":"babylonjs","commonjs2":"babylonjs","amd":"babylonjs"} ***!

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.js.map


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.min.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
dist/preview release/serializers/babylonjs.serializers.min.js.map


+ 35 - 5
serializers/legacy/legacy-glTF2Serializer.ts

@@ -1,5 +1,8 @@
 import * as Exporters from "../src/glTF/glTFFileExporter";
-import * as Serializers from "../src/glTF/2.0";
+import * as Datas from "../src/glTF/2.0/glTFData";
+import * as Serializers from "../src/glTF/2.0/glTFSerializer";
+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.
@@ -7,11 +10,38 @@ import * as Serializers from "../src/glTF/2.0";
  */
 var globalObject = (typeof global !== 'undefined') ? global : ((typeof window !== 'undefined') ? window : undefined);
 if (typeof globalObject !== "undefined") {
-    for (var exporter in Exporters) {
-        (<any>globalObject).BABYLON[exporter] = (<any>Exporters)[exporter];
+    (<any>globalObject).BABYLON = (<any>globalObject).BABYLON || {};
+    var BABYLON = (<any>globalObject).BABYLON;
+    BABYLON.GLTF2 = BABYLON.GLTF2 || {};
+    BABYLON.GLTF2.Exporter = BABYLON.GLTF2.Exporter || {};
+    BABYLON.GLTF2.Exporter.Extensions = BABYLON.GLTF2.Exporter.Extensions || {};
+
+    const keys = [];
+    for (var key in Exporters) {
+        BABYLON[key] = (<any>Exporters)[key];
+        keys.push(key);
+    }
+    for (var key in Datas) {
+        BABYLON[key] = (<any>Datas)[key];
+        keys.push(key);
     }
-    for (var serializer in Serializers) {
-        (<any>globalObject).BABYLON[serializer] = (<any>Serializers)[serializer];
+    for (var key in Serializers) {
+        BABYLON[key] = (<any>Serializers)[key];
+        keys.push(key);
+    }
+
+    for (var key in Extensions) {
+        BABYLON.GLTF2.Exporter.Extensions[key] = (<any>Extensions)[key];
+        keys.push(key);
+    }
+
+    for (var key in GLTF2) {
+        // Prevent Reassignment.
+        if (keys.indexOf(key) > -1) {
+            continue;
+        }
+
+        BABYLON.GLTF2.Exporter[key] = (<any>GLTF2)[key];
     }
 }
 

+ 3 - 0
serializers/legacy/legacy.ts

@@ -0,0 +1,3 @@
+import "../src";
+export * from "./legacy-glTF2Serializer";
+export * from "./legacy-objSerializer";

+ 0 - 19
serializers/src/legacy.ts

@@ -1,19 +0,0 @@
-import * as Serializers from "./index";
-
-/**
- * Legacy support, defining window.BABYLON.OBJSerializer... (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 serializer in Serializers) {
-        if (Serializers.hasOwnProperty(serializer)) {
-            (<any>globalObject).BABYLON[serializer] = (<any>Serializers)[serializer];
-        }
-    }
-}
-
-export * from "./index";

+ 1 - 1
serializers/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/serializers'),