@memori.ai/memori-react 7.13.4 → 7.14.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/components/Avatar/Avatar.css +2 -2
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +15 -7
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +7 -4
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.d.ts +38 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.js +181 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.d.ts +19 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.js +60 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar/MorhTargetController.js → controllers/MorphTargetController.js} +6 -4
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controllers/MorphTargetController.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +3 -3
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/dist/components/layouts/Totem.js +1 -1
- package/dist/components/layouts/Totem.js.map +1 -1
- package/esm/components/Avatar/Avatar.css +2 -2
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +15 -7
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +6 -3
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.d.ts +38 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.js +177 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.d.ts +19 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.js +56 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar/MorhTargetController.js → controllers/MorphTargetController.js} +6 -4
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controllers/MorphTargetController.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +2 -2
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/esm/components/layouts/Totem.js +1 -1
- package/esm/components/layouts/Totem.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Avatar/Avatar.css +2 -2
- package/src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx +115 -67
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx +5 -3
- package/src/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar → controllers}/AnimationController.ts +52 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/{PositionController.ts → controllers/AvatarPositionController.ts} +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/{MorphTargetController.ts → controllers/MorphTargetController.ts} +1 -2
- package/src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx +2 -2
- package/src/components/layouts/Totem.tsx +1 -1
- package/src/index.stories.tsx +16 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js.map +0 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts +0 -17
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js +0 -25
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map +0 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +0 -26
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +0 -166
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +0 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js.map +0 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts +0 -17
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js +0 -22
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map +0 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +0 -26
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +0 -163
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +0 -1
- /package/dist/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar/MorhTargetController.d.ts → controllers/MorphTargetController.d.ts} +0 -0
- /package/esm/components/Avatar/AvatarView/AvatarComponent/components/{FullbodyAvatar/MorhTargetController.d.ts → controllers/MorphTargetController.d.ts} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [7.14.1](https://github.com/memori-ai/memori-react/compare/v7.14.0...v7.14.1) (2025-01-20)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* update Avatar component props in TotemLayout to include chatProps ([04c9737](https://github.com/memori-ai/memori-react/commit/04c97374bbb3af9b7c824f153d040242f1db6ddc))
|
|
9
|
+
|
|
10
|
+
## [7.14.0](https://github.com/memori-ai/memori-react/compare/v7.13.4...v7.14.0) (2025-01-16)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* add AnimationSequenceTest story ([2be61d9](https://github.com/memori-ai/memori-react/commit/2be61d97fbdac1436bc11503a1201a1b1c35a7bd))
|
|
16
|
+
* added sequence animation handling system ([e2d6518](https://github.com/memori-ai/memori-react/commit/e2d65186a3a4d52d30b7d4cf9c47085adba4a56e))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### Changes
|
|
20
|
+
|
|
21
|
+
* moved AnimationController to controllers directory ([bef5e76](https://github.com/memori-ai/memori-react/commit/bef5e76aa8e503802ccf19b72d1277a145c0255a))
|
|
22
|
+
* rename AnimationSequenceTest to MoodChefAssistant and simplify args ([438dc8c](https://github.com/memori-ai/memori-react/commit/438dc8c5ba52a827068323bc4c338434cdd12dfe))
|
|
23
|
+
* replaced AvatarPositionController and MorphTargetController directory position ([12fd311](https://github.com/memori-ai/memori-react/commit/12fd311444c09f55a60f948db09829c1a06139b5))
|
|
24
|
+
|
|
3
25
|
## [7.13.4](https://github.com/memori-ai/memori-react/compare/v7.13.3...v7.13.4) (2025-01-15)
|
|
4
26
|
|
|
5
27
|
|
|
@@ -61,12 +61,12 @@
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
@media (max-width: 870px) {
|
|
64
|
-
.memori--avatar-wrapper div,
|
|
64
|
+
/* .memori--avatar-wrapper div,
|
|
65
65
|
.memori--avatar-wrapper canvas,
|
|
66
66
|
.memori--avatar-wrapper model-viewer {
|
|
67
67
|
width: 150px !important;
|
|
68
68
|
height: 150px !important;
|
|
69
|
-
}
|
|
69
|
+
} */
|
|
70
70
|
|
|
71
71
|
.memori--avatar-wrapper model-viewer {
|
|
72
72
|
margin-top: 2rem;
|
|
@@ -38,12 +38,12 @@ const AvatarView = ({ stopProcessing, chatEmission, showControls, animation, url
|
|
|
38
38
|
}
|
|
39
39
|
if (isRPM) {
|
|
40
40
|
const emotion = handleRPMBlendShape(outputContent);
|
|
41
|
-
setEmotionMorphTargets(
|
|
41
|
+
setEmotionMorphTargets(_ => ({ ...defaultEmotions, ...emotion }));
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
44
|
const emotion = handleCustomGLBBlendShape(outputContent);
|
|
45
45
|
const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
|
|
46
|
-
setEmotionMorphTargets(
|
|
46
|
+
setEmotionMorphTargets(_ => ({ ...defaultEmotions, ...emotionValues }));
|
|
47
47
|
}
|
|
48
48
|
}, [isRPM, handleRPMBlendShape, handleCustomGLBBlendShape]);
|
|
49
49
|
const onBaseActionChange = (0, react_1.useCallback)((action, outputContent) => {
|
|
@@ -57,19 +57,27 @@ const AvatarView = ({ stopProcessing, chatEmission, showControls, animation, url
|
|
|
57
57
|
setMorphTargetDictionary(dictionary);
|
|
58
58
|
}, []);
|
|
59
59
|
(0, react_1.useEffect)(() => {
|
|
60
|
-
var _a, _b;
|
|
60
|
+
var _a, _b, _c, _d;
|
|
61
61
|
if (loading) {
|
|
62
62
|
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
63
63
|
onBaseActionChange(`Loading${randomNumber}`, '');
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
const
|
|
67
|
-
const
|
|
66
|
+
const hasOutputTagEmotion = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.includes('<output class="memori-emotion">');
|
|
67
|
+
const outputContentEmotion = hasOutputTagEmotion
|
|
68
68
|
? (_b = (_a = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.split('<output class="memori-emotion">')[1]) === null || _a === void 0 ? void 0 : _a.split('</output>')[0]) === null || _b === void 0 ? void 0 : _b.trim()
|
|
69
69
|
: null;
|
|
70
|
-
|
|
70
|
+
const hasOutputTagSequence = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.includes('<output class="animation-sequence">');
|
|
71
|
+
const outputContentSequence = hasOutputTagSequence
|
|
72
|
+
? (_d = (_c = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.split('<output class="animation-sequence">')[1]) === null || _c === void 0 ? void 0 : _c.split('</output>')[0]) === null || _d === void 0 ? void 0 : _d.trim()
|
|
73
|
+
: null;
|
|
74
|
+
if (outputContentSequence && outputContentSequence.includes('->')) {
|
|
75
|
+
onBaseActionChange(outputContentSequence, outputContentSequence);
|
|
76
|
+
}
|
|
77
|
+
else if (outputContentEmotion) {
|
|
78
|
+
console.log('[AvatarView] outputContentEmotion:', outputContentEmotion);
|
|
71
79
|
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
72
|
-
onBaseActionChange(`${
|
|
80
|
+
onBaseActionChange(`${outputContentEmotion}${randomNumber}`, outputContentEmotion);
|
|
73
81
|
}
|
|
74
82
|
else {
|
|
75
83
|
const randomNumber = Math.floor(Math.random() * 5) + 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":";;;;;AACA,iCAAgE;AAChE,6EAA0D;AAC1D,+EAA4E;AAC5E,yFAAyD;AACzD,2CAIqB;
|
|
1
|
+
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,9 @@ const three_1 = require("three");
|
|
|
7
7
|
const drei_1 = require("@react-three/drei");
|
|
8
8
|
const fiber_1 = require("@react-three/fiber");
|
|
9
9
|
const types_1 = require("./types");
|
|
10
|
-
const AnimationController_1 = require("
|
|
11
|
-
const MorphTargetController_1 = require("../MorphTargetController");
|
|
12
|
-
const
|
|
10
|
+
const AnimationController_1 = require("../controllers/AnimationController");
|
|
11
|
+
const MorphTargetController_1 = require("../controllers/MorphTargetController");
|
|
12
|
+
const AvatarPositionController_1 = require("../controllers/AvatarPositionController");
|
|
13
13
|
const constants_1 = require("../../constants");
|
|
14
14
|
function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight = 50, avatarDepth = 0, onCameraZChange, }) {
|
|
15
15
|
var _a;
|
|
@@ -27,7 +27,7 @@ function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeB
|
|
|
27
27
|
});
|
|
28
28
|
(0, react_1.useEffect)(() => {
|
|
29
29
|
if (!positionControllerRef.current) {
|
|
30
|
-
positionControllerRef.current = new
|
|
30
|
+
positionControllerRef.current = new AvatarPositionController_1.AvatarPositionController(constants_1.AVATAR_POSITION);
|
|
31
31
|
}
|
|
32
32
|
if (!actions || !scene)
|
|
33
33
|
return;
|
|
@@ -96,6 +96,9 @@ function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeB
|
|
|
96
96
|
animationControllerRef.current.updateIsChatAlreadyStarted(true);
|
|
97
97
|
animationControllerRef.current.transitionTo(types_1.AnimationState.LOADING, currentBaseAction.action);
|
|
98
98
|
}
|
|
99
|
+
else if (currentBaseAction.action.includes('->')) {
|
|
100
|
+
animationControllerRef.current.playSequence(currentBaseAction.action);
|
|
101
|
+
}
|
|
99
102
|
else if (currentBaseAction.action.startsWith('Idle')) {
|
|
100
103
|
animationControllerRef.current.transitionTo(types_1.AnimationState.IDLE);
|
|
101
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,iCAKe;AACf,4CAA2D;AAC3D,8CAA8C;AAC9C,mCAA8D;AAC9D
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,iCAKe;AACf,4CAA2D;AAC3D,8CAA8C;AAC9C,mCAA8D;AAC9D,4EAAyE;AACzE,gFAA6E;AAC7E,sFAAmF;AACnF,+CAOyB;AAEzB,SAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,GAAG,EAAE,EACjB,WAAW,GAAG,CAAC,EACf,eAAe,GACK;;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAO,EAAC,0BAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,oBAAa,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAErD,MAAM,sBAAsB,GAAG,IAAA,cAAM,GAAuB,CAAC;IAC7D,MAAM,wBAAwB,GAAG,IAAA,cAAM,GAAyB,CAAC;IACjE,MAAM,qBAAqB,GAAG,IAAA,cAAM,GAA4B,CAAC;IAEjE,MAAM,aAAa,GAAG,IAAA,cAAM,EAAC;QAC3B,UAAU,EAAE,KAAK;QACjB,aAAa,EAAE,CAAC;QAChB,aAAa,EAAE,CAAC;QAChB,cAAc,EAAE,CAAC;KAClB,CAAC,CAAC;IAGH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,qBAAqB,CAAC,OAAO,EAAE;YAClC,qBAAqB,CAAC,OAAO,GAAG,IAAI,mDAAwB,CAAC,2BAAe,CAAC,CAAC;SAC/E;QAED,IAAI,CAAC,OAAO,IAAI,CAAC,KAAK;YAAE,OAAO;QAE/B,MAAM,KAAK,GAAG,IAAI,sBAAc,CAAC,KAAK,CAAC,CAAC;QACxC,sBAAsB,CAAC,OAAO,GAAG,IAAI,yCAAmB,CACtD,KAAK,EACL,OAA0C,EAC1C,EAAE,GAAG,0BAAc,EAAE,CACtB,CAAC;QAEF,IAAI,QAAQ,EAAE;YAEZ,wBAAwB,CAAC,OAAO,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,CAAC;YAEvE,IAAI,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC,qBAAqB,EAAE;gBAEpE,wBAAwB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;gBACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC;qBAClE,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBAEpD,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;aAC7C;SACF;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACrB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,qBAAqB,CAAC,OAAO,EAAE;YACjC,qBAAqB,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;SACjE;IACH,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,qBAAqB,CAAC,OAAO,IAAI,eAAe,EAAE;YACpD,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;YACjF,eAAe,CAAC,UAAU,CAAC,CAAC;SAC7B;IACH,CAAC,EAAE,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC;IAGnC,MAAM,QAAQ,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC5B,IAAI,SAAkC,CAAC;QACvC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,CAAC,CAAC,MAAgB,EAAE,EAAE;YACnC,IACE,MAAM,YAAY,mBAAW;gBAC7B,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,EACjE;gBAEA,IAAG,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE;oBAC/B,QAAQ,CAAC,KAAK,CAAC,CAAC;iBACjB;qBAAM;oBACL,QAAQ,CAAC,IAAI,CAAC,CAAC;iBAChB;gBACD,SAAS,GAAG,MAAM,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAGX,IAAA,iBAAS,EAAC,GAAG,EAAE;QACd,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ;YAAE,OAAO;QAElC,MAAM,KAAK,GAAG,IAAI,sBAAc,CAAC,KAAK,CAAC,CAAC;QACxC,sBAAsB,CAAC,OAAO,GAAG,IAAI,yCAAmB,CACtD,KAAK,EACL,OAA0C,EAC1C,EAAE,GAAG,0BAAc,EAAE,CACtB,CAAC;QAEF,wBAAwB,CAAC,OAAO,GAAG,IAAI,6CAAqB,CAAC,QAAQ,CAAC,CAAC;QAGvE,IAAI,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC,qBAAqB,EAAE;YACpE,wBAAwB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;YACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CACnC,QAAQ,CAAC,qBAAqB,CAC/B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YACnD,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;SAC7C;IACH,CAAC,EAAE;QACD,OAAO;QACP,QAAQ;QACR,KAAK;QACL,wBAAwB;QACxB,wBAAwB;QACxB,SAAS;KACV,CAAC,CAAC;IAGH,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,sBAAsB,CAAC,OAAO;YAAE,OAAO;QAE5C,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAClD,sBAAsB,CAAC,OAAO,CAAC,0BAA0B,CAAC,IAAI,CAAC,CAAC;YAChE,sBAAsB,CAAC,OAAO,CAAC,YAAY,CACzC,sBAAc,CAAC,OAAO,EACtB,iBAAiB,CAAC,MAAM,CACzB,CAAC;SACH;aAAO,IAAI,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACnD,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;SACvE;aAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YACtD,sBAAsB,CAAC,OAAO,CAAC,YAAY,CAAC,sBAAc,CAAC,IAAI,CAAC,CAAC;SAClE;aAAM;YACL,sBAAsB,CAAC,OAAO,CAAC,YAAY,CACzC,sBAAc,CAAC,OAAO,EACtB,iBAAiB,CAAC,MAAM,CACzB,CAAC;SACH;IACH,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAGxB,IAAA,iBAAS,EAAC,GAAG,EAAE;;QACb,MAAA,sBAAsB,CAAC,OAAO,0CAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAIhB,IAAA,gBAAQ,EAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;;QACxB,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAGnD,MAAA,sBAAsB,CAAC,OAAO,0CAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAG9C,IAAI,wBAAwB,CAAC,OAAO,EAAE;YACpC,MAAM,aAAa,GAAG,mBAAmB,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;YAC9D,wBAAwB,CAAC,OAAO,CAAC,kBAAkB,CACjD,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,QAAQ,IAAI,KAAK,EACjB,aAAa,CAAC,OAAO,CACtB,CAAC;SACH;QAGD,IAAI,KAAK,IAAI,qBAAqB,CAAC,OAAO,EAAE;YAC1C,MAAM,QAAQ,GAAG,qBAAqB,CAAC,OAAO,CAAC,WAAW,CAAC,6BAAiB,CAAC,CAAC;YAC9E,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IAGH,MAAM,QAAQ,GAAG,CAAA,MAAA,qBAAqB,CAAC,OAAO,0CAAE,WAAW,EAAE,KAAI,2BAAe,CAAC;IAEjF,OAAO,CACL,kCACE,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,2BAAe,YAEzB,sCAAW,MAAM,EAAE,KAAK,GAAI,GACtB,CACT,CAAC;AACJ,CAAC;AA3LD,wCA2LC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { AnimationState, AnimationConfig } from '../FullbodyAvatar/types';
|
|
2
|
+
import { AnimationAction, AnimationMixer } from 'three';
|
|
3
|
+
export declare class AnimationController {
|
|
4
|
+
private currentState;
|
|
5
|
+
private currentAction;
|
|
6
|
+
private mixer;
|
|
7
|
+
private actions;
|
|
8
|
+
private config;
|
|
9
|
+
private lastIdleIndex;
|
|
10
|
+
private isTransitioning;
|
|
11
|
+
private currentIdleLoopCount;
|
|
12
|
+
private readonly MAX_IDLE_LOOPS;
|
|
13
|
+
private lastAnimationTime;
|
|
14
|
+
private isChatAlreadyStarted;
|
|
15
|
+
private sequence;
|
|
16
|
+
private sequenceIndex;
|
|
17
|
+
constructor(mixer: AnimationMixer, actions: Record<string, AnimationAction>, config?: AnimationConfig);
|
|
18
|
+
private checkForLoop;
|
|
19
|
+
private forceIdleChange;
|
|
20
|
+
private getNextIdleAnimation;
|
|
21
|
+
playSequence(sequenceString: string): void;
|
|
22
|
+
private parseAnimationName;
|
|
23
|
+
transitionTo(state: AnimationState, emotionName?: string): void;
|
|
24
|
+
update(delta: number): void;
|
|
25
|
+
getCurrentState(): AnimationState;
|
|
26
|
+
getLoopCount(): number;
|
|
27
|
+
setTimeScale(timeScale: number): void;
|
|
28
|
+
updateIsChatAlreadyStarted(isChatAlreadyStarted: boolean): void;
|
|
29
|
+
getDebugInfo(): {
|
|
30
|
+
currentState: AnimationState;
|
|
31
|
+
currentIdleIndex: number;
|
|
32
|
+
loopCount: number;
|
|
33
|
+
currentTime: number;
|
|
34
|
+
lastTime: number;
|
|
35
|
+
isTransitioning: boolean;
|
|
36
|
+
isChatAlreadyStarted: boolean;
|
|
37
|
+
};
|
|
38
|
+
}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AnimationController = void 0;
|
|
4
|
+
const types_1 = require("../FullbodyAvatar/types");
|
|
5
|
+
const three_1 = require("three");
|
|
6
|
+
const constants_1 = require("../../constants");
|
|
7
|
+
class AnimationController {
|
|
8
|
+
constructor(mixer, actions, config = constants_1.DEFAULT_CONFIG) {
|
|
9
|
+
this.currentState = types_1.AnimationState.LOADING;
|
|
10
|
+
this.currentAction = null;
|
|
11
|
+
this.lastIdleIndex = -1;
|
|
12
|
+
this.isTransitioning = false;
|
|
13
|
+
this.currentIdleLoopCount = 0;
|
|
14
|
+
this.MAX_IDLE_LOOPS = constants_1.MAX_IDLE_LOOPS_DEFAULT;
|
|
15
|
+
this.lastAnimationTime = 0;
|
|
16
|
+
this.isChatAlreadyStarted = false;
|
|
17
|
+
this.sequence = null;
|
|
18
|
+
this.sequenceIndex = 0;
|
|
19
|
+
this.mixer = mixer;
|
|
20
|
+
this.actions = actions;
|
|
21
|
+
this.config = config;
|
|
22
|
+
}
|
|
23
|
+
checkForLoop() {
|
|
24
|
+
if (!this.currentAction || this.currentState !== types_1.AnimationState.IDLE)
|
|
25
|
+
return;
|
|
26
|
+
const clip = this.currentAction.getClip();
|
|
27
|
+
const currentTime = this.currentAction.time;
|
|
28
|
+
if (currentTime < this.lastAnimationTime) {
|
|
29
|
+
this.currentIdleLoopCount++;
|
|
30
|
+
if (this.currentIdleLoopCount >= this.MAX_IDLE_LOOPS) {
|
|
31
|
+
this.forceIdleChange();
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
this.lastAnimationTime = currentTime;
|
|
35
|
+
}
|
|
36
|
+
forceIdleChange() {
|
|
37
|
+
this.currentIdleLoopCount = 0;
|
|
38
|
+
this.lastAnimationTime = 0;
|
|
39
|
+
this.transitionTo(types_1.AnimationState.IDLE);
|
|
40
|
+
}
|
|
41
|
+
getNextIdleAnimation() {
|
|
42
|
+
let nextIndex;
|
|
43
|
+
do {
|
|
44
|
+
nextIndex = Math.floor(Math.random() * this.config.idleCount) + 1;
|
|
45
|
+
} while (nextIndex === this.lastIdleIndex);
|
|
46
|
+
if (this.isChatAlreadyStarted && nextIndex === 3) {
|
|
47
|
+
nextIndex = this.lastIdleIndex !== 4 ? 4 : 2;
|
|
48
|
+
}
|
|
49
|
+
this.lastIdleIndex = nextIndex;
|
|
50
|
+
const idleAction = this.actions[`Idle${nextIndex}`];
|
|
51
|
+
if (!idleAction) {
|
|
52
|
+
throw new Error(`Idle animation ${nextIndex} not found`);
|
|
53
|
+
}
|
|
54
|
+
return idleAction;
|
|
55
|
+
}
|
|
56
|
+
playSequence(sequenceString) {
|
|
57
|
+
const animations = sequenceString.split('->').map(anim => anim.trim());
|
|
58
|
+
console.log('[AnimationController] playSequence:', animations);
|
|
59
|
+
this.sequence = animations;
|
|
60
|
+
this.sequenceIndex = 0;
|
|
61
|
+
const firstAnim = this.parseAnimationName(animations[0]);
|
|
62
|
+
this.transitionTo(types_1.AnimationState.EMOTION, firstAnim);
|
|
63
|
+
}
|
|
64
|
+
parseAnimationName(animation) {
|
|
65
|
+
const randomMatch = animation.match(/(\w+)\[(\d+),(\d+)\]/);
|
|
66
|
+
if (randomMatch) {
|
|
67
|
+
const [_, base, min, max] = randomMatch;
|
|
68
|
+
const random = Math.floor(Math.random() * (Number(max) - Number(min) + 1)) +
|
|
69
|
+
Number(min);
|
|
70
|
+
return `${base}${random}`;
|
|
71
|
+
}
|
|
72
|
+
return animation;
|
|
73
|
+
}
|
|
74
|
+
transitionTo(state, emotionName) {
|
|
75
|
+
if (this.isTransitioning) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
this.isTransitioning = true;
|
|
79
|
+
try {
|
|
80
|
+
let nextAction = null;
|
|
81
|
+
switch (state) {
|
|
82
|
+
case types_1.AnimationState.LOADING:
|
|
83
|
+
nextAction = this.actions[emotionName || 'Loading1'];
|
|
84
|
+
this.currentIdleLoopCount = 0;
|
|
85
|
+
this.lastAnimationTime = 0;
|
|
86
|
+
break;
|
|
87
|
+
case types_1.AnimationState.EMOTION:
|
|
88
|
+
nextAction = this.actions[emotionName || 'Timore1'];
|
|
89
|
+
this.currentIdleLoopCount = 0;
|
|
90
|
+
this.lastAnimationTime = 0;
|
|
91
|
+
break;
|
|
92
|
+
case types_1.AnimationState.IDLE:
|
|
93
|
+
nextAction = this.getNextIdleAnimation();
|
|
94
|
+
if (this.currentState !== types_1.AnimationState.IDLE) {
|
|
95
|
+
this.currentIdleLoopCount = 0;
|
|
96
|
+
this.lastAnimationTime = 0;
|
|
97
|
+
}
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
if (!nextAction) {
|
|
101
|
+
throw new Error(`No animation found for state: ${state}`);
|
|
102
|
+
}
|
|
103
|
+
if (this.currentAction) {
|
|
104
|
+
this.currentAction.fadeOut(this.config.fadeOutDuration);
|
|
105
|
+
}
|
|
106
|
+
nextAction.reset().fadeIn(this.config.fadeInDuration).play();
|
|
107
|
+
nextAction.timeScale = this.config.timeScale;
|
|
108
|
+
if (state !== types_1.AnimationState.IDLE) {
|
|
109
|
+
nextAction.setLoop(three_1.LoopOnce, 1);
|
|
110
|
+
nextAction.clampWhenFinished = true;
|
|
111
|
+
}
|
|
112
|
+
else {
|
|
113
|
+
nextAction.setLoop(Infinity, Infinity);
|
|
114
|
+
}
|
|
115
|
+
this.currentAction = nextAction;
|
|
116
|
+
this.currentState = state;
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
console.error('[AnimationController] Error during animation transition:', error);
|
|
120
|
+
if (state !== types_1.AnimationState.IDLE) {
|
|
121
|
+
this.transitionTo(types_1.AnimationState.IDLE);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
finally {
|
|
125
|
+
this.isTransitioning = false;
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
update(delta) {
|
|
129
|
+
if (!this.currentAction)
|
|
130
|
+
return;
|
|
131
|
+
this.checkForLoop();
|
|
132
|
+
if (this.sequence &&
|
|
133
|
+
this.currentState === types_1.AnimationState.EMOTION &&
|
|
134
|
+
this.currentAction.time >= this.currentAction.getClip().duration * 0.9) {
|
|
135
|
+
this.sequenceIndex++;
|
|
136
|
+
if (this.sequenceIndex < this.sequence.length) {
|
|
137
|
+
const nextAnim = this.parseAnimationName(this.sequence[this.sequenceIndex]);
|
|
138
|
+
this.transitionTo(types_1.AnimationState.EMOTION, nextAnim);
|
|
139
|
+
}
|
|
140
|
+
else {
|
|
141
|
+
this.sequence = null;
|
|
142
|
+
this.sequenceIndex = 0;
|
|
143
|
+
this.transitionTo(types_1.AnimationState.IDLE);
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
if (this.currentState !== types_1.AnimationState.IDLE &&
|
|
147
|
+
this.currentAction.time >= this.currentAction.getClip().duration * 0.9) {
|
|
148
|
+
this.transitionTo(types_1.AnimationState.IDLE);
|
|
149
|
+
}
|
|
150
|
+
this.mixer.update(delta);
|
|
151
|
+
}
|
|
152
|
+
getCurrentState() {
|
|
153
|
+
return this.currentState;
|
|
154
|
+
}
|
|
155
|
+
getLoopCount() {
|
|
156
|
+
return this.currentIdleLoopCount;
|
|
157
|
+
}
|
|
158
|
+
setTimeScale(timeScale) {
|
|
159
|
+
this.config.timeScale = timeScale;
|
|
160
|
+
if (this.currentAction) {
|
|
161
|
+
this.currentAction.timeScale = timeScale;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
updateIsChatAlreadyStarted(isChatAlreadyStarted) {
|
|
165
|
+
this.isChatAlreadyStarted = isChatAlreadyStarted;
|
|
166
|
+
}
|
|
167
|
+
getDebugInfo() {
|
|
168
|
+
var _a;
|
|
169
|
+
return {
|
|
170
|
+
currentState: this.currentState,
|
|
171
|
+
currentIdleIndex: this.lastIdleIndex,
|
|
172
|
+
loopCount: this.currentIdleLoopCount,
|
|
173
|
+
currentTime: ((_a = this.currentAction) === null || _a === void 0 ? void 0 : _a.time) || 0,
|
|
174
|
+
lastTime: this.lastAnimationTime,
|
|
175
|
+
isTransitioning: this.isTransitioning,
|
|
176
|
+
isChatAlreadyStarted: this.isChatAlreadyStarted,
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
exports.AnimationController = AnimationController;
|
|
181
|
+
//# sourceMappingURL=AnimationController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AnimationController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controllers/AnimationController.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Vector3 } from 'three';
|
|
2
|
+
export declare class AvatarPositionController {
|
|
3
|
+
private currentScale;
|
|
4
|
+
private targetScale;
|
|
5
|
+
private currentPosition;
|
|
6
|
+
private basePosition;
|
|
7
|
+
private defaultPosition;
|
|
8
|
+
private zoomedPosition;
|
|
9
|
+
private initialCameraPosition;
|
|
10
|
+
constructor(defaultPosition?: Vector3, zoomedPosition?: Vector3, initialCameraZ?: number);
|
|
11
|
+
private mapHeightToScale;
|
|
12
|
+
private mapDepthToCamera;
|
|
13
|
+
updateHeight(heightValue: number, isHalfBody: boolean): void;
|
|
14
|
+
updateDepth(depthValue: number, isHalfBody: boolean): number;
|
|
15
|
+
updateBasePosition(isZoomed: boolean): void;
|
|
16
|
+
updateScale(lerpFactor: number): Vector3;
|
|
17
|
+
getPosition(): Vector3;
|
|
18
|
+
reset(): void;
|
|
19
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.AvatarPositionController = void 0;
|
|
4
|
+
const three_1 = require("three");
|
|
5
|
+
const constants_1 = require("../../constants");
|
|
6
|
+
class AvatarPositionController {
|
|
7
|
+
constructor(defaultPosition = constants_1.AVATAR_POSITION.clone(), zoomedPosition = constants_1.AVATAR_POSITION_ZOOMED.clone(), initialCameraZ = 0.6) {
|
|
8
|
+
this.defaultPosition = defaultPosition;
|
|
9
|
+
this.zoomedPosition = zoomedPosition;
|
|
10
|
+
this.currentScale = new three_1.Vector3(1, 1, 1);
|
|
11
|
+
this.targetScale = new three_1.Vector3(1, 1, 1);
|
|
12
|
+
this.currentPosition = defaultPosition.clone();
|
|
13
|
+
this.basePosition = defaultPosition.clone();
|
|
14
|
+
this.initialCameraPosition = new three_1.Vector3(0, 0, initialCameraZ);
|
|
15
|
+
}
|
|
16
|
+
mapHeightToScale(sliderValue, isHalfBody) {
|
|
17
|
+
if (isHalfBody) {
|
|
18
|
+
return three_1.MathUtils.lerp(1.4, 2.1, sliderValue / 100);
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
return three_1.MathUtils.lerp(0.5, 1.5, sliderValue / 100);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
mapDepthToCamera(depthValue, isHalfBody) {
|
|
25
|
+
const baseZ = this.initialCameraPosition.z;
|
|
26
|
+
if (isHalfBody) {
|
|
27
|
+
return three_1.MathUtils.lerp(baseZ, baseZ + 3, depthValue / 100);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
return three_1.MathUtils.lerp(baseZ, baseZ + 3, depthValue / 100);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
updateHeight(heightValue, isHalfBody) {
|
|
34
|
+
const heightScale = this.mapHeightToScale(heightValue, isHalfBody);
|
|
35
|
+
this.targetScale.set(heightScale, heightScale, heightScale);
|
|
36
|
+
}
|
|
37
|
+
updateDepth(depthValue, isHalfBody) {
|
|
38
|
+
return this.mapDepthToCamera(depthValue, isHalfBody);
|
|
39
|
+
}
|
|
40
|
+
updateBasePosition(isZoomed) {
|
|
41
|
+
const newPosition = isZoomed ? this.zoomedPosition : this.defaultPosition;
|
|
42
|
+
this.basePosition.copy(newPosition);
|
|
43
|
+
this.currentPosition.copy(newPosition);
|
|
44
|
+
}
|
|
45
|
+
updateScale(lerpFactor) {
|
|
46
|
+
this.currentScale.lerp(this.targetScale, lerpFactor);
|
|
47
|
+
return this.currentScale;
|
|
48
|
+
}
|
|
49
|
+
getPosition() {
|
|
50
|
+
return this.currentPosition;
|
|
51
|
+
}
|
|
52
|
+
reset() {
|
|
53
|
+
this.currentScale.set(1, 1, 1);
|
|
54
|
+
this.targetScale.set(1, 1, 1);
|
|
55
|
+
this.currentPosition.copy(this.defaultPosition);
|
|
56
|
+
this.basePosition.copy(this.defaultPosition);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
exports.AvatarPositionController = AvatarPositionController;
|
|
60
|
+
//# sourceMappingURL=AvatarPositionController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AvatarPositionController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controllers/AvatarPositionController.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MorphTargetController = void 0;
|
|
4
4
|
const three_1 = require("three");
|
|
5
|
-
const constants_1 = require("
|
|
5
|
+
const constants_1 = require("../../constants");
|
|
6
6
|
class MorphTargetController {
|
|
7
7
|
constructor(headMesh) {
|
|
8
8
|
this.currentEmotionValues = {};
|
|
@@ -12,6 +12,7 @@ class MorphTargetController {
|
|
|
12
12
|
updateMorphTargets(currentTime, emotionMorphTargets, currentViseme, eyeBlink, blinkState) {
|
|
13
13
|
if (!this.headMesh.morphTargetDictionary ||
|
|
14
14
|
!this.headMesh.morphTargetInfluences) {
|
|
15
|
+
console.error('[MorphTargetController] Missing morphTargetDictionary or morphTargetInfluences');
|
|
15
16
|
return;
|
|
16
17
|
}
|
|
17
18
|
const blinkValue = this.calculateBlinkValue(currentTime, blinkState, eyeBlink);
|
|
@@ -23,7 +24,7 @@ class MorphTargetController {
|
|
|
23
24
|
if (currentEmotionKeys.has(key)) {
|
|
24
25
|
const targetEmotionValue = emotionMorphTargets[key];
|
|
25
26
|
const currentEmotionValue = this.currentEmotionValues[key] || 0;
|
|
26
|
-
const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue *
|
|
27
|
+
const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue * 3, constants_1.EMOTION_SMOOTHING);
|
|
27
28
|
this.currentEmotionValues[key] = newEmotionValue;
|
|
28
29
|
targetValue += newEmotionValue;
|
|
29
30
|
}
|
|
@@ -35,7 +36,8 @@ class MorphTargetController {
|
|
|
35
36
|
}
|
|
36
37
|
targetValue = three_1.MathUtils.clamp(targetValue, 0, 1);
|
|
37
38
|
if (this.headMesh.morphTargetInfluences) {
|
|
38
|
-
|
|
39
|
+
const finalValue = three_1.MathUtils.lerp(this.headMesh.morphTargetInfluences[index] || 0, targetValue, constants_1.VISEME_SMOOTHING);
|
|
40
|
+
this.headMesh.morphTargetInfluences[index] = finalValue;
|
|
39
41
|
}
|
|
40
42
|
});
|
|
41
43
|
this.previousEmotionKeys = currentEmotionKeys;
|
|
@@ -70,4 +72,4 @@ class MorphTargetController {
|
|
|
70
72
|
}
|
|
71
73
|
}
|
|
72
74
|
exports.MorphTargetController = MorphTargetController;
|
|
73
|
-
//# sourceMappingURL=
|
|
75
|
+
//# sourceMappingURL=MorphTargetController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MorphTargetController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controllers/MorphTargetController.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ const three_1 = require("three");
|
|
|
7
7
|
const drei_1 = require("@react-three/drei");
|
|
8
8
|
const fiber_1 = require("@react-three/fiber");
|
|
9
9
|
const utils_1 = require("../../../../../helpers/utils");
|
|
10
|
-
const MorphTargetController_1 = require("./MorphTargetController");
|
|
11
|
-
const
|
|
10
|
+
const MorphTargetController_1 = require("./controllers/MorphTargetController");
|
|
11
|
+
const AvatarPositionController_1 = require("./controllers/AvatarPositionController");
|
|
12
12
|
const constants_1 = require("../constants");
|
|
13
13
|
const utils_2 = require("../../utils/utils");
|
|
14
14
|
const useHeadMovement_1 = tslib_1.__importDefault(require("../../utils/useHeadMovement"));
|
|
@@ -39,7 +39,7 @@ function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionar
|
|
|
39
39
|
}, [scene]);
|
|
40
40
|
(0, react_1.useEffect)(() => {
|
|
41
41
|
if (!positionControllerRef.current) {
|
|
42
|
-
positionControllerRef.current = new
|
|
42
|
+
positionControllerRef.current = new AvatarPositionController_1.AvatarPositionController(constants_1.AVATAR_POSITION, constants_1.AVATAR_POSITION_ZOOMED);
|
|
43
43
|
}
|
|
44
44
|
if (headMesh) {
|
|
45
45
|
morphTargetControllerRef.current = new MorphTargetController_1.MorphTargetController(headMesh);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,iCAA8C;AAC9C,4CAA4C;AAC5C,8CAAkE;AAClE,wDAA+E;AAC/E
|
|
1
|
+
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
5
|
const Spin_1 = tslib_1.__importDefault(require("../ui/Spin"));
|
|
6
|
-
const TotemLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [integrationStyle, integrationBackground, (0, jsx_runtime_1.jsxs)(Spin_1.default, { spinning: loading, className: "memori-totem-layout", children: [poweredBy, (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--header", children: Header && headerProps && (0, jsx_runtime_1.jsx)(Header, { ...headerProps }) }), (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--avatar", children: Avatar && avatarProps && (0, jsx_runtime_1.jsx)(Avatar, { ...avatarProps, isTotem: true }) }), (0, jsx_runtime_1.jsx)("div", { id: "extension" }), (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--controls", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? ((0, jsx_runtime_1.jsx)(Chat, { ...chatProps })) : startPanelProps ? ((0, jsx_runtime_1.jsx)(StartPanel, { ...startPanelProps })) : null })] })] }));
|
|
6
|
+
const TotemLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [integrationStyle, integrationBackground, (0, jsx_runtime_1.jsxs)(Spin_1.default, { spinning: loading, className: "memori-totem-layout", children: [poweredBy, (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--header", children: Header && headerProps && (0, jsx_runtime_1.jsx)(Header, { ...headerProps }) }), (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--avatar", children: Avatar && avatarProps && (0, jsx_runtime_1.jsx)(Avatar, { chatProps: chatProps, ...avatarProps, isTotem: true }) }), (0, jsx_runtime_1.jsx)("div", { id: "extension" }), (0, jsx_runtime_1.jsx)("div", { className: "memori-totem-layout--controls", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? ((0, jsx_runtime_1.jsx)(Chat, { ...chatProps })) : startPanelProps ? ((0, jsx_runtime_1.jsx)(StartPanel, { ...startPanelProps })) : null })] })] }));
|
|
7
7
|
exports.default = TotemLayout;
|
|
8
8
|
//# sourceMappingURL=Totem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Totem.js","sourceRoot":"","sources":["../../../src/components/layouts/Totem.tsx"],"names":[],"mappings":";;;;AACA,8DAA8B;AAG9B,MAAM,WAAW,GAA0B,CAAC,EAC1C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,6DACG,gBAAgB,EAChB,qBAAqB,EAEtB,wBAAC,cAAI,IAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAC,qBAAqB,aACrD,SAAS,EAEV,gCAAK,SAAS,EAAC,6BAA6B,YACzC,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,OAAK,WAAW,GAAI,GACjD,EAEN,gCAAK,SAAS,EAAC,6BAA6B,YACzC,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"Totem.js","sourceRoot":"","sources":["../../../src/components/layouts/Totem.tsx"],"names":[],"mappings":";;;;AACA,8DAA8B;AAG9B,MAAM,WAAW,GAA0B,CAAC,EAC1C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,6DACG,gBAAgB,EAChB,qBAAqB,EAEtB,wBAAC,cAAI,IAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAC,qBAAqB,aACrD,SAAS,EAEV,gCAAK,SAAS,EAAC,6BAA6B,YACzC,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,OAAK,WAAW,GAAI,GACjD,EAEN,gCAAK,SAAS,EAAC,6BAA6B,YACzC,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,IAAC,SAAS,EAAE,SAAS,KAAM,WAAW,EAAE,OAAO,SAAG,GAC/E,EAEN,gCAAK,EAAE,EAAC,WAAW,GAAG,EAEtB,gCAAK,SAAS,EAAC,+BAA+B,YAC3C,SAAS,IAAI,qBAAqB,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CACzD,uBAAC,IAAI,OAAK,SAAS,GAAI,CACxB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CACpB,uBAAC,UAAU,OAAK,eAAe,GAAI,CACpC,CAAC,CAAC,CAAC,IAAI,GACJ,IACD,IACN,CACJ,CAAC;AAEF,kBAAe,WAAW,CAAC"}
|
|
@@ -61,12 +61,12 @@
|
|
|
61
61
|
}
|
|
62
62
|
|
|
63
63
|
@media (max-width: 870px) {
|
|
64
|
-
.memori--avatar-wrapper div,
|
|
64
|
+
/* .memori--avatar-wrapper div,
|
|
65
65
|
.memori--avatar-wrapper canvas,
|
|
66
66
|
.memori--avatar-wrapper model-viewer {
|
|
67
67
|
width: 150px !important;
|
|
68
68
|
height: 150px !important;
|
|
69
|
-
}
|
|
69
|
+
} */
|
|
70
70
|
|
|
71
71
|
.memori--avatar-wrapper model-viewer {
|
|
72
72
|
margin-top: 2rem;
|