Merge branch 'main' into feat/screen-quad

Tresjs · Nov 24, 2024 · 74cf7ab · 74cf7ab
2 parents f77b06c + 75897e6
commit 74cf7ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/core/materials/meshReflectionMaterial/index.vue b/src/core/materials/meshReflectionMaterial/index.vue
@@ -314,12 +314,6 @@ watch(() => [
   })
 }, { immediate: true })
 
-watch(materialRef, () => {
-  if (materialRef.value) {
-    materialRef.value.onBeforeRender = onBeforeRender
-  }
-})
-
 // NOTE: Begin #615 warning
 // The Tres core doesn't currently swap mesh materials when a
 // material component recompiles.

diff --git a/src/core/staging/ContactShadows.vue b/src/core/staging/ContactShadows.vue
@@ -310,12 +310,11 @@ function setColors(ps: typeof props, pool: ReturnType<typeof init>) {
   pool.depthMaterial.onBeforeCompile = function (shader) {
     const tint = ps.tint ? new Color(ps.tint as ColorRepresentation) : new Color('white')
     const { r, g, b } = tint
-    shader.fragmentShader = /* glsl */`
-    ${shader.fragmentShader.replace(
+    const fragmentShader = shader.fragmentShader.replace(
       'gl_FragColor = vec4( vec3( 1.0 - fragCoordZ ), opacity );',
       `gl_FragColor = vec4( ${r}, ${g}, ${b}, ( 1.0 - fragCoordZ ) * opacity);`,
-    )}
-    `
+    )
+    shader.fragmentShader = fragmentShader
   }
 }