Jelajahi Sumber

Tentative loader in inspector

sebavan 5 tahun lalu
induk
melakukan
986a37d7a8

+ 1 - 1
Tools/Gulp/helpers/gulp-validateImports.js

@@ -7,7 +7,7 @@ var colorConsole = require("../../NodeHelpers/colorConsole");
 
 var config = require("../../Config/config");
 
-const indexExlclusion = ["States", "EmitterTypes", "glTF"];
+const indexExlclusion = ["States", "EmitterTypes"];
 const forbiddenImports = ["meshBuilder"];
 
 const mapping = {};

+ 3 - 0
Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -63,6 +63,9 @@ var dep = function(settings) {
     for (let pathName in tsconfig.compilerOptions.paths) {
         let paths = tsconfig.compilerOptions.paths[pathName];
         for (let dep of paths) {
+            if (dep.indexOf("@babylonjs") === -1) {
+                continue;
+            }
             const fullPath = path.resolve(settings.computed.mainDirectory, 
                 tsconfig.compilerOptions.baseUrl, 
                 dep);

+ 8 - 0
Tools/WebpackPlugins/babylonExternals.js

@@ -11,6 +11,14 @@ module.exports = function nodeExternals(options) {
                 amd: "babylonjs-serializers"
             });
         }
+        else if (/^babylonjs-loaders\/glTF\/2\.0\/Extensions.*$/i.test(request)) {
+            callback(null, {
+                root: ["BABYLON", "GLTF2", "Loader", "Extensions"],
+                commonjs: "babylonjs-loaders",
+                commonjs2: "babylonjs-loaders",
+                amd: "babylonjs-loaders"
+            });
+        }
         else if (/^babylonjs-loaders.*$/i.test(request)) {
             callback(null, {
                 root: "BABYLON",

+ 1 - 5
inspector/src/components/actionTabs/tabs/propertyGrids/variantsPropertyGridComponent.tsx

@@ -9,6 +9,7 @@ import { GlobalState } from "../../../globalState";
 // import { OptionsLineComponent } from '../../lines/optionsLineComponent';
 import { ButtonLineComponent } from '../../lines/buttonLineComponent';
 import { CheckBoxLineComponent } from '../../lines/checkBoxLineComponent';
+import { KHR_materials_variants } from 'babylonjs-loaders/glTF/2.0/Extensions/KHR_materials_variants';
 
 interface IVariantsPropertyGridComponentProps {
     globalState: GlobalState;
@@ -26,11 +27,6 @@ export class VariantsPropertyGridComponent extends React.Component<IVariantsProp
     }
 
     render() {
-        const KHR_materials_variants = (BABYLON as any)?.GLTF2?.Loader?.Extensions?.KHR_materials_variants;
-        if (!KHR_materials_variants) {
-            return null;
-        }
-
         let variants: string[] = KHR_materials_variants.GetAvailableVariants(this.props.host);
 
         if (!variants || variants.length === 0) {

+ 3 - 0
inspector/tsconfig.json

@@ -11,6 +11,9 @@
             "babylonjs-gltf2interface": [
                 "../../dist/preview release/glTF2Interface/babylon.glTF2Interface.d.ts"
             ],
+            "@babylonjs/loaders/glTF/2.0/Extensions*": [
+                "../../../distES6/loaders/glTF/2.0/Extensions"
+            ],
             "babylonjs-loaders/*": [
                 "../../dist/preview release/loaders/babylonjs.loaders.module.d.ts"
             ],