`3d099f7`

reduce donny angle, re-attempt koi trajectories

Authored by

espadonne 4 months ago

SHA: 3d099f7eaf85298d154a9b861f21b69565245a4e
Parents: 978c402
Tree: bbf6b4a

2 changed files

Status	File	+	-
M	`src/renderers/three/koi.js`	5	5
M	`src/renderers/three/narwhal.js`	9	9

src/renderers/three/koi.jsmodified

        const dz = s.targetZ - koi.group.position.z
        const dist = Math.hypot(dx, dz)
 -      // Always swim forward, turn gradually
 -      const targetRot = Math.atan2(dx, dz)
 +      // Calculate target rotation - koi model faces +X, so use atan2(dz, dx)
 +      const targetRot = Math.atan2(dz, dx)
        // Very smooth rotation - fish don't turn sharply
        let rotDiff = targetRot - koi.group.rotation.y
        const turnRate = s.panicMode ? 2.5 : 1.2
        koi.group.rotation.y += rotDiff * turnRate * delta
 -      // Always moving forward (fish don't stop mid-water)
 +      // Move in the direction koi is facing (model faces +X, so use cos/sin)
        const moveSpeed = s.panicMode ? s.speed * 1.8 : s.speed * 0.5
 -      const moveX = Math.sin(koi.group.rotation.y) * moveSpeed * delta
 -      const moveZ = Math.cos(koi.group.rotation.y) * moveSpeed * delta
 +      const moveX = Math.cos(koi.group.rotation.y) * moveSpeed * delta
 +      const moveZ = Math.sin(koi.group.rotation.y) * moveSpeed * delta
        koi.group.position.x += moveX
        koi.group.position.z += moveZ

src/renderers/three/narwhal.jsmodified

          // Rise from the water
          const emergeProgress = Math.min(state.timer / 1.5, 1)
          const easeOut = 1 - Math.pow(1 - emergeProgress, 3)
 -        group.position.y = -2 + easeOut * 2.5 // Rise higher out of water
 +        group.position.y = -2 + easeOut * 2.25 // Rise higher out of water (10% less)
          // Slowly turn toward Doug - lugubrious, not laser tracking
          group.rotation.y = lerpAngle(group.rotation.y, angleToDoug, delta * 0.5)
 -        // Tilt nose UP ~55 degrees - rotate around Z since model faces +X
 -        group.rotation.z = 0.95 * easeOut
 +        // Tilt nose UP ~50 degrees - rotate around Z since model faces +X (8% less)
 +        group.rotation.z = 0.87 * easeOut
          // Gentle side-to-side rocking
          group.rotation.x = Math.sin(state.timer * 4) * 0.06
          break
        case 'surfaced':
 -        // Bob gently, positioned higher
 -        group.position.y = 0.5 + Math.sin(elapsed * 2) * 0.06
 +        // Bob gently, positioned at adjusted height
 +        group.position.y = 0.25 + Math.sin(elapsed * 2) * 0.06
          // Slowly turn toward Doug
          group.rotation.y = lerpAngle(group.rotation.y, angleToDoug, delta * 0.3)
 -        // Keep steep tilt ~55 degrees - nose up, tail in water
 -        group.rotation.z = 0.95 + Math.sin(elapsed * 1.5) * 0.04
 +        // Keep tilt ~50 degrees - nose up, tail in water
 +        group.rotation.z = 0.87 + Math.sin(elapsed * 1.5) * 0.04
          // Gentle side-to-side rocking
          group.rotation.x = Math.sin(elapsed * 1.5) * 0.03
          // Sink back down
          const submergeProgress = Math.min(state.timer / 1.2, 1)
          const easeIn = Math.pow(submergeProgress, 2)
 -        group.position.y = 0.5 - easeIn * 2.7
 +        group.position.y = 0.25 - easeIn * 2.5
          // Tilt nose down as diving back under
 -        group.rotation.z = 0.95 - easeIn * 1.2
 +        group.rotation.z = 0.87 - easeIn * 1.1
          // Add bubbles/ripples as submerging
          if (Math.random() < delta * 4) {