`5a30cab`

make donny angle upward, track doug

Authored by

espadonne 4 months ago

SHA: 5a30cabc11c39beba738404c5076990280894647
Parents: aa974e3
Tree: 4cdfcd3

2 changed files

Status	File	+	-
M	`src/renderers/three/index.js`	1	1
M	`src/renderers/three/narwhal.js`	34	1

src/renderers/three/index.jsmodified


   doug.update(delta, elapsed, breadManager.getActiveBits(), pond)
   breadManager.update(delta, elapsed)
   pond.update(delta, elapsed)
+  donny.update(delta, elapsed, pond, doug)
 
   composer.render()
 }

src/renderers/three/narwhal.jsmodified

      group.rotation.y = angle + Math.PI / 2 // Face outward-ish
+   }
--  function update(delta, elapsed, pond) {
++  // Helper to smoothly interpolate angles
++  function lerpAngle(from, to, t) {
++    let diff = to - from
++    while (diff > Math.PI) diff -= Math.PI * 2
++    while (diff < -Math.PI) diff += Math.PI * 2
++    return from + diff * t
++  }
++
++  function update(delta, elapsed, pond, doug) {
      state.timer += delta
++    // Calculate angle to face Doug
++    let angleToDoug = 0
++    if (doug) {
++      const dougPos = doug.getPosition()
++      const dx = dougPos.x - group.position.x
++      const dz = dougPos.z - group.position.z
++      angleToDoug = Math.atan2(dx, dz)
++    }
++
      switch (state.mode) {
        case 'waiting':
          if (state.timer >= 60) {
            state.timer = 0
            group.visible = true
            group.position.y = -2
++          // Start facing Doug
++          group.rotation.y = angleToDoug
+         }
          break
          const easeOut = 1 - Math.pow(1 - emergeProgress, 3)
          group.position.y = -2 + easeOut * 2.3 // Rise to 0.3 above water
++        // Tilt upward as emerging (nose up!)
++        group.rotation.x = -0.3 * easeOut
++
++        // Slowly turn toward Doug - lugubrious, not laser tracking
++        group.rotation.y = lerpAngle(group.rotation.y, angleToDoug, delta * 0.3)
++
          // Gentle rocking as emerging
          group.rotation.z = Math.sin(state.timer * 4) * 0.1
          group.position.y = 0.3 + Math.sin(elapsed * 2) * 0.08
          group.rotation.z = Math.sin(elapsed * 1.5) * 0.05
++        // Keep tilted upward, slowly drifting gaze toward Doug
++        group.rotation.x = -0.25 + Math.sin(elapsed * 1.5) * 0.05
++        group.rotation.y = lerpAngle(group.rotation.y, angleToDoug, delta * 0.2)
++
          // Gentle flipper animation
          leftFlipper.rotation.z = 2.2 + Math.sin(elapsed * 3) * 0.15
          rightFlipper.rotation.z = 2.2 + Math.sin(elapsed * 3 + 0.5) * 0.15
          const easeIn = Math.pow(submergeProgress, 2)
          group.position.y = 0.3 - easeIn * 2.5
++        // Tilt nose down as submerging
++        group.rotation.x = -0.25 + easeIn * 0.4
++
          // Add bubbles/ripples as submerging
          if (Math.random() < delta * 4) {
            pond.addRipple(
            state.timer = 0
            group.visible = false
            group.position.y = -3
++          group.rotation.x = 0
+         }
          break
+     }

`@@ -164,7 +164,7 @@` function animate() {
164	doug.update(delta, elapsed, breadManager.getActiveBits(), pond)	164	doug.update(delta, elapsed, breadManager.getActiveBits(), pond)
165	breadManager.update(delta, elapsed)	165	breadManager.update(delta, elapsed)
166	pond.update(delta, elapsed)	166	pond.update(delta, elapsed)
167	- donny.update(delta, elapsed, pond)	167	+ donny.update(delta, elapsed, pond, doug)
168		168
169	composer.render()	169	composer.render()
170	}	170	}