@codexstar/pi-pompom 1.4.0 → 1.6.0

package/extensions/pompom.ts

@@ -276,74 +276,113 @@ function shadeObject(hit: ReturnType<typeof getObjHit>, px: number, py: number,
 		        const spot = Math.sin(hitNx * 10) * Math.cos(hitNy * 8);
 		        if (spot > 0.6) { r = Math.max(0, r - 40); g = Math.max(0, g - 20); b = Math.max(0, b - 10); }
 		}
-		if (hitObj.id === "body") {
-		        let bdx = px - hitObj.x, bdy = py - hitObj.y;
-		        if (isFlipping) {
-		                const s = Math.sin(-flipPhase), c = Math.cos(-flipPhase);
-		                const nx = bdx * c - bdy * s, ny = bdx * s + bdy * c;
-		                bdx = nx; bdy = ny;
-		        }
-		        // Blush
-		        const blx1 = bdx + 0.16, bly1 = bdy - 0.04;
-		        const blx2 = bdx - 0.16, bly2 = bdy - 0.04;
-		        const blush = Math.exp(-(blx1 * blx1 + bly1 * bly1) * 80) + Math.exp(-(blx2 * blx2 + bly2 * bly2) * 80);
-		        if (!isSleeping) {
-		                r = r * (1 - blush) + 255 * blush; g = g * (1 - blush) + 80 * blush; b = b * (1 - blush) + 100 * blush;
-		        }
-		        // Eyes
-		        const isTired = (energy < 20 || hunger < 30) && !isSleeping;
-		        const eyeOpen = isSleeping ? 0.05 : (isTired ? 0.4 : 1.0) - blinkFade;
-		        const ex1 = bdx - lookX * 0.08 + 0.1, ey1 = bdy - lookY * 0.05 + 0.02;
-		        const ex2 = bdx - lookX * 0.08 - 0.1, ey2 = bdy - lookY * 0.05 + 0.02;
-
-		        if (isSleeping || currentState === "singing") {
-		                if (isSleeping) {
-		                        if ((Math.abs(ey1) < 0.01 && Math.abs(ex1) < 0.05) || (Math.abs(ey2) < 0.01 && Math.abs(ex2) < 0.05)) { r = 30; g = 20; b = 30; }
-		                } else {
-		                        if ((Math.abs(ey1 + ex1 * ex1 * 15) < 0.015 && Math.abs(ex1) < 0.06 && ey1 > -ex1 * ex1 * 15) ||
-		                                (Math.abs(ey2 + ex2 * ex2 * 15) < 0.015 && Math.abs(ex2) < 0.06 && ey2 > -ex2 * ex2 * 15)) { r = 30; g = 20; b = 30; }
-		                }
-		        } else {
-		                const eDist1 = ex1 * ex1 + (ey1 * ey1) / (eyeOpen * eyeOpen + 0.001);
-		                const eDist2 = ex2 * ex2 + (ey2 * ey2) / (eyeOpen * eyeOpen + 0.001);
-		                if (eDist1 < 0.004 || eDist2 < 0.004) {
-		                        r = 15; g = 10; b = 20;
-		                        if (ey1 > 0 || ey2 > 0) { r = 50; g = 180; b = 100; }
-		                        if ((ex1 + 0.012) ** 2 + (ey1 + 0.012) ** 2 < 0.0008 || (ex2 + 0.012) ** 2 + (ey2 + 0.012) ** 2 < 0.0008) {
-		                                if (!isTired) { r = 255; g = 255; b = 255; }
-		                        } else if ((ex1 - 0.015) ** 2 + (ey1 - 0.015) ** 2 < 0.0005 || (ex2 - 0.015) ** 2 + (ey2 - 0.015) ** 2 < 0.0005) {
-		                                if (!isTired) { r = 255; g = 255; b = 255; }
-		                        }
-		                }
-		        }
-		        // Nose
-		        const nnx = bdx - lookX * 0.06, nny = bdy - lookY * 0.05 - 0.02;
-		        if (nnx * nnx * 1.5 + nny * nny < 0.0006 && !isSleeping) { r = 30; g = 20; b = 30; }
-		        // Mouth
-		        if (!isSleeping && !hasBall) {
-		                const mx = bdx - lookX * 0.06, my = bdy - lookY * 0.05 - 0.06;
-		                if ((Math.abs(my - (mx - 0.025) ** 2 * 20 + 0.01) < 0.01 && mx > 0 && mx < 0.05) ||
-		                        (Math.abs(my - (mx + 0.025) ** 2 * 20 + 0.01) < 0.01 && mx < 0 && mx > -0.05)) {
-		                        r = 50; g = 30; b = 40;
-		                }
-		                if (currentState === "excited" || currentState === "singing" || speechTimer > 0 || isTalking) {
-		                        const mouthOpen = (speechTimer > 0 || currentState === "singing" || isTalking)
-		                                ? (isTalking ? talkAudioLevel * 0.04 + 0.005 : Math.abs(Math.sin(time * 12)) * 0.025)
-		                                : 0.015;
-		                        if (mx * mx + (my + 0.01) ** 2 < mouthOpen && my < -0.01) {
-		                                r = 240; g = 80; b = 100;
-		                                if (my < -0.025) { r = 255; g = 120; b = 140; }
-		                        }
-		                }
-		        }
+		let isOnFace = false;
+	if (hitObj.id === "body") {
+		let bdx = px - hitObj.x, bdy = py - hitObj.y;
+		if (isFlipping) {
+			const s = Math.sin(-flipPhase), c = Math.cos(-flipPhase);
+			const nx = bdx * c - bdy * s, ny = bdx * s + bdy * c;
+			bdx = nx; bdy = ny;
+		}
+
+		// ── Face plate: bright cream area so features pop ──
+		const faceR = Math.sqrt(bdx * bdx + bdy * bdy);
+		if (faceR < 0.22) {
+			isOnFace = true;
+			const faceMix = Math.max(0, 1.0 - faceR / 0.22);
+			r = Math.floor(r * (1 - faceMix * 0.6) + 255 * faceMix * 0.6);
+			g = Math.floor(g * (1 - faceMix * 0.6) + 252 * faceMix * 0.6);
+			b = Math.floor(b * (1 - faceMix * 0.6) + 248 * faceMix * 0.6);
+		}
+
+		// ── Blush: big rosy cheeks ──
+		const blx1 = bdx + 0.15, bly1 = bdy - 0.05;
+		const blx2 = bdx - 0.15, bly2 = bdy - 0.05;
+		const blush = Math.exp(-(blx1 * blx1 + bly1 * bly1) * 40) + Math.exp(-(blx2 * blx2 + bly2 * bly2) * 40);
+		if (!isSleeping) {
+			r = Math.floor(r * (1 - blush) + 255 * blush);
+			g = Math.floor(g * (1 - blush) + 70 * blush);
+			b = Math.floor(b * (1 - blush) + 90 * blush);
+		}
+
+		// ── Eyes: kawaii style — white sclera → colored iris → dark pupil → highlight ──
+		const isTired = (energy < 20 || hunger < 30) && !isSleeping;
+		const eyeOpen = isSleeping ? 0.05 : (isTired ? 0.4 : 1.0) - blinkFade;
+		const ex1 = bdx - lookX * 0.08 + 0.11, ey1 = bdy - lookY * 0.05 + 0.02;
+		const ex2 = bdx - lookX * 0.08 - 0.11, ey2 = bdy - lookY * 0.05 + 0.02;
+
+		if (isSleeping || currentState === "singing") {
+			// Closed eyes — horizontal lines
+			if (isSleeping) {
+				if ((Math.abs(ey1) < 0.012 && Math.abs(ex1) < 0.06) || (Math.abs(ey2) < 0.012 && Math.abs(ex2) < 0.06)) { r = 40; g = 30; b = 50; }
+			} else {
+				// Happy squint arcs
+				if ((Math.abs(ey1 + ex1 * ex1 * 12) < 0.018 && Math.abs(ex1) < 0.07 && ey1 > -ex1 * ex1 * 12) ||
+					(Math.abs(ey2 + ex2 * ex2 * 12) < 0.018 && Math.abs(ex2) < 0.07 && ey2 > -ex2 * ex2 * 12)) { r = 40; g = 30; b = 50; }
+			}
 		} else {
-		        if (hitObj.id === "earL" || hitObj.id === "earR") {
-		                if (hitU > -0.3 && hitU < 0.3 && hitV > -0.5 && hitV < 0.5) { r = 255; g = 130; b = 160; }
-		        }
+			const eDist1 = ex1 * ex1 + (ey1 * ey1) / (eyeOpen * eyeOpen + 0.001);
+			const eDist2 = ex2 * ex2 + (ey2 * ey2) / (eyeOpen * eyeOpen + 0.001);
+
+			// Layer 1: White sclera (outermost)
+			if (eDist1 < 0.009 || eDist2 < 0.009) {
+				r = 250; g = 250; b = 255;
+
+				// Layer 2: Colored iris
+				if (eDist1 < 0.005 || eDist2 < 0.005) {
+					r = 40; g = 130; b = 90; // teal-green iris
+					// Lower iris lighter
+					if (ey1 > 0.01 || ey2 > 0.01) { r = 60; g = 170; b = 110; }
+
+					// Layer 3: Dark pupil
+					if (eDist1 < 0.002 || eDist2 < 0.002) {
+						r = 10; g = 10; b = 15;
+					}
+				}
+
+				// Big highlight (upper-left) — spans ~2 chars
+				if ((ex1 + 0.02) ** 2 + (ey1 + 0.02) ** 2 < 0.0015 || (ex2 + 0.02) ** 2 + (ey2 + 0.02) ** 2 < 0.0015) {
+					if (!isTired) { r = 255; g = 255; b = 255; }
+				}
+				// Small secondary highlight (lower-right)
+				if ((ex1 - 0.02) ** 2 + (ey1 - 0.02) ** 2 < 0.0006 || (ex2 - 0.02) ** 2 + (ey2 - 0.02) ** 2 < 0.0006) {
+					if (!isTired) { r = 230; g = 240; b = 255; }
+				}
+			}
 		}
-		if (hitNz < 0.25) {
-		        r *= 0.6; g *= 0.6; b *= 0.6;
+
+		// ── Nose: small dark oval ──
+		const nnx = bdx - lookX * 0.06, nny = bdy - lookY * 0.05 - 0.03;
+		if (nnx * nnx * 1.2 + nny * nny < 0.001 && !isSleeping) { r = 40; g = 30; b = 40; }
+
+		// ── Mouth: clear smile arc ──
+		if (!isSleeping && !hasBall) {
+			const mx = bdx - lookX * 0.06, my = bdy - lookY * 0.05 - 0.07;
+			// Smile curves
+			if ((Math.abs(my - (mx - 0.03) ** 2 * 15 + 0.012) < 0.013 && mx > 0 && mx < 0.06) ||
+				(Math.abs(my - (mx + 0.03) ** 2 * 15 + 0.012) < 0.013 && mx < 0 && mx > -0.06)) {
+				r = 50; g = 30; b = 40;
+			}
+			// Open mouth when excited/talking
+			if (currentState === "excited" || currentState === "singing" || currentState === "dance" || speechTimer > 0 || isTalking) {
+				const mouthOpen = (speechTimer > 0 || currentState === "singing" || isTalking)
+					? (isTalking ? talkAudioLevel * 0.04 + 0.008 : Math.abs(Math.sin(time * 12)) * 0.03)
+					: 0.02;
+				if (mx * mx + (my + 0.012) ** 2 < mouthOpen && my < -0.01) {
+					r = 230; g = 70; b = 90;
+					if (my < -0.03) { r = 255; g = 110; b = 130; }
+				}
+			}
+		}
+	} else {
+		if (hitObj.id === "earL" || hitObj.id === "earR") {
+			if (hitU > -0.3 && hitU < 0.3 && hitV > -0.5 && hitV < 0.5) { r = 255; g = 130; b = 160; }
 		}
+	}
+	// Dark outline — but NOT on the face area (preserves feature contrast)
+	if (hitNz < 0.25 && !isOnFace) {
+		r = Math.floor(r * 0.6); g = Math.floor(g * 0.6); b = Math.floor(b * 0.6);
+	}
 	} else if (hitObj.mat === 2) {
 		r = Math.max(0, th.r - 20); g = Math.max(0, th.g - 15); b = Math.max(0, th.b - 10);
 		if (hitNy > 0.5) { r = 255; g = 180; b = 190; }
@@ -457,45 +496,121 @@ function getPixel(px: number, py: number, objects: RenderObj[], skyColors: Retur
 	const directHit = getObjHit(px, py, objects);
 	if (directHit.hitObj) return shadeObject(directHit, px, py, objects);
 
+	const w = (skyColors as any).weather as Weather | undefined;
+	const tod = (skyColors as any).timeOfDay as TimeOfDay | undefined;
+
 	const grad = Math.max(0, (1.0 + py) / 2.0);
 	let bgR = Math.floor(skyColors.rTop * (1 - grad) + skyColors.rBot * grad);
 	let bgG = Math.floor(skyColors.gTop * (1 - grad) + skyColors.gBot * grad);
 	let bgB = Math.floor(skyColors.bTop * (1 - grad) + skyColors.bBot * grad);
 
-	// Stars at night / dusk — twinkling via time modulation
+	// 5. SNOW: soft glow/haziness across whole sky
+	if (w === "snow") {
+		bgR = Math.min(255, bgR + 30);
+		bgG = Math.min(255, bgG + 30);
+		bgB = Math.min(255, bgB + 40);
+	}
+
+	// 3. STARS & MOON
 	if (skyColors.isNight) {
-		const star = Math.sin(px * 80 + 1.3) * Math.cos(py * 80 + 0.7);
-		const twinkle = Math.sin(time * 3 + px * 20 + py * 30) * 0.5 + 0.5;
-		if (star > 0.98) { const b = Math.floor(180 + twinkle * 75); bgR = b; bgG = b; bgB = b; }
-		else if (star > 0.96) { const b = Math.floor(40 + twinkle * 40); bgR += b; bgG += b; bgB += b; }
+		const moonDist = Math.sqrt((px - 0.4) ** 2 + (py + 0.4) ** 2);
+		if (moonDist < 0.15) {
+			const moonGlow = 1.0 - (moonDist / 0.15);
+			bgR = Math.min(255, bgR + moonGlow * 60);
+			bgG = Math.min(255, bgG + moonGlow * 60);
+			bgB = Math.min(255, bgB + moonGlow * 80);
+		}
+		
+		const starPattern = Math.sin(px * 150) * Math.cos(py * 150 + px * 40);
+		if (starPattern > 0.92) {
+			const twinkle = Math.sin(time * 3 + px * 30 + py * 40) * 0.5 + 0.5;
+			const starColorHash = Math.abs(Math.sin(px * 313 + py * 717));
+			let sr = 255, sg = 255, sb = 255;
+			if (starColorHash < 0.3) { sr = 180; sg = 200; sb = 255; }
+			else if (starColorHash < 0.6) { sr = 255; sg = 255; sb = 180; }
+			else if (starColorHash < 0.8) { sr = 255; sg = 180; sb = 150; }
+			
+			const intensity = starPattern > 0.98 ? twinkle : twinkle * 0.4;
+			bgR = Math.min(255, bgR + sr * intensity);
+			bgG = Math.min(255, bgG + sg * intensity);
+			bgB = Math.min(255, bgB + sb * intensity);
+		}
 	}
 
-	// Clouds — wispy noise shapes in upper sky
-	const w = (skyColors as any).weather as Weather | undefined;
+	// 4. SUNSET/DAWN (SUN DISK)
+	if (tod === "sunset" || tod === "dawn") {
+		const sunDist = Math.sqrt((px + 0.3) ** 2 + (py - 0.2) ** 2);
+		const halo = Math.max(0, 1.0 - sunDist * 2.0);
+		if (sunDist < 0.05) {
+			bgR = 255; bgG = 240; bgB = 200;
+		} else if (halo > 0) {
+			const hIntensity = Math.pow(halo, 2);
+			bgR = Math.min(255, bgR + hIntensity * 120);
+			bgG = Math.min(255, bgG + hIntensity * (tod === "sunset" ? 70 : 90));
+			bgB = Math.min(255, bgB + hIntensity * 40);
+		}
+	}
+
+	// 1. CLOUDS & 6. STORM CLOUDS
 	if (w === "cloudy" || w === "rain" || w === "storm" || w === "snow") {
-		const cloudDensity = w === "storm" ? 0.7 : w === "rain" ? 0.5 : w === "snow" ? 0.4 : 0.3;
-		const cn = Math.sin(px * 8 + time * 0.3) * Math.cos(py * 12 - time * 0.2) +
-			Math.sin(px * 16 + py * 6) * 0.5;
-		if (cn > 1.0 - cloudDensity && py < 0.2) {
-			const blend = Math.min(1.0, (cn - (1.0 - cloudDensity)) * 4);
-			const cr = w === "storm" ? 50 : 180, cg = w === "storm" ? 50 : 185, cb = w === "storm" ? 55 : 195;
+		let cloudDensity = w === "storm" ? 0.8 : w === "rain" ? 0.6 : w === "snow" ? 0.5 : 0.4;
+		
+		// Denser in upper half, wispy at lower altitudes
+		cloudDensity *= Math.max(0, 1.0 - (py + 1.0) / 1.6);
+
+		const drift = time * 0.15;
+		const n1 = Math.sin((px + drift) * 6) * Math.cos(py * 8) * 0.5 + 0.5;
+		const n2 = Math.sin((px - drift * 0.5) * 14 + py * 10) * 0.5 + 0.5;
+		const n3 = Math.sin((px + drift * 2) * 25 - py * 20) * 0.5 + 0.5;
+		const noise = n1 * 0.5 + n2 * 0.3 + n3 * 0.2;
+		
+		const shadowNoise = Math.sin((px + drift) * 6 + 0.3) * Math.cos((py - 0.08) * 8) * 0.5 + 0.5;
+
+		if (noise > 1.0 - cloudDensity) {
+			const blend = Math.min(1.0, (noise - (1.0 - cloudDensity)) * 4);
+			const isShadow = shadowNoise < noise - 0.1;
+			
+			let cr = w === "storm" ? 60 : 200;
+			let cg = w === "storm" ? 65 : 205;
+			let cb = w === "storm" ? 75 : 215;
+
+			if (isShadow) {
+				cr *= 0.6; cg *= 0.6; cb *= 0.7;
+			}
+
 			bgR = Math.floor(bgR * (1 - blend) + cr * blend);
 			bgG = Math.floor(bgG * (1 - blend) + cg * blend);
 			bgB = Math.floor(bgB * (1 - blend) + cb * blend);
 		}
 	}
 
-	// Sunset/dawn glow at horizon
-	const tod = (skyColors as any).timeOfDay as TimeOfDay | undefined;
-	if (tod === "sunset" || tod === "dawn") {
-		const horizonGlow = Math.exp(-(py - 0.4) * (py - 0.4) * 20);
-		if (tod === "sunset") {
-			bgR = Math.min(255, Math.floor(bgR + horizonGlow * 80));
-			bgG = Math.min(255, Math.floor(bgG + horizonGlow * 30));
-		} else {
-			bgR = Math.min(255, Math.floor(bgR + horizonGlow * 50));
-			bgG = Math.min(255, Math.floor(bgG + horizonGlow * 40));
-			bgB = Math.min(255, Math.floor(bgB + horizonGlow * 30));
+	// 6. STORM LIGHTNING
+	if (w === "storm" && Math.sin(time * 47) > 0.99) {
+		bgR = Math.min(255, bgR + 180);
+		bgG = Math.min(255, bgG + 180);
+		bgB = Math.min(255, bgB + 200);
+	}
+
+	// 2. RAIN VISUAL
+	if (w === "rain" || w === "storm") {
+		if (Math.sin(px * 40 + py * 80 + time * 15) > 0.95) {
+			bgR = Math.min(255, bgR + 50);
+			bgG = Math.min(255, bgG + 50);
+			bgB = Math.min(255, bgB + 70);
+		}
+	}
+
+	// 7. FOG/MIST
+	if (w === "rain" || w === "snow") {
+		const fogDist = Math.max(0, py); 
+		if (fogDist > 0) {
+			const fogBlend = Math.min(1.0, (fogDist / 0.6) * 0.5); 
+			const fr = w === "snow" ? 220 : 140;
+			const fg = w === "snow" ? 220 : 150;
+			const fb = w === "snow" ? 230 : 160;
+			bgR = Math.floor(bgR * (1 - fogBlend) + fr * fogBlend);
+			bgG = Math.floor(bgG * (1 - fogBlend) + fg * fogBlend);
+			bgB = Math.floor(bgB * (1 - fogBlend) + fb * fogBlend);
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codexstar/pi-pompom",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "description": "A 3D raymarched virtual pet companion for Pi CLI",
   "type": "module",
   "author": "codexstar69 <engazedigital@gmail.com>",