Z targetswap

ai/lore/lore-ai.js

@@ -3,35 +3,13 @@ import {
   defaultPlayerBio,
   defaultObjectName,
   defaultObjectDescription,
-
   makeLorePrompt,
   makeLoreStop,
-  postProcessResponse,
-  parseLoreResponses,
-
   makeCommentPrompt,
   makeCommentStop,
   parseCommentResponse,
-
-  makeSelectTargetPrompt,
-  makeSelectTargetStop,
-  parseSelectTargetResponse,
-
-  makeSelectCharacterPrompt,
-  makeSelectCharacterStop,
-  parseSelectCharacterResponse,
-
-  makeChatPrompt,
-  makeChatStop,
-  parseChatResponse,
-
-  makeOptionsPrompt,
-  makeOptionsStop,
-  parseOptionsResponse,
-
-  makeCharacterIntroPrompt,
-  makeCharacterIntroStop,
-  parseCharacterIntroResponse,
+  postProcessResponse,
+  parseLoreResponses,
 } from './lore-model.js'
 
 const numGenerateTries = 5;

ai/lore/lore-model.js

@@ -1 +1 @@
-export * from 'http://localhost/lib/webaverse_resource/lore/lore-model.js';
+export * from 'https://webaverse.github.io/lore/lore-model.js';

avatars/AnimationMapping.js

