Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IR-5334 #32

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

IR-5334 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d13551
Proper Resource Caching And Refetching
HexaField Mar 6, 2025
2145778
cleanup
HexaField Mar 6, 2025
e85a24f
update resource json
HexaField Mar 7, 2025
dd2b828
remove spaces in file names
HexaField Mar 7, 2025
4c01e14
update resources json
HexaField Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 public/avatars/Test Avaturn.glb → public/avatars/Test_Avaturn.glb
View file
Open in desktop
File renamed without changes.
0 public/avatars/Test RPM.glb → public/avatars/Test_RPM.glb
View file
Open in desktop
File renamed without changes.
42 changes: 21 additions & 21 deletions resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"dependencies": [],
"name": "Racer-transformed.gltf",
"thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_Racer-transformed.gltf-thumbnail.png",
"thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_Racer-transformed.gltf-thumbnail.png",
"thumbnailMode": "automatic"
},
"assets/animations/Racer/740e60973cb1cb9852ebe8821bcaf77f2fda66b68f5ed2c143ef504087968238.bin": {
Expand Down Expand Up @@ -72,7 +72,7 @@
],
"dependencies": [],
"name": "rings.glb",
"thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_rings.glb-thumbnail.png",
"thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_rings.glb-thumbnail.png",
"thumbnailMode": "automatic"
},
"assets/animations/tornado-mobile-xr.glb": {
Expand All @@ -82,7 +82,7 @@
],
"dependencies": [],
"name": "tornado-mobile-xr.glb",
"thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_tornado-mobile-xr.glb-thumbnail.png",
"thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_tornado-mobile-xr.glb-thumbnail.png",
"thumbnailMode": "automatic"
},
"assets/animations/transforms.glb": {
Expand All @@ -92,7 +92,7 @@
],
"dependencies": [],
"name": "transforms.glb",
"thumbnailKey": "https://172.27.136.37:8642/projects/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_transforms.glb-thumbnail.png",
"thumbnailKey": "__$project$__/ir-engine/ir-development-test-suite/public/thumbnails/assets_animations_transforms.glb-thumbnail.png",
"thumbnailMode": "automatic"
},
"assets/envmaps/hall.glb": {
Expand Down Expand Up @@ -640,7 +640,7 @@
"name": "HDVideo.mp4"
},
"public/avatars/Adam.gltf": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand Down Expand Up @@ -722,7 +722,7 @@
"name": "female_01.png"
},
"public/avatars/female_01.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -740,7 +740,7 @@
"name": "female_02.png"
},
"public/avatars/female_02.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -758,7 +758,7 @@
"name": "female_03.png"
},
"public/avatars/female_03.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -776,7 +776,7 @@
"name": "female_04.png"
},
"public/avatars/female_04.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -794,7 +794,7 @@
"name": "female_05.png"
},
"public/avatars/female_05.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -812,7 +812,7 @@
"name": "female_06.png"
},
"public/avatars/female_06.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -830,7 +830,7 @@
"name": "male_01.png"
},
"public/avatars/male_01.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -848,7 +848,7 @@
"name": "male_02.png"
},
"public/avatars/male_02.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -866,7 +866,7 @@
"name": "male_03.png"
},
"public/avatars/male_03.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -884,7 +884,7 @@
"name": "male_04.png"
},
"public/avatars/male_04.vrm": {
"type": "asset",
"type": "avatar",
"tags": [
"Model"
],
Expand All @@ -893,21 +893,21 @@
],
"name": "male_04.vrm"
},
"public/avatars/Test Avaturn.glb": {
"type": "asset",
"public/avatars/Test_Avaturn.glb": {
"type": "avatar",
"tags": [
"Model"
],
"dependencies": [],
"name": "Test Avaturn.glb"
"name": "Test_Avaturn.glb"
},
"public/avatars/Test RPM.glb": {
"type": "asset",
"public/avatars/Test_RPM.glb": {
"type": "avatar",
"tags": [
"Model"
],
"dependencies": [],
"name": "Test RPM.glb"
"name": "Test_RPM.glb"
},
"public/scenes/animations-test.envmap.ktx2": {
"type": "asset",
Expand Down
29 changes: 0 additions & 29 deletions src/examples/WebXR.tsx
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions src/examples/multipleScenes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ import {
} from '@ir-engine/spatial/src/renderer/materials/MaterialComponent'
import { computeTransformMatrix } from '@ir-engine/spatial/src/transform/systems/TransformSystem'
import React, { useEffect } from 'react'
import { Cache, Color, Euler, MathUtils, Matrix4, MeshLambertMaterial, Quaternion, Vector3 } from 'three'
import { Color, Euler, MathUtils, Matrix4, MeshLambertMaterial, Quaternion, Vector3 } from 'three'
import { Transform } from './utils/transform'

export const TestSuiteBallTagComponent = defineComponent({ name: 'TestSuiteBallTagComponent' })
Expand Down Expand Up @@ -162,10 +162,8 @@ const SceneReactor = (props: { coord: Vector3 }) => {
const sceneID = `scene-${coord.x}-${coord.z}`
const gltf = createSceneGLTF(sceneID)

const sceneURL = `/${sceneID}.gltf`

Cache.enabled = true
Cache.add(sceneURL, gltf)
const blob = new Blob([JSON.stringify(gltf)], { type: 'application/json' })
const sceneURL = URL.createObjectURL(blob)

const gltfEntity = AssetState.load(sceneURL, sceneURL as EntityUUID, Engine.instance.originEntity)
getMutableComponent(Engine.instance.viewerEntity, RendererComponent).scenes.merge([gltfEntity])
Expand Down