feat/fix: misc shader changes (fix normals, lighting, uv)

src/app/niko/scene-components/grass.tsx

@@ -7,24 +7,24 @@ import grassVert from './shaders/grass.vert';
 import grassFrag from './shaders/grass.frag';
 
 interface GrassProps {
-    x: number;
-    y: number;
-    size: number;
-    count: number;
-    grassSize: number;
-    scale: number;
-    hillScale: number;
-    hillHeight: number;
-    detailScale: number;
-    detailHeight: number;
-    noise2D: (x: number, y: number) => number;
-    grassLOD: number;
-    dryColor: string;
-    lushColor: string;
-    grassBlades?: number;
-    grassSegments?: number;
-    grassLODStart?: number;
-    grassLODExponent?: number;
+	x: number;
+	y: number;
+	size: number;
+	count: number;
+	grassSize: number;
+	scale: number;
+	hillScale: number;
+	hillHeight: number;
+	detailScale: number;
+	detailHeight: number;
+	noise2D: (x: number, y: number) => number;
+	grassLOD: number;
+	dryColor: string;
+	lushColor: string;
+	grassBlades?: number;
+	grassSegments?: number;
+	grassLODStart?: number;
+	grassLODExponent?: number;
 }
 
 export default function Grass({
@@ -222,62 +222,61 @@ export default function Grass({
 			shader.uniforms.uTime = { value: 0 };
 
 			shader.vertexShader = `
-			uniform float uTime;
-			varying vec2 vGrassUv;
-			
-			float hash(vec2 p) {
-				return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453);
-			}
-			
-			float noise(vec2 p) {
-				vec2 i = floor(p);
-				vec2 f = fract(p);
-				f = f * f * (3.0 - 2.0 * f);
-				
-				float a = hash(i);
-				float b = hash(i + vec2(1.0, 0.0));
-				float c = hash(i + vec2(0.0, 1.0));
-				float d = hash(i + vec2(1.0, 1.0));
-				
-				return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
-			}
-			
-			float fbm(vec2 p) {
-				float value = 0.0;
-				float amplitude = 0.5;
-				float frequency = 1.0;
-				
-				for(int i = 0; i < 4; i++) {
-					value += amplitude * noise(p * frequency);
-					frequency *= 2.0;
-					amplitude *= 0.5;
-				}
-				
-				return value;
-			}
-			
-			${shader.vertexShader}
-		`;
+            uniform float uTime;
+            varying vec2 vGrassUv;
+            varying vec3 vWorldPos;
+            
+            float hash(vec2 p) {
+                return fract(sin(dot(p, vec2(127.1, 311.7))) * 43758.5453);
+            }
+            
+            float noise(vec2 p) {
+                vec2 i = floor(p);
+                vec2 f = fract(p);
+                f = f * f * (3.0 - 2.0 * f);
+                float a = hash(i);
+                float b = hash(i + vec2(1.0, 0.0));
+                float c = hash(i + vec2(0.0, 1.0));
+                float d = hash(i + vec2(1.0, 1.0));
+                return mix(mix(a, b, f.x), mix(c, d, f.x), f.y);
+            }
+            
+            float fbm(vec2 p) {
+                float value = 0.0;
+                float amplitude = 0.5;
+                float frequency = 1.0;
+                for(int i = 0; i < 4; i++) {
+                    value += amplitude * noise(p * frequency);
+                    frequency *= 2.0;
+                    amplitude *= 0.5;
+                }
+                return value;
+            }
+            
+            ${shader.vertexShader}
+        `;
+
 			shader.vertexShader = shader.vertexShader.replace(
 				'#include <begin_vertex>',
 				`
-			#include <begin_vertex>
-			vGrassUv = uv;
-			${grassVert}
-			`
+            #include <begin_vertex>
+            ${grassVert}
+            `
 			);
 
 			shader.fragmentShader = `
-			uniform float uTime;
-			varying vec2 vGrassUv;
-			${shader.fragmentShader}
-		`;
+            uniform float uTime;
+            varying vec2 vGrassUv;
+            varying vec3 vWorldPos;
+            ${shader.fragmentShader}
+        `;
+
 			shader.fragmentShader = shader.fragmentShader.replace(
 				'#include <color_fragment>',
 				`
-			#include <color_fragment>
-			${grassFrag}
-			`
+            #include <color_fragment>
+            ${grassFrag}
+            `
 			);
 
 			if (materialRef.current) {