agent-robot-avatar 0.3.1 → 0.5.2

package/src/agent-robot-avatar-version.js

@@ -1,3 +1,3 @@
-const VERSION = '0.3.1';
-
-export { VERSION };
+const VERSION = '0.5.2';
+
+export { VERSION };

package/src/agent-robot-avatar-waiting.js

@@ -1,121 +1,130 @@
-import AgentRobotAvatar, { registerAvatarExtension } from './agent-robot-avatar-extension-host.js';
-
-const WAITING_CYCLE = 3200;
-const proto = AgentRobotAvatar.prototype;
-
-const clamp01 = value => Math.max(0, Math.min(1, value));
-
-function dispatchWaitingState(instance, state) {
-  instance.dispatchEvent(new CustomEvent('face-state', {
-    detail: { state }
-  }));
-}
-
-function readEyeY(eye) {
-  const raw = eye?.getAttribute('transform') || '';
-  const match = raw.match(/translate\(\s*(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s*\)/);
-  return match ? Number(match[2]) : 126;
-}
-
-function setEyeOrbitTransform(eye, x, scaleX, scaleY) {
-  if (!eye) return;
-  const y = readEyeY(eye);
-  eye.setAttribute(
-    'transform',
-    `translate(${x.toFixed(2)} ${y.toFixed(2)}) scale(${scaleX.toFixed(4)} ${scaleY.toFixed(4)})`
-  );
-}
-
-async function enterWaiting(instance, continuous, source) {
-  instance.noteActivity();
-  instance._inputWanted = false;
-
-  instance.reset();
-  instance._waitingRequested = true;
-  if (!(await instance._prepareExpression({ normalizePose: true, duration: 120, pause: 0 }))) return null;
-  if (!instance._waitingRequested) return null;
-
-  const token = instance._transitionToken;
-  instance._expressionLock = true;
-  instance._look.x = 0;
-  instance._look.y = 0;
-  instance._waitingFx = {
-    start: performance.now(),
-    duration: WAITING_CYCLE,
-    continuous: continuous === true,
-    source,
-  };
-  dispatchWaitingState(instance, 'waiting');
-  return token;
-}
-
-proto.waiting = async function() {
-  const token = await enterWaiting(this, false, 'play');
-  if (token == null) return;
-
-  await this._wait(WAITING_CYCLE);
-  if (token !== this._transitionToken || !this._waitingRequested) return;
-  this._waitingRequested = false;
-  this._waitingFx = null;
-  this._releaseExpressionLock();
-  dispatchWaitingState(this, 'idle');
-};
-
-// Runtime/Agent behavior: call when a request has been sent and the reply has not arrived yet.
-// It stays seamless until another action or stopWaiting() occurs.
-proto.startWaiting = async function() {
-  await enterWaiting(this, true, 'runtime');
-  return this;
-};
-
-proto.stopWaiting = function() {
-  return this.reset();
-};
-
-function drawWaiting(now) {
-  const fx = this._waitingFx;
-  if (!fx) return;
-
-  const elapsed = Math.max(0, now - fx.start);
-  const phaseMs = fx.continuous
-    ? (elapsed % fx.duration)
-    : Math.min(fx.duration, elapsed);
-  const t = clamp01(phaseMs / fx.duration);
-
-  // Original R43 waiting-eye motion: two continuous horizontal orbits per 3.2 s cycle.
-  const angle = t * Math.PI * 4;
-  const cosA = Math.cos(angle);
-  const sinA = Math.sin(angle);
-
-  const leftX = 120 - 34 * cosA;
-  const rightX = 120 + 34 * cosA;
-
-  // Original R43 perspective/size treatment retained exactly.
-  const foreshorten = 0.72 + 0.28 * Math.abs(cosA);
-  const leftDepth = 1 + 0.08 * sinA;
-  const rightDepth = 1 - 0.08 * sinA;
-
-  setEyeOrbitTransform(this._leftEye, leftX, foreshorten * leftDepth, leftDepth);
-  setEyeOrbitTransform(this._rightEye, rightX, foreshorten * rightDepth, rightDepth);
-}
-
-registerAvatarExtension({
-  name: 'waiting',
-  actions: {
-    waiting() { return this.waiting(); },
-    wait() { return this.waiting(); },
-  },
-  beforePlay(action) {
-    if (action === 'waiting' || action === 'wait') return;
-    this._waitingRequested = false;
-    this._waitingFx = null;
-  },
-  reset() {
-    this._waitingRequested = false;
-    this._waitingFx = null;
-  },
-  draw: drawWaiting,
-});
-
-export { AgentRobotAvatar, WAITING_CYCLE };
-export default AgentRobotAvatar;
+import AgentRobotAvatar, { registerAvatarExtension } from './agent-robot-avatar-extension-host.js';
+import { WRAP_CYCLE, drawWrapWaiting } from './agent-robot-avatar-wrap.js';
+
+const WAITING_CYCLE = 3200;
+const proto = AgentRobotAvatar.prototype;
+
+const clamp01 = value => Math.max(0, Math.min(1, value));
+
+function dispatchWaitingState(instance, state) {
+  instance.dispatchEvent(new CustomEvent('face-state', {
+    detail: { state }
+  }));
+}
+
+function readEyeY(eye) {
+  const raw = eye?.getAttribute('transform') || '';
+  const match = raw.match(/translate\(\s*(-?\d+(?:\.\d+)?)\s+(-?\d+(?:\.\d+)?)\s*\)/);
+  return match ? Number(match[2]) : 126;
+}
+
+function setEyeOrbitTransform(eye, x, scaleX, scaleY) {
+  if (!eye) return;
+  const y = readEyeY(eye);
+  eye.setAttribute(
+    'transform',
+    `translate(${x.toFixed(2)} ${y.toFixed(2)}) scale(${scaleX.toFixed(4)} ${scaleY.toFixed(4)})`
+  );
+}
+
+async function enterWaiting(instance, continuous, source, options = {}) {
+  const variant = options?.variant ?? 'default';
+  if (variant !== 'default' && variant !== 'wrap') throw new TypeError(`Unknown waiting variant: ${variant}`);
+  instance.noteActivity();
+  instance._inputWanted = false;
+
+  instance.reset();
+  instance._waitingRequested = true;
+  if (!(await instance._prepareExpression({ normalizePose: true, duration: 120, pause: 0 }))) return null;
+  if (!instance._waitingRequested) return null;
+
+  const token = instance._transitionToken;
+  instance._expressionLock = true;
+  instance._look.x = 0;
+  instance._look.y = 0;
+  instance._waitingFx = {
+    start: performance.now(),
+    duration: variant === 'wrap' ? WRAP_CYCLE : WAITING_CYCLE,
+    variant,
+    continuous: continuous === true,
+    source,
+  };
+  dispatchWaitingState(instance, 'waiting');
+  return token;
+}
+
+proto.waiting = async function(options = {}) {
+  const token = await enterWaiting(this, false, 'play', options);
+  if (token == null) return;
+
+  await this._wait(options?.variant === 'wrap' ? WRAP_CYCLE : WAITING_CYCLE);
+  if (token !== this._transitionToken || !this._waitingRequested) return;
+  this._waitingRequested = false;
+  this._waitingFx = null;
+  this._releaseExpressionLock();
+  dispatchWaitingState(this, 'idle');
+};
+
+// Runtime/Agent behavior: call when a request has been sent and the reply has not arrived yet.
+// It stays seamless until another action or stopWaiting() occurs.
+proto.startWaiting = async function(options = {}) {
+  await enterWaiting(this, true, 'runtime', options);
+  return this;
+};
+
+proto.stopWaiting = function() {
+  return this.reset();
+};
+
+function drawWaiting(now) {
+  const fx = this._waitingFx;
+  if (!fx) return;
+
+  const elapsed = Math.max(0, now - fx.start);
+  const phaseMs = fx.continuous
+    ? (elapsed % fx.duration)
+    : Math.min(fx.duration, elapsed);
+  const t = clamp01(phaseMs / fx.duration);
+  if (fx.variant === 'wrap') {
+    drawWrapWaiting(this, phaseMs);
+    return;
+  }
+
+  // Original R43 waiting-eye motion: two continuous horizontal orbits per 3.2 s cycle.
+  const angle = t * Math.PI * 4;
+  const cosA = Math.cos(angle);
+  const sinA = Math.sin(angle);
+
+  const leftX = 120 - 34 * cosA;
+  const rightX = 120 + 34 * cosA;
+
+  // Original R43 perspective/size treatment retained exactly.
+  const foreshorten = 0.72 + 0.28 * Math.abs(cosA);
+  const leftDepth = 1 + 0.08 * sinA;
+  const rightDepth = 1 - 0.08 * sinA;
+
+  setEyeOrbitTransform(this._leftEye, leftX, foreshorten * leftDepth, leftDepth);
+  setEyeOrbitTransform(this._rightEye, rightX, foreshorten * rightDepth, rightDepth);
+}
+
+registerAvatarExtension({
+  name: 'waiting',
+  actions: {
+    waiting() { return this.waiting(); },
+    wait() { return this.waiting(); },
+    'waiting-wrap'() { return this.waiting({ variant: 'wrap' }); },
+  },
+  beforePlay(action) {
+    if (action === 'waiting' || action === 'wait' || action === 'waiting-wrap') return;
+    this._waitingRequested = false;
+    this._waitingFx = null;
+  },
+  reset() {
+    this._waitingRequested = false;
+    this._waitingFx = null;
+  },
+  draw: drawWaiting,
+});
+
+export { AgentRobotAvatar, WAITING_CYCLE };
+export default AgentRobotAvatar;

package/src/agent-robot-avatar-wrap.js

@@ -0,0 +1,66 @@
+// Both eyes lie on the same rotating surface. Position and foreshortening
+// must be projected together, otherwise the eyes overlap or hit the head edge.
+export const WRAP_CYCLE = 2400;
+const RADIUS = 85;
+const EYE_ANGLE = Math.asin(34 / RADIUS);
+const HALF_WIDTH = 27 / Math.cos(EYE_ANGLE);
+const FRAMES = [
+  [0, 0, null],
+  [834, -Math.PI / 2 + EYE_ANGLE, [.6123122262631361,0,.8763337613684284,.3403039133642485]],
+  [996, -Math.PI / 2 - EYE_ANGLE, null],
+  [1260, -3 * Math.PI / 2 + EYE_ANGLE, null],
+  [1390, -3 * Math.PI / 2 - EYE_ANGLE, null],
+  [2400, -2 * Math.PI, [.16771539711108435,.7245980352977247,.32366613843706765,1]],
+];
+
+function progress(t, curve) {
+  if (!curve || t <= 0 || t >= 1) return t;
+  const b = (s,a,z) => 3*(1-s)*(1-s)*s*a + 3*(1-s)*s*s*z + s*s*s;
+  let lo=0,hi=1;
+  for (let i=0;i<24;i++) { const mid=(lo+hi)/2; if(b(mid,curve[0],curve[2])<t)lo=mid;else hi=mid; }
+  return b((lo+hi)/2,curve[1],curve[3]);
+}
+
+export function wrapEyeHeight(width) {
+  // Optical compensation: a narrow eye reads taller than a round one.
+  // Keep the frontal height, then shorten smoothly toward the side profile.
+  const side=Math.max(0,Math.min(1,1-width/54));
+  return 58-18*side*side*(3-2*side);
+}
+
+export function wrapEyeX(x, width) {
+  // Close the gap to the head's 94-unit silhouette only as the eye narrows.
+  // The cubic keeps the round frontal eye untouched and approaches the edge
+  // tangentially, instead of pushing a full-size ellipse through the clip.
+  const side=Math.max(0,Math.min(1,1-width/54));
+  return x+Math.sign(x-120)*9*side**3;
+}
+
+export function sampleWrapPose(elapsed) {
+  const time=Math.max(0,Math.min(WRAP_CYCLE,elapsed));
+  const index=Math.max(1,FRAMES.findIndex(frame=>frame[0]>=time));
+  const a=FRAMES[index-1],b=FRAMES[index],t=progress((time-a[0])/(b[0]-a[0]),b[2]);
+  const angle=a[1]+(b[1]-a[1])*t;
+  const pose={};
+  for(const [side,offset] of [['left',-EYE_ANGLE],['right',EYE_ANGLE]]) {
+    const eyeAngle=angle+offset;
+    const front=Math.cos(eyeAngle);
+    pose[side+'Y']=126;
+    pose[side+'Width']=front>1e-10?2*HALF_WIDTH*front:0;
+    pose[side+'X']=wrapEyeX(120+RADIUS*Math.sin(eyeAngle),pose[side+'Width']);
+    pose[side+'Height']=wrapEyeHeight(pose[side+'Width']);
+    pose[side+'Opacity']=1;
+  }
+  return pose;
+}
+
+export function drawWrapWaiting(instance, elapsed) {
+  const pose=sampleWrapPose(elapsed);
+  for(const side of ['left','right']) {
+    instance['_'+side+'Eye'].setAttribute('transform',`translate(${pose[side+'X']} 126)`);
+    const eye=instance['_'+side+'Base'];
+    eye.setAttribute('rx',pose[side+'Width']/2);eye.setAttribute('ry',pose[side+'Height']/2);
+    eye.setAttribute('opacity','1');
+    instance['_'+side+'InputBase'].setAttribute('opacity','0');
+  }
+}