瀏覽代碼

remove standard material

Trevor Baron 6 年之前
父節點
當前提交
ab178a7fc8

+ 2 - 2
Viewer/dist/renderOnlyViewer.html

@@ -242,10 +242,10 @@
                 // 1st model has been loaded, wait a second and swap to another model
                 setTimeout(() => {
                     viewer.loadModel({
-                        title: "Rabbit",
+                        title: "Helmet",
                         subtitle: "BabylonJS",
                         thumbnail: "https://www.babylonjs.com/img/favicon/apple-icon-144x144.png",
-                        url: "https://playground.babylonjs.com/scenes/Rabbit.babylon"
+                        url: "https://www.babylonjs.com/Assets/DamagedHelmet/glTF/DamagedHelmet.gltf"
                     });
                 }, 1000);
             });

+ 1 - 1
Viewer/src/loader/modelLoader.ts

@@ -1,4 +1,4 @@
-import {GLTFFileLoader, GLTFLoaderAnimationStartMode} from "@babylonjs/loaders/glTF"
+import {GLTFFileLoader, GLTFLoaderAnimationStartMode} from "@babylonjs/loaders/glTF/glTFFileLoader"
 import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from '@babylonjs/core/Loading/sceneLoader';
 import { Tools } from '@babylonjs/core/Misc/tools';
 import { SceneLoader } from '@babylonjs/core/Loading/sceneLoader';

+ 1 - 1
Viewer/src/loader/plugins/loaderPlugin.ts

@@ -1,5 +1,5 @@
 import { ViewerModel } from "../../model/viewerModel";
-import { IGLTFLoaderExtension, IGLTFLoaderData } from "@babylonjs/loaders/glTF";
+import { IGLTFLoaderExtension, IGLTFLoaderData } from "@babylonjs/loaders/glTF/glTFFileLoader";
 import { ISceneLoaderPlugin, ISceneLoaderPluginAsync } from "@babylonjs/core/Loading/sceneLoader";
 import { SceneLoaderProgressEvent } from "@babylonjs/core/Loading/sceneLoader";
 import { AbstractMesh } from "@babylonjs/core/Meshes/abstractMesh";

+ 7 - 5
Viewer/src/renderOnlyIndex.ts

@@ -1,15 +1,17 @@
 import { RenderOnlyViewer } from './viewer/renderOnlyViewer';
+
 // Required side effects
 import '@babylonjs/loaders/glTF/2.0';
 import "@babylonjs/core/Lights/Shadows/shadowGeneratorSceneComponent"
 import "@babylonjs/core/Debug/debugLayer";
 import "@babylonjs/core/Meshes/meshBuilder";
-// TODO bad error message without this
-import '@babylonjs/core/Loading/Plugins'
-import "@babylonjs/core/Materials/Textures/Loaders"
+import "@babylonjs/core/Materials/Textures/Loaders/ddsTextureLoader"
+import "@babylonjs/core/Materials/Textures/Loaders/envTextureLoader"
+import "@babylonjs/core/Materials/Textures/Loaders/ktxTextureLoader"
 import "@babylonjs/core/PostProcesses/RenderPipeline/postProcessRenderPipelineManagerSceneComponent";
-// This was needed at some point but no longer?
-// import "@babylonjs/core/Gamepads/gamepadSceneComponent"
 
+// Override default material factory to avoid the dependency on standard material
+import { Scene } from '@babylonjs/core/scene';
+Scene.DefaultMaterialFactory = (scene:Scene)=>{return null as any};
 
 export { RenderOnlyViewer };