diff --git a/assets/GLTF/lightmap_test.glb b/assets/GLTF/lightmap_test.glb new file mode 100644 index 0000000..9da8ade Binary files /dev/null and b/assets/GLTF/lightmap_test.glb differ diff --git a/assets/GLTF/lightmaptest.glb b/assets/GLTF/lightmaptest.glb new file mode 100644 index 0000000..d24e09f Binary files /dev/null and b/assets/GLTF/lightmaptest.glb differ diff --git a/resources.json b/resources.json index e409b4a..396a088 100644 --- a/resources.json +++ b/resources.json @@ -279,6 +279,20 @@ ], "dependencies": [] }, + "assets/GLTF/lightmap_test.glb": { + "type": "asset", + "tags": [ + "Model" + ], + "dependencies": [] + }, + "assets/GLTF/lightmaptest.glb": { + "type": "file", + "tags": [ + "Model" + ], + "dependencies": [] + }, "assets/graph/default-graph.json": { "type": "asset", "tags": [ diff --git a/src/examples/GLTFs.tsx b/src/examples/GLTFs.tsx index 449f0f2..25c68d8 100644 --- a/src/examples/GLTFs.tsx +++ b/src/examples/GLTFs.tsx @@ -18,12 +18,14 @@ import { VisibleComponent } from '@etherealengine/spatial/src/renderer/component import { EntityTreeComponent } from '@etherealengine/spatial/src/transform/components/EntityTree' import { AnimationClip, Color, Euler, Quaternion, Vector3 } from 'three' import { RouteData } from '../sceneRoute' +import config from '@etherealengine/common/src/config' export const metadata = { title: 'GLTF', description: '' } +const fileServer = config.client.fileServer const CDN_URL = 'https://raw.githubusercontent.com/KhronosGroup/glTF-Sample-Models/main/2.0' export const gltfRoutes = [ @@ -60,7 +62,9 @@ export const gltfRoutes = [ { name: 'Morph Targets', description: 'Morph Primitives Test', - entry: () => + entry: () => ( + + ) }, { name: 'KHR_materials_unlit', @@ -137,6 +141,16 @@ export const gltfRoutes = [ description: 'GPU Instancing Extension', // entry: () => entry: () => + }, + { + name: 'KHR_materials_pbrSpecularGlossiness', + description: 'DEPRECATED Khronos PBR Specular Glossiness Extension', + entry: () => + }, + { + name: 'MOZ_lightmap', + description: 'Mozilla Lightmap Extension', + entry: () => } ] as RouteData[]