Skip to content

Commit 8720828

Browse files
authored
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
1 parent c306d1f commit 8720828

File tree

8 files changed

+683
-671
lines changed

8 files changed

+683
-671
lines changed

package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,17 @@
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
},
5959
"dependencies": {
60-
"@tresjs/cientos": "5.0.0-next.2",
6160
"@vueuse/core": "^12.5.0",
6261
"postprocessing": "^6.37.2"
6362
},
6463
"devDependencies": {
6564
"@release-it/conventional-changelog": "^10.0.0",
66-
"@tresjs/core": "5.0.0-next.5",
65+
"@tresjs/core": "https://pkg.pr.new/@tresjs/core@1044",
6766
"@tresjs/eslint-config": "^1.4.0",
6867
"@tresjs/leches": "https://pkg.pr.new/@tresjs/leches@9ad0cd3",
6968
"@types/three": "^0.172.0",

playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@tresjs/cientos": "5.0.0-next.2",
13-
"@tresjs/core": "5.0.0-next.5",
13+
"@tresjs/core": "https://pkg.pr.new/@tresjs/core@a5468fc",
1414
"@tresjs/post-processing": "workspace:*",
1515
"vue-router": "^4.5.0"
1616
},

playground/src/pages/postprocessing/on-demand.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function onRender() {
1515
const canvas = ref<InstanceType<typeof TresCanvas>>()
1616
1717
function onControlChange() {
18-
canvas.value?.context?.invalidate()
18+
canvas.value?.context?.renderer.invalidate()
1919
}
2020
</script>
2121

pnpm-lock.yaml

Lines changed: 673 additions & 656 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/pmndrs/EffectComposerPmndrs.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
22
import type { EffectComposer } from 'postprocessing'
33
import type { InjectionKey, ShallowRef } from 'vue'
4-
import { useLoop, useTresContext } from '@tresjs/core'
4+
import { useTresContext } from '@tresjs/core'
55
import { DepthDownsamplingPass, EffectComposer as EffectComposerImpl, NormalPass, RenderPass } from 'postprocessing'
66
77
import { HalfFloatType } from 'three'
@@ -105,9 +105,7 @@ watch(() => [sizes.width.value, sizes.height.value], ([width, height]) => {
105105
immediate: true,
106106
})
107107
108-
const { render } = useLoop()
109-
110-
render((notifySuccess) => {
108+
renderer.replaceRenderFunction((notifySuccess) => {
111109
if (props.enabled && renderer.instance && effectComposer.value && sizes.width.value && sizes.height.value) {
112110
const currentAutoClear = renderer.instance.autoClear
113111
renderer.instance.autoClear = props.autoClear

src/core/pmndrs/GlitchPmndrs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ defineExpose({ pass, effect })
6363
const { invalidate } = useTres()
6464
6565
const { onBeforeRender } = useLoop()
66-
onBeforeRender((/* { invalidate } */) => invalidate())
66+
onBeforeRender(() => invalidate())
6767
6868
watchEffect(() => {
6969
const getMode = () => {

src/core/pmndrs/NoisePmndrs.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ defineExpose({ pass, effect })
2525
const { invalidate } = useTres()
2626
2727
const { onBeforeRender } = useLoop()
28-
onBeforeRender((/* { invalidate } */) => invalidate())
28+
onBeforeRender(() => invalidate())
2929
3030
makePropWatchers(
3131
[

src/core/three/EffectComposer.vue

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script lang="ts">
2-
import { useLoop, useTresContext } from '@tresjs/core'
2+
import { useTresContext } from '@tresjs/core'
33
import { useDevicePixelRatio } from '@vueuse/core'
44
import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer.js'
55
import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass.js'
@@ -53,9 +53,7 @@ if (!props.withoutRenderPass) {
5353
})
5454
}
5555
56-
const { render } = useLoop()
57-
58-
render((notifySuccess) => {
56+
renderer.replaceRenderFunction((notifySuccess) => {
5957
if (effectComposer.value && props.enabled) {
6058
effectComposer.value.render()
6159
notifySuccess()

0 commit comments

Comments
 (0)