Skip to content

Commit 39ad650

Browse files
alvarosabuTinoooo
alvarosabu
and
Tinoooo
authored
feat: adapt code and playgrounds to latest changes on ecosystem (#207)
* feat: adapt code and playgrounds to latest changes on ecosystem - Updated @Tresjs/cientos and @Tresjs/core to version 5.0.0-next.2 and 5.0.0-next.3 respectively in package.json and pnpm-lock.yaml. - Refactored GLTF model loading in BlenderCube.vue and Ducky.vue to use state instead of scene for better reactivity. - Removed unnecessary Suspense components in DepthOfFieldDemo.vue and DotScreenDemo.vue for improved performance. - Updated ESLint auto-imports and components.d.ts for better type support. - Cleaned up unused package.json file in playground/public/nuxt-stones. * refactor: remove unused watchEffect import in BlenderCube.vue - Cleaned up the imports in BlenderCube.vue by removing the unused watchEffect import, improving code clarity and maintainability. * chore: update @Tresjs/core to version 5.0.0-next.5 - Upgraded @Tresjs/core in package.json and playground/package.json to version 5.0.0-next.5 for improved functionality and compatibility. - Updated pnpm-lock.yaml to reflect the new version of @Tresjs/core and its dependencies. - Refactored render logic in EffectComposerPmndrs.vue and EffectComposer.vue to utilize notifySuccess callback for better rendering control. * feat: adapt to core v5 changes 2 in MR 1043 (#208) * refactor: streamline rendering logic in effect processors * chore: update dependencies and improve rendering logic in on-demand playground example * chore: remove unused onControlChange function in on-demand.vue - Eliminated the onControlChange function as it was no longer necessary, simplifying the component's logic. - Updated OrbitControls to remove the change event listener, streamlining the rendering process. * chore: update @Tresjs/core to version 5.0.0-next.6 - Upgraded @Tresjs/core in package.json and playground/package.json to version 5.0.0-next.6 for enhanced features and stability. - Updated pnpm-lock.yaml to reflect the new version and its dependencies, ensuring compatibility across the project. --------- Co-authored-by: Tino Koch <17991193+Tinoooo@users.noreply.github.com>
1 parent 48d5a36 commit 39ad650

27 files changed

+140
-140
lines changed

‎docs/.vitepress/theme/components/BlenderCube.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
<script setup lang="ts">
22
import { useGLTF } from '@tresjs/cientos'
3+
import type { TresObject } from '@tresjs/core'
4+
import { computed, shallowRef } from 'vue'
35
4-
const { nodes }
5-
= await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/blender-cube.glb', { draco: true })
6-
const model = nodes.Cube
6+
const { nodes } = useGLTF(
7+
'https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/blender-cube.glb',
8+
{ draco: true },
9+
)
710
8-
model.traverse((child) => {
9-
if (child.isMesh) {
10-
child.castShadow = true
11-
}
12-
})
11+
const modelRef = shallowRef<TresObject | null>(null)
12+
13+
const model = computed(() => nodes.value?.BlenderCube)
1314
</script>
1415

1516
<template>
16-
<primitive :object="model" />
17+
<primitive v-if="model" ref="modelRef" :object="model" />
1718
</template>

‎docs/.vitepress/theme/components/Ducky.vue

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
<script setup lang="ts">
22
import { useGLTF } from '@tresjs/cientos'
3+
import { Mesh } from 'three'
4+
import { watch } from 'vue'
35
4-
const { scene: model }
5-
= await useGLTF('https://vazxmixjsiawhamofees.supabase.co/storage/v1/object/public/models/duck/model.gltf', { draco: true })
6+
const { state }
7+
= useGLTF('https://vazxmixjsiawhamofees.supabase.co/storage/v1/object/public/models/duck/model.gltf', { draco: true })
8+
9+
watch(state, (model) => {
10+
model.scene.traverse((child) => {
11+
if (child instanceof Mesh) {
12+
child.castShadow = true
13+
}
14+
})
15+
})
616
</script>
717

818
<template>
9-
<primitive :object="model" />
19+
<primitive v-if="state" :object="state.scene" />
1020
</template>

‎docs/.vitepress/theme/components/pmdrs/DepthOfFieldDemo.vue

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,13 @@ const effectParams = ref({
4040
:position="[-5, 0.5, -10]"
4141
:scale="0.5"
4242
>
43-
<Suspense>
44-
<Ducky />
45-
</Suspense>
43+
<Ducky />
4644
</TresGroup>
4745
<TresGroup
4846
:position="[0, 0.5, 0]"
4947
:scale="0.5"
5048
>
51-
<Suspense>
52-
<BlenderCube />
53-
</Suspense>
49+
<BlenderCube />
5450
</TresGroup>
5551
<TresAmbientLight />
5652
<TresDirectionalLight

‎docs/.vitepress/theme/components/pmdrs/DotScreenDemo.vue

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const { angle, scale, blendFunction } = useControls({
3030
},
3131
})
3232
33-
const { scene } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/suzanne/suzanne.glb', { draco: true })
33+
const { state } = useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/suzanne/suzanne.glb', { draco: true })
3434
</script>
3535

3636
<template>
@@ -44,7 +44,15 @@ const { scene } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets
4444
/>
4545
<OrbitControls />
4646

47-
<primitive :scale="2" :rotation-x="Math.PI / -5" :rotation-y="Math.PI" :position-y=".25" :position-z="0.5" :object="scene" />
47+
<primitive
48+
v-if="state"
49+
:scale="2"
50+
:rotation-x="Math.PI / -5"
51+
:rotation-y="Math.PI"
52+
:position-y=".25"
53+
:position-z="0.5"
54+
:object="state.scene"
55+
/>
4856

4957
<ContactShadows
5058
:opacity="1"

‎docs/.vitepress/theme/components/pmdrs/KuwaharaDemo.vue

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const glComposer = {
1818
multisampling: 4,
1919
}
2020
21-
const { scene: scenePlantJar } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/kuwahara-effect/plant-jar/plant-jar.glb', { draco: true })
22-
const { scene: sceneWatermelon } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/kuwahara-effect/watermelon/watermelon_fruit.glb', { draco: true })
21+
const { state: scenePlantJar } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/kuwahara-effect/plant-jar/plant-jar.glb', { draco: true })
22+
const { state: sceneWatermelon } = await useGLTF('https://raw.githubusercontent.com/Tresjs/assets/main/models/gltf/kuwahara-effect/watermelon/watermelon_fruit.glb', { draco: true })
2323
2424
const effectProps = reactive({
2525
blendFunction: BlendFunction.NORMAL,
@@ -51,8 +51,19 @@ watch(enabled, () => {
5151

5252
<TresDirectionalLight />
5353

54-
<primitive :position-x="-3" :position-y="-3.5" :scale="5" :object="scenePlantJar" />
55-
<primitive :position-x="4" :scale="20" :object="sceneWatermelon" />
54+
<primitive
55+
v-if="scenePlantJar"
56+
:position-x="-3"
57+
:position-y="-3.5"
58+
:scale="5"
59+
:object="scenePlantJar.scene"
60+
/>
61+
<primitive
62+
v-if="sceneWatermelon"
63+
:position-x="4"
64+
:scale="20"
65+
:object="sceneWatermelon.scene"
66+
/>
5667

5768
<ContactShadows
5869
:opacity=".25"

‎docs/.vitepress/theme/components/pmdrs/VignetteDemo.vue

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ const { effectComposer } = useRouteDisposal()
2626
<TresCanvas v-bind="gl">
2727
<TresPerspectiveCamera :position="[3, 3, 3]" />
2828
<OrbitControls />
29-
<Suspense>
30-
<BlenderCube />
31-
</Suspense>
29+
<BlenderCube />
3230
<EffectComposerPmndrs ref="effectComposer">
3331
<DepthOfFieldPmndrs :focus-distance="0" :focal-length="0.02" :bokeh-scale="2" />
3432
<VignettePmndrs :darkness="0.9" :offset="0.3" />

‎docs/components.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// @ts-nocheck
33
// Generated by unplugin-vue-components
44
// Read more: https://github.com/vuejs/core/pull/3399
5+
// biome-ignore lint: disable
56
export {}
67

78
/* prettier-ignore */

‎docs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"preview": "vitepress preview"
1010
},
1111
"dependencies": {
12-
"@tresjs/cientos": "^4.1.0",
13-
"@tresjs/core": "^4.3.2",
12+
"@tresjs/cientos": "5.0.0-next.2",
13+
"@tresjs/core": "5.0.0-next.3",
1414
"@tresjs/post-processing": "workspace:^",
1515
"gsap": "^3.12.7"
1616
},

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"docs:preview": "vitepress preview"
5353
},
5454
"peerDependencies": {
55-
"@tresjs/core": ">=4.0",
55+
"@tresjs/core": ">=5.0",
5656
"three": ">=0.169",
5757
"vue": ">=3.4"
5858
},

‎playground/public/nuxt-stones/package.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)