Skip to content
This repository has been archived by the owner on Aug 18, 2024. It is now read-only.

Commit

Permalink
hookstate errors fixes, Examples.gltf as base example scene
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelEstes committed Jun 11, 2024
1 parent efc3957 commit aca0eda
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
19 changes: 5 additions & 14 deletions Examples.gltf
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
3,
4,
5,
6,
7
6
]
}
],
Expand Down Expand Up @@ -42,7 +41,7 @@
"bakeType": "Baked",
"resolution": 2048,
"refreshMode": "OnAwake",
"envMapOrigin": "https://localhost:8642/projects/default-project/default.envmap.ktx2",
"envMapOrigin": "__$project$__/default-project/default.envmap.ktx2",
"boxProjection": true
},
"EE_fog": {
Expand Down Expand Up @@ -211,8 +210,8 @@
"shadowMapType": 2
},
"EE_scene_settings": {
"thumbnailURL": "https://localhost:8642/projects/default-project/default.thumbnail.jpg",
"loadingScreenURL": "https://localhost:8642/projects/default-project/default.loadingscreen.ktx2",
"thumbnailURL": "__$project$__/default-project/default.thumbnail.jpg",
"loadingScreenURL": "__$project$__/default-project/default.loadingscreen.ktx2",
"primaryColor": "#38620D",
"backgroundColor": "rgb(214, 214, 211)",
"alternativeColor": "#376312",
Expand Down Expand Up @@ -254,7 +253,7 @@
"EE_skybox": {
"backgroundColor": 2894892,
"equirectangularPath": "",
"cubemapPath": "https://localhost:8642/projects/default-project/assets/skyboxsun25deg/",
"cubemapPath": "__$project$__/default-project/assets/skyboxsun25deg/",
"backgroundType": 0,
"skyboxProps": {
"turbidity": 10,
Expand Down Expand Up @@ -381,14 +380,6 @@
},
"EE_visible": true
}
},
{
"name": "examples",
"extensions": {
"EE_uuid": "c1a3850e-fd5f-436e-802c-047806918260",
"EE_visible": true,
"eepro.eetest.ExamplesComponent": {}
}
}
],
"extensionsUsed": [
Expand Down
2 changes: 1 addition & 1 deletion engine/benchmarks/AvatarBenchmark.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export const AvatarBenchmark = (props: { rootEntity: Entity; onComplete: () => v
}, [avatars])

useEffect(() => {
if (completedCount.value == avatarsToCreate) sleep(benchmarkWaitTime).then(onComplete)
if (onComplete && completedCount.value == avatarsToCreate) sleep(benchmarkWaitTime).then(onComplete)
}, [completedCount.value == avatarsToCreate])

return (
Expand Down
2 changes: 1 addition & 1 deletion examples/avatarBenchmark.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const metadata = {

export default function (props: { sceneEntity: Entity }) {
setVisibleComponent(props.sceneEntity, true)
return <AvatarBenchmark rootEntity={props.sceneEntity} onComplete={() => {}} />
return <AvatarBenchmark rootEntity={props.sceneEntity} onComplete={undefined as any} />
}

// export default function AvatarBenchmarking() {
Expand Down
4 changes: 2 additions & 2 deletions examplesRoute.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ const ExampleRoutes = () => {
const [page, setPage] = useState(null as null | ((...args: any[]) => any))

const ref = useRef(null as null | HTMLDivElement)
const projectName = 'default-project'
const sceneName = 'public/scenes/default.gltf'
const projectName = 'ee-development-test-suite'
const sceneName = 'Examples.gltf'
useLoadScene({ projectName: projectName, sceneName: sceneName })
// useNetwork({ online: false })
// useLoadEngineWithScene()
Expand Down
2 changes: 1 addition & 1 deletion resources.json

Large diffs are not rendered by default.

0 comments on commit aca0eda

Please sign in to comment.