@@ -1,73 +1,72 @@
 class AnimationMapping {
-  constructor(animationTrackName, boneName, isTop, isPosition, isArm) {
+  constructor(animationTrackName, boneName, isTop, isPosition) {
     this.animationTrackName = animationTrackName;
     this.boneName = boneName;
     this.isTop = isTop;
-    this.isArm = isArm;
     this.isPosition = isPosition;
   }
 
   clone() {
-    return new AnimationMapping(this.animationTrackName, this.boneName, this.isTop, this.isPosition, this.isArm);
+    return new AnimationMapping(this.animationTrackName, this.boneName, this.isTop, this.isPosition);
   }
 }
 
 export const animationMappingConfig = [
-  new AnimationMapping('mixamorigHips.position', 'Hips', false, true, false),
-  new AnimationMapping('mixamorigHips.quaternion', 'Hips', false, false, false),
-  new AnimationMapping('mixamorigSpine.quaternion', 'Spine', true, false, false),
-  new AnimationMapping('mixamorigSpine1.quaternion', 'Chest', true, false, false),
-  new AnimationMapping('mixamorigSpine2.quaternion', 'UpperChest', true, false, false),
-  new AnimationMapping('mixamorigNeck.quaternion', 'Neck', true, false, false),
-  new AnimationMapping('mixamorigHead.quaternion', 'Head', true, false, false),
+  new AnimationMapping('mixamorigHips.position', 'Hips', false, true),
+  new AnimationMapping('mixamorigHips.quaternion', 'Hips', false, false),
+  new AnimationMapping('mixamorigSpine.quaternion', 'Spine', true, false),
+  new AnimationMapping('mixamorigSpine1.quaternion', 'Chest', true, false),
+  new AnimationMapping('mixamorigSpine2.quaternion', 'UpperChest', true, false),
+  new AnimationMapping('mixamorigNeck.quaternion', 'Neck', true, false),
+  new AnimationMapping('mixamorigHead.quaternion', 'Head', true, false),
 
-  new AnimationMapping('mixamorigLeftShoulder.quaternion', 'Left_shoulder', true, false, true),
-  new AnimationMapping('mixamorigLeftArm.quaternion', 'Left_arm', true, false, true),
-  new AnimationMapping('mixamorigLeftForeArm.quaternion', 'Left_elbow', true, false, true),
-  new AnimationMapping('mixamorigLeftHand.quaternion', 'Left_wrist', true, false, true),
-  new AnimationMapping('mixamorigLeftHandMiddle1.quaternion', 'Left_middleFinger1', true, false, true),
-  new AnimationMapping('mixamorigLeftHandMiddle2.quaternion', 'Left_middleFinger2', true, false, true),
-  new AnimationMapping('mixamorigLeftHandMiddle3.quaternion', 'Left_middleFinger3', true, false, true),
-  new AnimationMapping('mixamorigLeftHandThumb1.quaternion', 'Left_thumb0', true, false, true),
-  new AnimationMapping('mixamorigLeftHandThumb2.quaternion', 'Left_thumb1', true, false, true),
-  new AnimationMapping('mixamorigLeftHandThumb3.quaternion', 'Left_thumb2', true, false, true),
-  new AnimationMapping('mixamorigLeftHandIndex1.quaternion', 'Left_indexFinger1', true, false, true),
-  new AnimationMapping('mixamorigLeftHandIndex2.quaternion', 'Left_indexFinger2', true, false, true),
-  new AnimationMapping('mixamorigLeftHandIndex3.quaternion', 'Left_indexFinger3', true, false, true),
-  new AnimationMapping('mixamorigLeftHandRing1.quaternion', 'Left_ringFinger1', true, false, true),
-  new AnimationMapping('mixamorigLeftHandRing2.quaternion', 'Left_ringFinger2', true, false, true),
-  new AnimationMapping('mixamorigLeftHandRing3.quaternion', 'Left_ringFinger3', true, false, true),
-  new AnimationMapping('mixamorigLeftHandPinky1.quaternion', 'Left_littleFinger1', true, false, true),
-  new AnimationMapping('mixamorigLeftHandPinky2.quaternion', 'Left_littleFinger2', true, false, true),
-  new AnimationMapping('mixamorigLeftHandPinky3.quaternion', 'Left_littleFinger3', true, false, true),
+  new AnimationMapping('mixamorigLeftShoulder.quaternion', 'Left_shoulder', true, false),
+  new AnimationMapping('mixamorigLeftArm.quaternion', 'Left_arm', true, false),
+  new AnimationMapping('mixamorigLeftForeArm.quaternion', 'Left_elbow', true, false),
+  new AnimationMapping('mixamorigLeftHand.quaternion', 'Left_wrist', true, false),
+  new AnimationMapping('mixamorigLeftHandMiddle1.quaternion', 'Left_middleFinger1', true, false),
+  new AnimationMapping('mixamorigLeftHandMiddle2.quaternion', 'Left_middleFinger2', true, false),
+  new AnimationMapping('mixamorigLeftHandMiddle3.quaternion', 'Left_middleFinger3', true, false),
+  new AnimationMapping('mixamorigLeftHandThumb1.quaternion', 'Left_thumb0', true, false),
+  new AnimationMapping('mixamorigLeftHandThumb2.quaternion', 'Left_thumb1', true, false),
+  new AnimationMapping('mixamorigLeftHandThumb3.quaternion', 'Left_thumb2', true, false),
+  new AnimationMapping('mixamorigLeftHandIndex1.quaternion', 'Left_indexFinger1', true, false),
+  new AnimationMapping('mixamorigLeftHandIndex2.quaternion', 'Left_indexFinger2', true, false),
+  new AnimationMapping('mixamorigLeftHandIndex3.quaternion', 'Left_indexFinger3', true, false),
+  new AnimationMapping('mixamorigLeftHandRing1.quaternion', 'Left_ringFinger1', true, false),
+  new AnimationMapping('mixamorigLeftHandRing2.quaternion', 'Left_ringFinger2', true, false),
+  new AnimationMapping('mixamorigLeftHandRing3.quaternion', 'Left_ringFinger3', true, false),
+  new AnimationMapping('mixamorigLeftHandPinky1.quaternion', 'Left_littleFinger1', true, false),
+  new AnimationMapping('mixamorigLeftHandPinky2.quaternion', 'Left_littleFinger2', true, false),
+  new AnimationMapping('mixamorigLeftHandPinky3.quaternion', 'Left_littleFinger3', true, false),
 
-  new AnimationMapping('mixamorigRightShoulder.quaternion', 'Right_shoulder', true, false, true),
-  new AnimationMapping('mixamorigRightArm.quaternion', 'Right_arm', true, false, true),
-  new AnimationMapping('mixamorigRightForeArm.quaternion', 'Right_elbow', true, false, true),
-  new AnimationMapping('mixamorigRightHand.quaternion', 'Right_wrist', true, false, true),
-  new AnimationMapping('mixamorigRightHandMiddle1.quaternion', 'Right_middleFinger1', true, false, true),
-  new AnimationMapping('mixamorigRightHandMiddle2.quaternion', 'Right_middleFinger2', true, false, true),
-  new AnimationMapping('mixamorigRightHandMiddle3.quaternion', 'Right_middleFinger3', true, false, true),
-  new AnimationMapping('mixamorigRightHandThumb1.quaternion', 'Right_thumb0', true, false, true),
-  new AnimationMapping('mixamorigRightHandThumb2.quaternion', 'Right_thumb1', true, false, true),
-  new AnimationMapping('mixamorigRightHandThumb3.quaternion', 'Right_thumb2', true, false, true),
-  new AnimationMapping('mixamorigRightHandIndex1.quaternion', 'Right_indexFinger1', true, false, true),
-  new AnimationMapping('mixamorigRightHandIndex2.quaternion', 'Right_indexFinger2', true, false, true),
-  new AnimationMapping('mixamorigRightHandIndex3.quaternion', 'Right_indexFinger3', true, false, true),
-  new AnimationMapping('mixamorigRightHandRing1.quaternion', 'Right_ringFinger1', true, false, true),
-  new AnimationMapping('mixamorigRightHandRing2.quaternion', 'Right_ringFinger2', true, false, true),
-  new AnimationMapping('mixamorigRightHandRing3.quaternion', 'Right_ringFinger3', true, false, true),
-  new AnimationMapping('mixamorigRightHandPinky1.quaternion', 'Right_littleFinger1', true, false, true),
-  new AnimationMapping('mixamorigRightHandPinky2.quaternion', 'Right_littleFinger2', true, false, true),
-  new AnimationMapping('mixamorigRightHandPinky3.quaternion', 'Right_littleFinger3', true, false, true),
+  new AnimationMapping('mixamorigRightShoulder.quaternion', 'Right_shoulder', true, false),
+  new AnimationMapping('mixamorigRightArm.quaternion', 'Right_arm', true, false),
+  new AnimationMapping('mixamorigRightForeArm.quaternion', 'Right_elbow', true, false),
+  new AnimationMapping('mixamorigRightHand.quaternion', 'Right_wrist', true, false),
+  new AnimationMapping('mixamorigRightHandMiddle1.quaternion', 'Right_middleFinger1', true, false),
+  new AnimationMapping('mixamorigRightHandMiddle2.quaternion', 'Right_middleFinger2', true, false),
+  new AnimationMapping('mixamorigRightHandMiddle3.quaternion', 'Right_middleFinger3', true, false),
+  new AnimationMapping('mixamorigRightHandThumb1.quaternion', 'Right_thumb0', true, false),
+  new AnimationMapping('mixamorigRightHandThumb2.quaternion', 'Right_thumb1', true, false),
+  new AnimationMapping('mixamorigRightHandThumb3.quaternion', 'Right_thumb2', true, false),
+  new AnimationMapping('mixamorigRightHandIndex1.quaternion', 'Right_indexFinger1', true, false),
+  new AnimationMapping('mixamorigRightHandIndex2.quaternion', 'Right_indexFinger2', true, false),
+  new AnimationMapping('mixamorigRightHandIndex3.quaternion', 'Right_indexFinger3', true, false),
+  new AnimationMapping('mixamorigRightHandRing1.quaternion', 'Right_ringFinger1', true, false),
+  new AnimationMapping('mixamorigRightHandRing2.quaternion', 'Right_ringFinger2', true, false),
+  new AnimationMapping('mixamorigRightHandRing3.quaternion', 'Right_ringFinger3', true, false),
+  new AnimationMapping('mixamorigRightHandPinky1.quaternion', 'Right_littleFinger1', true, false),
+  new AnimationMapping('mixamorigRightHandPinky2.quaternion', 'Right_littleFinger2', true, false),
+  new AnimationMapping('mixamorigRightHandPinky3.quaternion', 'Right_littleFinger3', true, false),
 
-  new AnimationMapping('mixamorigRightUpLeg.quaternion', 'Right_leg', false, false, false),
-  new AnimationMapping('mixamorigRightLeg.quaternion', 'Right_knee', false, false, false),
-  new AnimationMapping('mixamorigRightFoot.quaternion', 'Right_ankle', false, false, false),
-  new AnimationMapping('mixamorigRightToeBase.quaternion', 'Right_toe', false, false, false),
+  new AnimationMapping('mixamorigRightUpLeg.quaternion', 'Right_leg', false, false),
+  new AnimationMapping('mixamorigRightLeg.quaternion', 'Right_knee', false, false),
+  new AnimationMapping('mixamorigRightFoot.quaternion', 'Right_ankle', false, false),
+  new AnimationMapping('mixamorigRightToeBase.quaternion', 'Right_toe', false, false),
 
-  new AnimationMapping('mixamorigLeftUpLeg.quaternion', 'Left_leg', false, false, false),
-  new AnimationMapping('mixamorigLeftLeg.quaternion', 'Left_knee', false, false, false),
-  new AnimationMapping('mixamorigLeftFoot.quaternion', 'Left_ankle', false, false, false),
-  new AnimationMapping('mixamorigLeftToeBase.quaternion', 'Left_toe', false, false, false),
+  new AnimationMapping('mixamorigLeftUpLeg.quaternion', 'Left_leg', false, false),
+  new AnimationMapping('mixamorigLeftLeg.quaternion', 'Left_knee', false, false),
+  new AnimationMapping('mixamorigLeftFoot.quaternion', 'Left_ankle', false, false),
+  new AnimationMapping('mixamorigLeftToeBase.quaternion', 'Left_toe', false, false),
 ];

avatars/animationHelpers.js

@@ -377,16 +377,13 @@ export const loadPromise = (async () => {
     grab_right: {animation: animations.index['grab_right.fbx'], speedFactor: 1.2},
     pick_up: {animation: animations.index['pick_up.fbx'], speedFactor: 1},
   };
-  window.activateAnimations = activateAnimations;
   narutoRunAnimations = {
     narutoRun: animations.find(a => a.isNarutoRun),
   };
-  window.narutoRunAnimations = narutoRunAnimations;
   hurtAnimations = {
     pain_back: animations.index['pain_back.fbx'],
     pain_arch: animations.index['pain_arch.fbx'],
   };
-  window.hurtAnimations = hurtAnimations;
   holdAnimations = {
     pick_up_idle: animations.index['pick_up_idle.fbx'],
   };
@@ -694,7 +691,6 @@ export const _applyAnimation = (avatar, now, moveFactors) => {
   } else {
     mirrorFactor = isBackward ? 1 : 0;
   }
-  // if (avatar === window.localPlayer.avatar) console.log(window.logNum(angleFactor), window.logNum(mirrorFactor));
   avatar.lastBackwardFactor = mirrorFactor;
 
   if (avatar.emoteAnimation !== avatar.lastEmoteAnimation) {
@@ -1015,35 +1011,38 @@ export const _applyAnimation = (avatar, now, moveFactors) => {
           animationTrackName: k,
           dst,
           // isTop,
-          isArm,
           isPosition,
         } = spec;
 
-        _handleDefault(spec);
-
         const aimAnimation = (avatar.aimAnimation && aimAnimations[avatar.aimAnimation]);
-        if (aimAnimation) {
-          const t2 = (avatar.aimTime / aimMaxTime) % aimAnimation.duration;
-          const transitionFactor = Math.min(1, avatar.aimTime / 200);
-          if (!isPosition) {
+        _handleDefault(spec);
+        const t2 = (avatar.aimTime / aimMaxTime) % aimAnimation.duration;
+        if (!isPosition) {
+          if (aimAnimation) {
             const src2 = aimAnimation.interpolants[k];
             const v2 = src2.evaluate(t2);
-            localQuaternion2.fromArray(v2);
 
-            if (isArm) {
-              dst.slerp(localQuaternion2, transitionFactor * 0.5);
-            } else {
-              const t = (0.5 - idleWalkFactor * 0.5) * transitionFactor;
-              dst.slerp(localQuaternion2, t);
-            }
-          } else {
-            const src2 = aimAnimation.interpolants[k];
-            const v2 = src2.evaluate(t2);
-            localVector2.fromArray(v2);
-            _clearXZ(localVector2, isPosition);
+            const idleAnimation = _getIdleAnimation('walk');
+            const t3 = 0;
+            const src3 = idleAnimation.interpolants[k];
+            const v3 = src3.evaluate(t3);
 
-            dst.lerp(localVector2, crouchFactor * transitionFactor);
+            dst
+              .premultiply(localQuaternion2.fromArray(v3).invert())
+              .premultiply(localQuaternion2.fromArray(v2));
           }
+        } else {
+          const src2 = aimAnimation.interpolants[k];
+          const v2 = src2.evaluate(t2);
+
+          const idleAnimation = _getIdleAnimation('walk');
+          const t3 = 0;
+          const src3 = idleAnimation.interpolants[k];
+          const v3 = src3.evaluate(t3);
+
+          dst
+            .sub(localVector2.fromArray(v3))
+            .add(localVector2.fromArray(v2));
         }
       };
     } else if (avatar.unuseAnimation && avatar.unuseTime >= 0) {