From dceb37a8dd11cada169af4ee8fe8c0e2aa92061b Mon Sep 17 00:00:00 2001
From: Dejvino <scoutmaster@dejvino.cz>
Date: Thu, 20 Nov 2025 12:25:47 +0100
Subject: [PATCH] Fix: Improved mirror shader fade effect animation

---
 magic-mirror/src/core/animate.js           | 12 +++++-------
 magic-mirror/src/scene/screen-shaders.js   | 18 ------------------
 magic-mirror/src/shaders/screen-shaders.js |  4 ++--
 3 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 magic-mirror/src/scene/screen-shaders.js

diff --git a/magic-mirror/src/core/animate.js b/magic-mirror/src/core/animate.js
index 7feac1c..00c8423 100644
--- a/magic-mirror/src/core/animate.js
+++ b/magic-mirror/src/core/animate.js
@@ -8,10 +8,10 @@ import { updateFire } from '../scene/fireplace.js';
 
 function updateCamera() {
     const globalTime = Date.now() * 0.00003;
-    const lookAtTime = Date.now() * 0.0002;
+    const lookAtTime = Date.now() * 0.00005;
 
     const camAmplitude = 0.2;
-    const lookAmplitude = 0.1;
+    const lookAmplitude = 0.4;
 
     // Base Camera Position in front of the TV
     const baseX = -0.5;
@@ -19,7 +19,7 @@ function updateCamera() {
     const baseZ = 2.2;
 
     // Base LookAt target (Center of the screen)
-    const baseTargetX = -0.7;
+    const baseTargetX = -0.2;
     const baseTargetY = 1.7;
     const baseTargetZ = -0.3;
 
@@ -33,7 +33,7 @@ function updateCamera() {
     state.camera.position.z = baseZ + camOffsetZ;
 
     // LookAt Target Offsets (Subtle Gaze Shift)
-    const lookOffsetX = Math.sin(lookAtTime * 1.5) * lookAmplitude * 3;
+    const lookOffsetX = Math.sin(lookAtTime * 1.5) * lookAmplitude * 4;
     const lookOffsetY = Math.cos(lookAtTime * 1.2) * lookAmplitude;
 
     // Apply lookAt to the subtly shifted target
@@ -70,9 +70,7 @@ function updateScreenLight() {
 
 function updateShaderTime() {
     if (state.tvScreen && state.tvScreen.material.uniforms && state.tvScreen.material.uniforms.u_time) {
-        if (state.tvScreenPowered) {
-            state.tvScreen.material.uniforms.u_time.value = state.clock.getElapsedTime();
-        }
+        state.tvScreen.material.uniforms.u_time.value = state.clock.getElapsedTime();
     }
 }
 
diff --git a/magic-mirror/src/scene/screen-shaders.js b/magic-mirror/src/scene/screen-shaders.js
deleted file mode 100644
index 8843957..0000000
--- a/magic-mirror/src/scene/screen-shaders.js
+++ /dev/null
@@ -1,18 +0,0 @@
-export const screenVertexShader = `
-varying vec2 vUv;
-
-void main() {
-    vUv = uv;
-    gl_Position = projectionMatrix * modelViewMatrix * vec4(position, 1.0);
-}
-`;
-
-export const screenFragmentShader = `
-varying vec2 vUv;
-uniform sampler2D videoTexture;
-
-void main() {
-    // Sample the video texture
-    gl_FragColor = texture2D(videoTexture, vUv);
-}
-`;
\ No newline at end of file
diff --git a/magic-mirror/src/shaders/screen-shaders.js b/magic-mirror/src/shaders/screen-shaders.js
index 8186b07..462bc47 100644
--- a/magic-mirror/src/shaders/screen-shaders.js
+++ b/magic-mirror/src/shaders/screen-shaders.js
@@ -57,7 +57,7 @@ void main() {
         finalColor = baseColor;
     } else if (u_effect_type < 1.9) { // "Summon Vision" (Warm-up) effect
         // This is now a multi-stage effect controlled by u_effect_strength (0.0 -> 1.0)
-        float noiseVal = noise(vUv * 10.0);
+        float noiseVal = noise(vUv * 50.0 + vec2(0.0, u_time * -125.0));
         vec3 mistColor = vec3(0.8, 0.7, 1.0) * noiseVal;
         vec4 videoColor = texture2D(videoTexture, vUv);
 
@@ -75,7 +75,7 @@ void main() {
     } else { // "Vision Fades" (Power-down) effect
         // Multi-stage effect: Last frame -> fade to mist -> fade to transparent
 
-        float noiseVal = noise(vUv * 10.0);
+        float noiseVal = noise(vUv * 50.0 + vec2(0.0, u_time * 123.0));
         vec3 mistColor = vec3(0.8, 0.7, 1.0) * noiseVal;
         vec4 videoColor = texture2D(videoTexture, vUv);