@memori.ai/memori-react 7.8.2 → 7.8.3
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 +18 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +2 -2
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/MemoriWidget/MemoriWidget.js +34 -26
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/context/visemeContext.d.ts +5 -2
- package/dist/context/visemeContext.js +142 -47
- package/dist/context/visemeContext.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +2 -2
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/MemoriWidget/MemoriWidget.js +35 -27
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/context/visemeContext.d.ts +5 -2
- package/esm/context/visemeContext.js +141 -46
- package/esm/context/visemeContext.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx +6 -2
- package/src/components/MemoriWidget/MemoriWidget.tsx +62 -32
- package/src/context/visemeContext.tsx +250 -72
- package/dist/components/Avatar/AvatarView/components/avatar.d.ts +0 -9
- package/dist/components/Avatar/AvatarView/components/avatar.js +0 -39
- package/dist/components/Avatar/AvatarView/components/avatar.js.map +0 -1
- package/dist/components/Avatar/AvatarView/components/controls.d.ts +0 -23
- package/dist/components/Avatar/AvatarView/components/controls.js +0 -55
- package/dist/components/Avatar/AvatarView/components/controls.js.map +0 -1
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.d.ts +0 -19
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js +0 -59
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +0 -1
- package/dist/components/Avatar/AvatarView/components/halfbodyAvatar.d.ts +0 -9
- package/dist/components/Avatar/AvatarView/components/halfbodyAvatar.js +0 -39
- package/dist/components/Avatar/AvatarView/components/halfbodyAvatar.js.map +0 -1
- package/dist/components/Avatar/AvatarView/components/loader.d.ts +0 -5
- package/dist/components/Avatar/AvatarView/components/loader.js +0 -12
- package/dist/components/Avatar/AvatarView/components/loader.js.map +0 -1
- package/dist/components/Avatar/AvatarView/utils/useMouthSpeaking.d.ts +0 -2
- package/dist/components/Avatar/AvatarView/utils/useMouthSpeaking.js +0 -68
- package/dist/components/Avatar/AvatarView/utils/useMouthSpeaking.js.map +0 -1
- package/dist/components/Avatar/AvatarView/utils/useViseme.d.ts +0 -18
- package/dist/components/Avatar/AvatarView/utils/useViseme.js +0 -141
- package/dist/components/Avatar/AvatarView/utils/useViseme.js.map +0 -1
- package/dist/components/Avatar/AvatarView/utils/visemeContext.d.ts +0 -24
- package/dist/components/Avatar/AvatarView/utils/visemeContext.js +0 -157
- package/dist/components/Avatar/AvatarView/utils/visemeContext.js.map +0 -1
- package/dist/components/AvatarView/components/avatar.d.ts +0 -9
- package/dist/components/AvatarView/components/avatar.js +0 -35
- package/dist/components/AvatarView/components/avatar.js.map +0 -1
- package/dist/components/AvatarView/components/fullbodyAvatar.d.ts +0 -10
- package/dist/components/AvatarView/components/fullbodyAvatar.js +0 -62
- package/dist/components/AvatarView/components/fullbodyAvatar.js.map +0 -1
- package/dist/components/AvatarView/components/loader.d.ts +0 -5
- package/dist/components/AvatarView/components/loader.js +0 -12
- package/dist/components/AvatarView/components/loader.js.map +0 -1
- package/dist/components/AvatarView/index.d.ts +0 -17
- package/dist/components/AvatarView/index.js +0 -35
- package/dist/components/AvatarView/index.js.map +0 -1
- package/dist/components/AvatarView/utils/useEyeBlink.d.ts +0 -2
- package/dist/components/AvatarView/utils/useEyeBlink.js +0 -40
- package/dist/components/AvatarView/utils/useEyeBlink.js.map +0 -1
- package/dist/components/AvatarView/utils/useHeadMovement.d.ts +0 -2
- package/dist/components/AvatarView/utils/useHeadMovement.js +0 -53
- package/dist/components/AvatarView/utils/useHeadMovement.js.map +0 -1
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.d.ts +0 -2
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.js +0 -34
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.js.map +0 -1
- package/dist/components/AvatarView/utils/useMouthSpeaking.d.ts +0 -2
- package/dist/components/AvatarView/utils/useMouthSpeaking.js +0 -60
- package/dist/components/AvatarView/utils/useMouthSpeaking.js.map +0 -1
- package/dist/components/AvatarView/utils/useSmile.d.ts +0 -2
- package/dist/components/AvatarView/utils/useSmile.js +0 -30
- package/dist/components/AvatarView/utils/useSmile.js.map +0 -1
- package/dist/components/AvatarView/utils/utils.d.ts +0 -13
- package/dist/components/AvatarView/utils/utils.js +0 -42
- package/dist/components/AvatarView/utils/utils.js.map +0 -1
- package/dist/components/MemoriWidget/enhanceSSML/enhanceSSML.d.ts +0 -4
- package/dist/components/MemoriWidget/enhanceSSML/enhanceSSML.js +0 -157
- package/dist/components/MemoriWidget/enhanceSSML/enhanceSSML.js.map +0 -1
- package/dist/components/layouts/ZoomedHalfBody.d.ts +0 -4
- package/dist/components/layouts/ZoomedHalfBody.js +0 -8
- package/dist/components/layouts/ZoomedHalfBody.js.map +0 -1
- package/dist/components/layouts/zoomed-half-body.css +0 -3
- package/esm/components/Avatar/AvatarView/components/avatar.d.ts +0 -9
- package/esm/components/Avatar/AvatarView/components/avatar.js +0 -35
- package/esm/components/Avatar/AvatarView/components/avatar.js.map +0 -1
- package/esm/components/Avatar/AvatarView/components/controls.d.ts +0 -23
- package/esm/components/Avatar/AvatarView/components/controls.js +0 -52
- package/esm/components/Avatar/AvatarView/components/controls.js.map +0 -1
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.d.ts +0 -19
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js +0 -55
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +0 -1
- package/esm/components/Avatar/AvatarView/components/halfbodyAvatar.d.ts +0 -9
- package/esm/components/Avatar/AvatarView/components/halfbodyAvatar.js +0 -35
- package/esm/components/Avatar/AvatarView/components/halfbodyAvatar.js.map +0 -1
- package/esm/components/Avatar/AvatarView/components/loader.d.ts +0 -5
- package/esm/components/Avatar/AvatarView/components/loader.js +0 -9
- package/esm/components/Avatar/AvatarView/components/loader.js.map +0 -1
- package/esm/components/Avatar/AvatarView/utils/useMouthSpeaking.d.ts +0 -2
- package/esm/components/Avatar/AvatarView/utils/useMouthSpeaking.js +0 -65
- package/esm/components/Avatar/AvatarView/utils/useMouthSpeaking.js.map +0 -1
- package/esm/components/Avatar/AvatarView/utils/useViseme.d.ts +0 -18
- package/esm/components/Avatar/AvatarView/utils/useViseme.js +0 -137
- package/esm/components/Avatar/AvatarView/utils/useViseme.js.map +0 -1
- package/esm/components/Avatar/AvatarView/utils/visemeContext.d.ts +0 -24
- package/esm/components/Avatar/AvatarView/utils/visemeContext.js +0 -152
- package/esm/components/Avatar/AvatarView/utils/visemeContext.js.map +0 -1
- package/esm/components/AvatarView/components/avatar.d.ts +0 -9
- package/esm/components/AvatarView/components/avatar.js +0 -31
- package/esm/components/AvatarView/components/avatar.js.map +0 -1
- package/esm/components/AvatarView/components/fullbodyAvatar.d.ts +0 -10
- package/esm/components/AvatarView/components/fullbodyAvatar.js +0 -58
- package/esm/components/AvatarView/components/fullbodyAvatar.js.map +0 -1
- package/esm/components/AvatarView/components/loader.d.ts +0 -5
- package/esm/components/AvatarView/components/loader.js +0 -9
- package/esm/components/AvatarView/components/loader.js.map +0 -1
- package/esm/components/AvatarView/index.d.ts +0 -17
- package/esm/components/AvatarView/index.js +0 -31
- package/esm/components/AvatarView/index.js.map +0 -1
- package/esm/components/AvatarView/utils/useEyeBlink.d.ts +0 -2
- package/esm/components/AvatarView/utils/useEyeBlink.js +0 -37
- package/esm/components/AvatarView/utils/useEyeBlink.js.map +0 -1
- package/esm/components/AvatarView/utils/useHeadMovement.d.ts +0 -2
- package/esm/components/AvatarView/utils/useHeadMovement.js +0 -50
- package/esm/components/AvatarView/utils/useHeadMovement.js.map +0 -1
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.d.ts +0 -2
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.js +0 -31
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.js.map +0 -1
- package/esm/components/AvatarView/utils/useMouthSpeaking.d.ts +0 -2
- package/esm/components/AvatarView/utils/useMouthSpeaking.js +0 -57
- package/esm/components/AvatarView/utils/useMouthSpeaking.js.map +0 -1
- package/esm/components/AvatarView/utils/useSmile.d.ts +0 -2
- package/esm/components/AvatarView/utils/useSmile.js +0 -27
- package/esm/components/AvatarView/utils/useSmile.js.map +0 -1
- package/esm/components/AvatarView/utils/utils.d.ts +0 -13
- package/esm/components/AvatarView/utils/utils.js +0 -33
- package/esm/components/AvatarView/utils/utils.js.map +0 -1
- package/esm/components/MemoriWidget/enhanceSSML/enhanceSSML.d.ts +0 -4
- package/esm/components/MemoriWidget/enhanceSSML/enhanceSSML.js +0 -152
- package/esm/components/MemoriWidget/enhanceSSML/enhanceSSML.js.map +0 -1
- package/esm/components/layouts/ZoomedHalfBody.d.ts +0 -4
- package/esm/components/layouts/ZoomedHalfBody.js +0 -5
- package/esm/components/layouts/ZoomedHalfBody.js.map +0 -1
- package/esm/components/layouts/zoomed-half-body.css +0 -3
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const react_1 = require("react");
|
|
6
|
-
const three_1 = require("three");
|
|
7
|
-
const drei_1 = require("@react-three/drei");
|
|
8
|
-
const useEyeBlink_1 = tslib_1.__importDefault(require("../utils/useEyeBlink"));
|
|
9
|
-
const useHeadMovement_1 = tslib_1.__importDefault(require("../utils/useHeadMovement"));
|
|
10
|
-
const useMouthSpeaking_1 = tslib_1.__importDefault(require("../utils/useMouthSpeaking"));
|
|
11
|
-
const fiber_1 = require("@react-three/fiber");
|
|
12
|
-
const utils_1 = require("../utils/utils");
|
|
13
|
-
const AVATAR_POSITION = new three_1.Vector3(0, -0.6, 0);
|
|
14
|
-
function HalfBodyAvatar({ url, eyeBlink, headMovement, speaking, onLoaded, }) {
|
|
15
|
-
const { scene } = (0, drei_1.useGLTF)(url);
|
|
16
|
-
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
17
|
-
(0, useEyeBlink_1.default)(eyeBlink, nodes);
|
|
18
|
-
(0, useHeadMovement_1.default)(headMovement, nodes);
|
|
19
|
-
(0, useMouthSpeaking_1.default)(!!speaking, nodes);
|
|
20
|
-
(0, react_1.useEffect)(() => {
|
|
21
|
-
const setupAvatar = () => {
|
|
22
|
-
(0, utils_1.hideHands)(nodes);
|
|
23
|
-
(0, utils_1.correctMaterials)(materials);
|
|
24
|
-
onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
|
|
25
|
-
};
|
|
26
|
-
setupAvatar();
|
|
27
|
-
return () => {
|
|
28
|
-
const disposeObjects = () => {
|
|
29
|
-
Object.values(materials).forEach(fiber_1.dispose);
|
|
30
|
-
Object.values(nodes).filter(utils_1.isSkinnedMesh).forEach(fiber_1.dispose);
|
|
31
|
-
};
|
|
32
|
-
disposeObjects();
|
|
33
|
-
};
|
|
34
|
-
}, [materials, nodes, url, onLoaded]);
|
|
35
|
-
const skinnedMeshes = (0, react_1.useMemo)(() => Object.values(nodes).filter(utils_1.isSkinnedMesh), [nodes]);
|
|
36
|
-
return ((0, jsx_runtime_1.jsxs)("group", { position: AVATAR_POSITION, children: [nodes.Hips && (0, jsx_runtime_1.jsx)("primitive", { object: nodes.Hips }, "armature"), skinnedMeshes.map((node) => node && ((0, jsx_runtime_1.jsx)("primitive", { object: node, receiveShadow: true, castShadow: true }, node.name)))] }));
|
|
37
|
-
}
|
|
38
|
-
exports.default = HalfBodyAvatar;
|
|
39
|
-
//# sourceMappingURL=halfbodyAvatar.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/components/halfbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAkD;AAClD,iCAA0C;AAC1C,4CAA4C;AAC5C,+EAA+C;AAC/C,uFAAuD;AACvD,yFAAyD;AACzD,8CAAuD;AACvD,0CAA4E;AAU5E,MAAM,eAAe,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAEhD,SAAwB,cAAc,CAAC,EACrC,GAAG,EACH,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,QAAQ,GACY;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE7C,IAAA,qBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC7B,IAAA,yBAAe,EAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACrC,IAAA,0BAAgB,EAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAEpC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,GAAG,EAAE;YACvB,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC;YACjB,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;YAC5B,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,EAAI,CAAC;QACf,CAAC,CAAC;QAEF,WAAW,EAAE,CAAC;QAEd,OAAO,GAAG,EAAE;YACV,MAAM,cAAc,GAAG,GAAG,EAAE;gBAC1B,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,eAAO,CAAC,CAAC;gBAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAa,CAAC,CAAC,OAAO,CAAC,eAAO,CAAC,CAAC;YAC9D,CAAC,CAAC;YAEF,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,IAAA,eAAO,EAC3B,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAa,CAAC,EAChD,CAAC,KAAK,CAAC,CACR,CAAC;IAEF,OAAO,CACL,mCAAO,QAAQ,EAAE,eAAe,aAC7B,KAAK,CAAC,IAAI,IAAI,sCAA0B,MAAM,EAAE,KAAK,CAAC,IAAI,IAA7B,UAAU,CAAuB,EAC9D,aAAa,CAAC,GAAG,CAChB,CAAC,IAAc,EAAE,EAAE,CACjB,IAAI,IAAI,CACN,sCAA2B,MAAM,EAAE,IAAI,EAAE,aAAa,QAAC,UAAU,UAAjD,IAAI,CAAC,IAAI,CAA2C,CACrE,CACJ,IACK,CACT,CAAC;AACJ,CAAC;AAjDD,iCAiDC"}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const drei_1 = require("@react-three/drei");
|
|
6
|
-
const Spin_1 = tslib_1.__importDefault(require("../../../ui/Spin"));
|
|
7
|
-
const Loader = ({ fallbackImg }) => {
|
|
8
|
-
const { progress } = (0, drei_1.useProgress)();
|
|
9
|
-
return ((0, jsx_runtime_1.jsx)(drei_1.Html, { center: true, className: "avatar-loader", children: (0, jsx_runtime_1.jsx)(Spin_1.default, { spinning: true, children: fallbackImg ? ((0, jsx_runtime_1.jsxs)("figure", { children: [(0, jsx_runtime_1.jsx)("img", { src: fallbackImg, alt: `${Math.round(progress)}% loaded`, title: `${Math.round(progress)}% loaded` }), (0, jsx_runtime_1.jsx)("figcaption", { children: `${Math.round(progress)}%` })] })) : ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [Math.round(progress), " % loaded"] })) }) }));
|
|
10
|
-
};
|
|
11
|
-
exports.default = Loader;
|
|
12
|
-
//# sourceMappingURL=loader.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/components/loader.tsx"],"names":[],"mappings":";;;;AACA,4CAAsD;AACtD,oEAAoC;AAMpC,MAAM,MAAM,GAAG,CAAC,EAAE,WAAW,EAAS,EAAE,EAAE;IACxC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,kBAAW,GAAE,CAAC;IACnC,OAAO,CACL,uBAAC,WAAI,IAAC,MAAM,QAAC,SAAS,EAAC,eAAe,YACpC,uBAAC,cAAI,IAAC,QAAQ,kBACX,WAAW,CAAC,CAAC,CAAC,CACb,+CACE,gCACE,GAAG,EAAE,WAAW,EAChB,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,EACtC,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,GACxC,EACF,iDAAa,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,GAAc,IAC9C,CACV,CAAC,CAAC,CAAC,CACF,6DAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAa,CACrC,GACI,GACF,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,MAAM,CAAC"}
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const react_1 = require("react");
|
|
4
|
-
const fiber_1 = require("@react-three/fiber");
|
|
5
|
-
const MOUTH_MOVE_DURATION = 2;
|
|
6
|
-
const MOUTH_MOVE_INTERVAL_MIN = 100;
|
|
7
|
-
const MOUTH_MOVE_INTERVAL_MAX = 500;
|
|
8
|
-
function useMouthSpeaking(speaking, nodes) {
|
|
9
|
-
const mouthStateRef = (0, react_1.useRef)({
|
|
10
|
-
moveTime: 999,
|
|
11
|
-
mesh: null,
|
|
12
|
-
morphIndices: { open: 0, smile: 0, funner: 0, pucker: 0 },
|
|
13
|
-
});
|
|
14
|
-
const setNextMouthMove = (0, react_1.useCallback)(() => {
|
|
15
|
-
mouthStateRef.current.moveTime = 0;
|
|
16
|
-
const nextMoveDelay = Math.random() * (MOUTH_MOVE_INTERVAL_MAX - MOUTH_MOVE_INTERVAL_MIN) + MOUTH_MOVE_INTERVAL_MIN;
|
|
17
|
-
setTimeout(setNextMouthMove, nextMoveDelay);
|
|
18
|
-
}, []);
|
|
19
|
-
(0, react_1.useEffect)(() => {
|
|
20
|
-
if (!speaking)
|
|
21
|
-
return;
|
|
22
|
-
const mouthMesh = (nodes.Wolf3D_Head || nodes.Wolf3D_Avatar020 || nodes.Wolf3D_Avatar001);
|
|
23
|
-
mouthStateRef.current.mesh = mouthMesh;
|
|
24
|
-
if ((mouthMesh === null || mouthMesh === void 0 ? void 0 : mouthMesh.morphTargetDictionary) && (mouthMesh === null || mouthMesh === void 0 ? void 0 : mouthMesh.morphTargetInfluences)) {
|
|
25
|
-
mouthStateRef.current.morphIndices = {
|
|
26
|
-
open: mouthMesh.morphTargetDictionary.mouthOpen,
|
|
27
|
-
smile: mouthMesh.morphTargetDictionary.mouthSmile,
|
|
28
|
-
funner: mouthMesh.morphTargetDictionary.mouthFunner,
|
|
29
|
-
pucker: mouthMesh.morphTargetDictionary.mouthPucker,
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
const initialMoveDelay = setTimeout(setNextMouthMove, 200);
|
|
33
|
-
return () => {
|
|
34
|
-
clearTimeout(initialMoveDelay);
|
|
35
|
-
};
|
|
36
|
-
}, [nodes, speaking, setNextMouthMove]);
|
|
37
|
-
(0, fiber_1.useFrame)((_, delta) => {
|
|
38
|
-
const { moveTime, mesh, morphIndices } = mouthStateRef.current;
|
|
39
|
-
if (!speaking || !(mesh === null || mesh === void 0 ? void 0 : mesh.morphTargetInfluences)) {
|
|
40
|
-
resetMouthShape(mesh, morphIndices);
|
|
41
|
-
return;
|
|
42
|
-
}
|
|
43
|
-
if (moveTime < MOUTH_MOVE_DURATION) {
|
|
44
|
-
const value = Math.abs(Math.sin((moveTime * Math.PI) / 2));
|
|
45
|
-
mouthStateRef.current.moveTime += delta * 10;
|
|
46
|
-
updateMouthShape(mesh, morphIndices, value);
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
resetMouthShape(mesh, morphIndices);
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
exports.default = useMouthSpeaking;
|
|
54
|
-
function updateMouthShape(mesh, morphIndices, value) {
|
|
55
|
-
mesh.morphTargetInfluences[morphIndices.open] = value / 3;
|
|
56
|
-
mesh.morphTargetInfluences[morphIndices.smile] = value / 10;
|
|
57
|
-
mesh.morphTargetInfluences[morphIndices.funner] = value / 7;
|
|
58
|
-
mesh.morphTargetInfluences[morphIndices.pucker] = value / 5;
|
|
59
|
-
}
|
|
60
|
-
function resetMouthShape(mesh, morphIndices) {
|
|
61
|
-
if (!(mesh === null || mesh === void 0 ? void 0 : mesh.morphTargetInfluences))
|
|
62
|
-
return;
|
|
63
|
-
mesh.morphTargetInfluences[morphIndices.open] = 0;
|
|
64
|
-
mesh.morphTargetInfluences[morphIndices.smile] = 0;
|
|
65
|
-
mesh.morphTargetInfluences[morphIndices.funner] = 0;
|
|
66
|
-
mesh.morphTargetInfluences[morphIndices.pucker] = 0;
|
|
67
|
-
}
|
|
68
|
-
//# sourceMappingURL=useMouthSpeaking.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useMouthSpeaking.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/utils/useMouthSpeaking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import { SkinnedMesh } from 'three';
|
|
2
|
-
type AzureViseme = {
|
|
3
|
-
visemeId: number;
|
|
4
|
-
audioOffset: number;
|
|
5
|
-
};
|
|
6
|
-
type ProcessedViseme = {
|
|
7
|
-
name: string;
|
|
8
|
-
duration: number;
|
|
9
|
-
weight: number;
|
|
10
|
-
startTime: number;
|
|
11
|
-
};
|
|
12
|
-
export declare const useViseme: () => {
|
|
13
|
-
addVisemeToQueue: (viseme: AzureViseme) => void;
|
|
14
|
-
processVisemeQueue: () => ProcessedViseme[];
|
|
15
|
-
clearVisemes: () => void;
|
|
16
|
-
setMeshRef: (mesh: SkinnedMesh | null) => void;
|
|
17
|
-
};
|
|
18
|
-
export {};
|
|
@@ -1,141 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useViseme = void 0;
|
|
4
|
-
const react_1 = require("react");
|
|
5
|
-
const VISEME_SMOOTHING = 0.42;
|
|
6
|
-
const DEFAULT_VISEME_DURATION = 0.1;
|
|
7
|
-
const lerp = (start, end, alpha) => {
|
|
8
|
-
return start * (1 - alpha) + end * alpha;
|
|
9
|
-
};
|
|
10
|
-
const useViseme = () => {
|
|
11
|
-
const [currentVisemes, setCurrentVisemes] = (0, react_1.useState)([]);
|
|
12
|
-
const visemeQueueRef = (0, react_1.useRef)([]);
|
|
13
|
-
const animationFrameRef = (0, react_1.useRef)(null);
|
|
14
|
-
const startTimeRef = (0, react_1.useRef)(null);
|
|
15
|
-
const currentVisemeWeightRef = (0, react_1.useRef)({});
|
|
16
|
-
const meshRef = (0, react_1.useRef)(null);
|
|
17
|
-
const visemeMap = {
|
|
18
|
-
0: 'viseme_sil',
|
|
19
|
-
1: 'viseme_aa',
|
|
20
|
-
2: 'viseme_aa',
|
|
21
|
-
3: 'viseme_O',
|
|
22
|
-
4: 'viseme_E',
|
|
23
|
-
5: 'viseme_I',
|
|
24
|
-
6: 'viseme_I',
|
|
25
|
-
7: 'viseme_U',
|
|
26
|
-
8: 'viseme_O',
|
|
27
|
-
9: 'viseme_aa',
|
|
28
|
-
10: 'viseme_O',
|
|
29
|
-
11: 'viseme_aa',
|
|
30
|
-
12: 'viseme_CH',
|
|
31
|
-
13: 'viseme_RR',
|
|
32
|
-
14: 'viseme_SS',
|
|
33
|
-
15: 'viseme_SS',
|
|
34
|
-
16: 'viseme_CH',
|
|
35
|
-
17: 'viseme_TH',
|
|
36
|
-
18: 'viseme_FF',
|
|
37
|
-
19: 'viseme_DD',
|
|
38
|
-
20: 'viseme_kk',
|
|
39
|
-
21: 'viseme_PP'
|
|
40
|
-
};
|
|
41
|
-
const setMeshRef = (0, react_1.useCallback)((mesh) => {
|
|
42
|
-
meshRef.current = mesh;
|
|
43
|
-
}, []);
|
|
44
|
-
const addVisemeToQueue = (0, react_1.useCallback)((viseme) => {
|
|
45
|
-
visemeQueueRef.current.push(viseme);
|
|
46
|
-
}, []);
|
|
47
|
-
const processVisemeQueue = (0, react_1.useCallback)(() => {
|
|
48
|
-
const azureVisemes = [...visemeQueueRef.current];
|
|
49
|
-
visemeQueueRef.current = [];
|
|
50
|
-
if (azureVisemes.length === 0)
|
|
51
|
-
return [];
|
|
52
|
-
const processedVisemes = azureVisemes.map((currentViseme, i) => {
|
|
53
|
-
const nextViseme = azureVisemes[i + 1];
|
|
54
|
-
const duration = nextViseme
|
|
55
|
-
? (nextViseme.audioOffset - currentViseme.audioOffset) / 10000000
|
|
56
|
-
: DEFAULT_VISEME_DURATION;
|
|
57
|
-
return {
|
|
58
|
-
name: visemeMap[currentViseme.visemeId] || 'viseme_sil',
|
|
59
|
-
duration,
|
|
60
|
-
weight: 1,
|
|
61
|
-
startTime: currentViseme.audioOffset / 10000000
|
|
62
|
-
};
|
|
63
|
-
});
|
|
64
|
-
setCurrentVisemes(processedVisemes);
|
|
65
|
-
console.log('processedVisemes', processedVisemes, meshRef.current);
|
|
66
|
-
startTimeRef.current = performance.now();
|
|
67
|
-
if (animationFrameRef.current === null) {
|
|
68
|
-
animationFrameRef.current = requestAnimationFrame(animate);
|
|
69
|
-
}
|
|
70
|
-
return processedVisemes;
|
|
71
|
-
}, []);
|
|
72
|
-
const clearVisemes = (0, react_1.useCallback)(() => {
|
|
73
|
-
var _a, _b;
|
|
74
|
-
setCurrentVisemes([]);
|
|
75
|
-
visemeQueueRef.current = [];
|
|
76
|
-
if (animationFrameRef.current !== null) {
|
|
77
|
-
cancelAnimationFrame(animationFrameRef.current);
|
|
78
|
-
animationFrameRef.current = null;
|
|
79
|
-
}
|
|
80
|
-
if (((_a = meshRef.current) === null || _a === void 0 ? void 0 : _a.morphTargetDictionary) && ((_b = meshRef.current) === null || _b === void 0 ? void 0 : _b.morphTargetInfluences)) {
|
|
81
|
-
Object.values(meshRef.current.morphTargetDictionary).forEach((index) => {
|
|
82
|
-
if (typeof index === 'number') {
|
|
83
|
-
meshRef.current.morphTargetInfluences[index] = 0;
|
|
84
|
-
}
|
|
85
|
-
});
|
|
86
|
-
}
|
|
87
|
-
currentVisemeWeightRef.current = {};
|
|
88
|
-
}, []);
|
|
89
|
-
const getCurrentViseme = (0, react_1.useCallback)((elapsedTime) => {
|
|
90
|
-
return currentVisemes.find((viseme, index) => {
|
|
91
|
-
const nextViseme = currentVisemes[index + 1];
|
|
92
|
-
return elapsedTime >= viseme.startTime && (!nextViseme || elapsedTime < nextViseme.startTime);
|
|
93
|
-
});
|
|
94
|
-
}, [currentVisemes]);
|
|
95
|
-
const applyViseme = (0, react_1.useCallback)((viseme, elapsedTime) => {
|
|
96
|
-
var _a, _b, _c;
|
|
97
|
-
if (!meshRef.current)
|
|
98
|
-
return;
|
|
99
|
-
const visemeProgress = Math.min((elapsedTime - viseme.startTime) / viseme.duration, 1);
|
|
100
|
-
const targetWeight = Math.sin(visemeProgress * Math.PI) * viseme.weight;
|
|
101
|
-
if (!currentVisemeWeightRef.current[viseme.name]) {
|
|
102
|
-
currentVisemeWeightRef.current[viseme.name] = 0;
|
|
103
|
-
}
|
|
104
|
-
currentVisemeWeightRef.current[viseme.name] = lerp(currentVisemeWeightRef.current[viseme.name], targetWeight, VISEME_SMOOTHING);
|
|
105
|
-
const visemeIndex = (_b = (_a = meshRef.current) === null || _a === void 0 ? void 0 : _a.morphTargetDictionary) === null || _b === void 0 ? void 0 : _b[viseme.name];
|
|
106
|
-
if (typeof visemeIndex === 'number' && ((_c = meshRef.current) === null || _c === void 0 ? void 0 : _c.morphTargetInfluences)) {
|
|
107
|
-
meshRef.current.morphTargetInfluences[visemeIndex] = currentVisemeWeightRef.current[viseme.name];
|
|
108
|
-
}
|
|
109
|
-
}, []);
|
|
110
|
-
const animate = (0, react_1.useCallback)((time) => {
|
|
111
|
-
if (startTimeRef.current === null) {
|
|
112
|
-
startTimeRef.current = time;
|
|
113
|
-
}
|
|
114
|
-
const elapsedTime = (time - startTimeRef.current) / 1000;
|
|
115
|
-
const currentViseme = getCurrentViseme(elapsedTime);
|
|
116
|
-
if (currentViseme) {
|
|
117
|
-
applyViseme(currentViseme, elapsedTime);
|
|
118
|
-
}
|
|
119
|
-
if (currentVisemes.length > 0 && elapsedTime < currentVisemes[currentVisemes.length - 1].startTime + currentVisemes[currentVisemes.length - 1].duration) {
|
|
120
|
-
animationFrameRef.current = requestAnimationFrame(animate);
|
|
121
|
-
}
|
|
122
|
-
else {
|
|
123
|
-
clearVisemes();
|
|
124
|
-
}
|
|
125
|
-
}, [getCurrentViseme, applyViseme, currentVisemes, clearVisemes]);
|
|
126
|
-
(0, react_1.useEffect)(() => {
|
|
127
|
-
return () => {
|
|
128
|
-
if (animationFrameRef.current !== null) {
|
|
129
|
-
cancelAnimationFrame(animationFrameRef.current);
|
|
130
|
-
}
|
|
131
|
-
};
|
|
132
|
-
}, []);
|
|
133
|
-
return {
|
|
134
|
-
addVisemeToQueue,
|
|
135
|
-
processVisemeQueue,
|
|
136
|
-
clearVisemes,
|
|
137
|
-
setMeshRef
|
|
138
|
-
};
|
|
139
|
-
};
|
|
140
|
-
exports.useViseme = useViseme;
|
|
141
|
-
//# sourceMappingURL=useViseme.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"useViseme.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/utils/useViseme.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
import React from 'react';
|
|
2
|
-
import { SkinnedMesh } from 'three';
|
|
3
|
-
type AzureViseme = {
|
|
4
|
-
visemeId: number;
|
|
5
|
-
audioOffset: number;
|
|
6
|
-
};
|
|
7
|
-
type ProcessedViseme = {
|
|
8
|
-
name: string;
|
|
9
|
-
duration: number;
|
|
10
|
-
weight: number;
|
|
11
|
-
startTime: number;
|
|
12
|
-
};
|
|
13
|
-
type VisemeContextType = {
|
|
14
|
-
addVisemeToQueue: (viseme: AzureViseme) => void;
|
|
15
|
-
processVisemeQueue: () => ProcessedViseme[];
|
|
16
|
-
clearVisemes: () => void;
|
|
17
|
-
setMeshRef: (mesh: SkinnedMesh | null) => void;
|
|
18
|
-
};
|
|
19
|
-
export declare const VisemeContext: React.Context<VisemeContextType>;
|
|
20
|
-
export declare const VisemeProvider: React.FC<{
|
|
21
|
-
children: React.ReactNode;
|
|
22
|
-
}>;
|
|
23
|
-
export declare const useViseme: () => VisemeContextType;
|
|
24
|
-
export {};
|
|
@@ -1,157 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useViseme = exports.VisemeProvider = exports.VisemeContext = void 0;
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const react_1 = require("react");
|
|
6
|
-
exports.VisemeContext = (0, react_1.createContext)({
|
|
7
|
-
addVisemeToQueue: () => { },
|
|
8
|
-
processVisemeQueue: () => [],
|
|
9
|
-
clearVisemes: () => { },
|
|
10
|
-
setMeshRef: () => { },
|
|
11
|
-
});
|
|
12
|
-
const VISEME_SMOOTHING = 0.42;
|
|
13
|
-
const DEFAULT_VISEME_DURATION = 0.1;
|
|
14
|
-
const visemeMap = {
|
|
15
|
-
0: 'viseme_sil',
|
|
16
|
-
1: 'viseme_aa',
|
|
17
|
-
2: 'viseme_aa',
|
|
18
|
-
3: 'viseme_O',
|
|
19
|
-
4: 'viseme_E',
|
|
20
|
-
5: 'viseme_I',
|
|
21
|
-
6: 'viseme_I',
|
|
22
|
-
7: 'viseme_U',
|
|
23
|
-
8: 'viseme_O',
|
|
24
|
-
9: 'viseme_aa',
|
|
25
|
-
10: 'viseme_O',
|
|
26
|
-
11: 'viseme_aa',
|
|
27
|
-
12: 'viseme_CH',
|
|
28
|
-
13: 'viseme_RR',
|
|
29
|
-
14: 'viseme_SS',
|
|
30
|
-
15: 'viseme_SS',
|
|
31
|
-
16: 'viseme_CH',
|
|
32
|
-
17: 'viseme_TH',
|
|
33
|
-
18: 'viseme_FF',
|
|
34
|
-
19: 'viseme_DD',
|
|
35
|
-
20: 'viseme_kk',
|
|
36
|
-
21: 'viseme_PP'
|
|
37
|
-
};
|
|
38
|
-
const VisemeProvider = ({ children }) => {
|
|
39
|
-
const [currentVisemes, setCurrentVisemes] = (0, react_1.useState)([]);
|
|
40
|
-
const visemeQueueRef = (0, react_1.useRef)([]);
|
|
41
|
-
const animationFrameRef = (0, react_1.useRef)(null);
|
|
42
|
-
const startTimeRef = (0, react_1.useRef)(null);
|
|
43
|
-
const currentVisemeWeightRef = (0, react_1.useRef)({});
|
|
44
|
-
const meshRef = (0, react_1.useRef)(null);
|
|
45
|
-
const lerp = (start, end, alpha) => {
|
|
46
|
-
return start * (1 - alpha) + end * alpha;
|
|
47
|
-
};
|
|
48
|
-
const setMeshRef = (0, react_1.useCallback)((mesh) => {
|
|
49
|
-
meshRef.current = mesh;
|
|
50
|
-
}, []);
|
|
51
|
-
const addVisemeToQueue = (0, react_1.useCallback)((viseme) => {
|
|
52
|
-
visemeQueueRef.current.push(viseme);
|
|
53
|
-
}, []);
|
|
54
|
-
const getCurrentViseme = (0, react_1.useCallback)((elapsedTime) => {
|
|
55
|
-
return currentVisemes.find((viseme, index) => {
|
|
56
|
-
const nextViseme = currentVisemes[index + 1];
|
|
57
|
-
return elapsedTime >= viseme.startTime && (!nextViseme || elapsedTime < nextViseme.startTime);
|
|
58
|
-
});
|
|
59
|
-
}, [currentVisemes]);
|
|
60
|
-
const applyViseme = (0, react_1.useCallback)((viseme, elapsedTime) => {
|
|
61
|
-
var _a, _b, _c;
|
|
62
|
-
if (!meshRef.current)
|
|
63
|
-
return;
|
|
64
|
-
const visemeProgress = Math.min((elapsedTime - viseme.startTime) / viseme.duration, 1);
|
|
65
|
-
const targetWeight = Math.sin(visemeProgress * Math.PI) * viseme.weight;
|
|
66
|
-
if (!currentVisemeWeightRef.current[viseme.name]) {
|
|
67
|
-
currentVisemeWeightRef.current[viseme.name] = 0;
|
|
68
|
-
}
|
|
69
|
-
currentVisemeWeightRef.current[viseme.name] = lerp(currentVisemeWeightRef.current[viseme.name], targetWeight, VISEME_SMOOTHING);
|
|
70
|
-
const visemeIndex = (_b = (_a = meshRef.current) === null || _a === void 0 ? void 0 : _a.morphTargetDictionary) === null || _b === void 0 ? void 0 : _b[viseme.name];
|
|
71
|
-
if (typeof visemeIndex === 'number' && ((_c = meshRef.current) === null || _c === void 0 ? void 0 : _c.morphTargetInfluences)) {
|
|
72
|
-
meshRef.current.morphTargetInfluences[visemeIndex] = currentVisemeWeightRef.current[viseme.name];
|
|
73
|
-
}
|
|
74
|
-
}, []);
|
|
75
|
-
const animate = (0, react_1.useCallback)((time) => {
|
|
76
|
-
if (startTimeRef.current === null) {
|
|
77
|
-
startTimeRef.current = time;
|
|
78
|
-
}
|
|
79
|
-
const elapsedTime = (time - startTimeRef.current) / 1000;
|
|
80
|
-
const currentViseme = getCurrentViseme(elapsedTime);
|
|
81
|
-
if (currentViseme) {
|
|
82
|
-
applyViseme(currentViseme, elapsedTime);
|
|
83
|
-
}
|
|
84
|
-
if (currentVisemes.length > 0 && elapsedTime < currentVisemes[currentVisemes.length - 1].startTime + currentVisemes[currentVisemes.length - 1].duration) {
|
|
85
|
-
animationFrameRef.current = requestAnimationFrame(animate);
|
|
86
|
-
}
|
|
87
|
-
else {
|
|
88
|
-
clearVisemes();
|
|
89
|
-
}
|
|
90
|
-
}, [getCurrentViseme, applyViseme, currentVisemes]);
|
|
91
|
-
const clearVisemes = (0, react_1.useCallback)(() => {
|
|
92
|
-
var _a, _b;
|
|
93
|
-
setCurrentVisemes([]);
|
|
94
|
-
visemeQueueRef.current = [];
|
|
95
|
-
if (animationFrameRef.current !== null) {
|
|
96
|
-
cancelAnimationFrame(animationFrameRef.current);
|
|
97
|
-
animationFrameRef.current = null;
|
|
98
|
-
}
|
|
99
|
-
if (((_a = meshRef.current) === null || _a === void 0 ? void 0 : _a.morphTargetDictionary) && ((_b = meshRef.current) === null || _b === void 0 ? void 0 : _b.morphTargetInfluences)) {
|
|
100
|
-
Object.values(meshRef.current.morphTargetDictionary).forEach((index) => {
|
|
101
|
-
if (typeof index === 'number') {
|
|
102
|
-
meshRef.current.morphTargetInfluences[index] = 0;
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
currentVisemeWeightRef.current = {};
|
|
107
|
-
}, []);
|
|
108
|
-
const processVisemeQueue = (0, react_1.useCallback)(() => {
|
|
109
|
-
const azureVisemes = [...visemeQueueRef.current];
|
|
110
|
-
visemeQueueRef.current = [];
|
|
111
|
-
if (azureVisemes.length === 0)
|
|
112
|
-
return [];
|
|
113
|
-
const processedVisemes = azureVisemes.map((currentViseme, i) => {
|
|
114
|
-
const nextViseme = azureVisemes[i + 1];
|
|
115
|
-
const duration = nextViseme
|
|
116
|
-
? (nextViseme.audioOffset - currentViseme.audioOffset) / 10000000
|
|
117
|
-
: DEFAULT_VISEME_DURATION;
|
|
118
|
-
return {
|
|
119
|
-
name: visemeMap[currentViseme.visemeId] || 'viseme_sil',
|
|
120
|
-
duration,
|
|
121
|
-
weight: 1,
|
|
122
|
-
startTime: currentViseme.audioOffset / 10000000
|
|
123
|
-
};
|
|
124
|
-
});
|
|
125
|
-
setCurrentVisemes(processedVisemes);
|
|
126
|
-
console.log('processedVisemes', processedVisemes, meshRef.current);
|
|
127
|
-
if (animationFrameRef.current === null) {
|
|
128
|
-
startTimeRef.current = performance.now();
|
|
129
|
-
animationFrameRef.current = requestAnimationFrame(animate);
|
|
130
|
-
}
|
|
131
|
-
return processedVisemes;
|
|
132
|
-
}, [animate]);
|
|
133
|
-
(0, react_1.useEffect)(() => {
|
|
134
|
-
return () => {
|
|
135
|
-
if (animationFrameRef.current !== null) {
|
|
136
|
-
cancelAnimationFrame(animationFrameRef.current);
|
|
137
|
-
}
|
|
138
|
-
};
|
|
139
|
-
}, []);
|
|
140
|
-
const value = (0, react_1.useMemo)(() => ({
|
|
141
|
-
addVisemeToQueue,
|
|
142
|
-
processVisemeQueue,
|
|
143
|
-
clearVisemes,
|
|
144
|
-
setMeshRef,
|
|
145
|
-
}), [addVisemeToQueue, processVisemeQueue, clearVisemes, setMeshRef]);
|
|
146
|
-
return (0, jsx_runtime_1.jsx)(exports.VisemeContext.Provider, { value: value, children: children });
|
|
147
|
-
};
|
|
148
|
-
exports.VisemeProvider = VisemeProvider;
|
|
149
|
-
const useViseme = () => {
|
|
150
|
-
const context = (0, react_1.useContext)(exports.VisemeContext);
|
|
151
|
-
if (!context) {
|
|
152
|
-
throw new Error('useViseme must be used within a VisemeProvider');
|
|
153
|
-
}
|
|
154
|
-
return context;
|
|
155
|
-
};
|
|
156
|
-
exports.useViseme = useViseme;
|
|
157
|
-
//# sourceMappingURL=visemeContext.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"visemeContext.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/utils/visemeContext.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
interface AvatarProps {
|
|
2
|
-
url: string;
|
|
3
|
-
eyeBlink?: boolean;
|
|
4
|
-
headMovement?: boolean;
|
|
5
|
-
speaking?: boolean;
|
|
6
|
-
onLoaded?: () => void;
|
|
7
|
-
}
|
|
8
|
-
export default function Avatar({ url, eyeBlink, headMovement, speaking, onLoaded, }: AvatarProps): JSX.Element;
|
|
9
|
-
export {};
|
|
@@ -1,35 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const react_1 = require("react");
|
|
6
|
-
const three_1 = require("three");
|
|
7
|
-
const drei_1 = require("@react-three/drei");
|
|
8
|
-
const useEyeBlink_1 = tslib_1.__importDefault(require("../utils/useEyeBlink"));
|
|
9
|
-
const useHeadMovement_1 = tslib_1.__importDefault(require("../utils/useHeadMovement"));
|
|
10
|
-
const useMouthSpeaking_1 = tslib_1.__importDefault(require("../utils/useMouthSpeaking"));
|
|
11
|
-
const fiber_1 = require("@react-three/fiber");
|
|
12
|
-
const utils_1 = require("../utils/utils");
|
|
13
|
-
const position = new three_1.Vector3(0, -0.6, 0);
|
|
14
|
-
function Avatar({ url, eyeBlink, headMovement, speaking, onLoaded, }) {
|
|
15
|
-
const { scene } = (0, drei_1.useGLTF)(url);
|
|
16
|
-
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
17
|
-
(0, useEyeBlink_1.default)(eyeBlink, nodes);
|
|
18
|
-
(0, useHeadMovement_1.default)(headMovement, nodes);
|
|
19
|
-
(0, useMouthSpeaking_1.default)(!!speaking, nodes);
|
|
20
|
-
(0, react_1.useEffect)(() => {
|
|
21
|
-
(0, utils_1.hideHands)(nodes);
|
|
22
|
-
(0, utils_1.correctMaterials)(materials);
|
|
23
|
-
if (onLoaded)
|
|
24
|
-
onLoaded();
|
|
25
|
-
return () => {
|
|
26
|
-
Object.values(materials).forEach(fiber_1.dispose);
|
|
27
|
-
Object.values(nodes).filter(utils_1.isSkinnedMesh).forEach(fiber_1.dispose);
|
|
28
|
-
};
|
|
29
|
-
}, [materials, nodes, url, onLoaded]);
|
|
30
|
-
return ((0, jsx_runtime_1.jsxs)("group", { position: position, children: [(0, jsx_runtime_1.jsx)("primitive", { object: nodes.Hips }, "armature"), Object.values(nodes)
|
|
31
|
-
.filter(utils_1.isSkinnedMesh)
|
|
32
|
-
.map((node) => ((0, jsx_runtime_1.jsx)("primitive", { object: node, receiveShadow: true, castShadow: true }, node.name)))] }));
|
|
33
|
-
}
|
|
34
|
-
exports.default = Avatar;
|
|
35
|
-
//# sourceMappingURL=avatar.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"avatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/avatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAyC;AACzC,iCAA0C;AAC1C,4CAA4C;AAC5C,+EAA+C;AAC/C,uFAAuD;AACvD,yFAAyD;AACzD,8CAAuD;AACvD,0CAA4E;AAU5E,MAAM,QAAQ,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AAEzC,SAAwB,MAAM,CAAC,EAC7B,GAAG,EACH,QAAQ,EACR,YAAY,EACZ,QAAQ,EACR,QAAQ,GACI;IACZ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE7C,IAAA,qBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAC7B,IAAA,yBAAe,EAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IACrC,IAAA,0BAAgB,EAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAEpC,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAA,iBAAS,EAAC,KAAK,CAAC,CAAC;QACjB,IAAA,wBAAgB,EAAC,SAAS,CAAC,CAAC;QAE5B,IAAI,QAAQ;YAAE,QAAQ,EAAE,CAAC;QAEzB,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,eAAO,CAAC,CAAC;YAE1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAa,CAAC,CAAC,OAAO,CAAC,eAAO,CAAC,CAAC;QAC9D,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEtC,OAAO,CACL,mCAAO,QAAQ,EAAE,QAAQ,aACvB,sCAA0B,MAAM,EAAE,KAAK,CAAC,IAAI,IAA7B,UAAU,CAAuB,EAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;iBAClB,MAAM,CAAC,qBAAa,CAAC;iBACrB,GAAG,CAAC,CAAC,IAAc,EAAE,EAAE,CAAC,CACvB,sCAA2B,MAAM,EAAE,IAAI,EAAE,aAAa,QAAC,UAAU,UAAjD,IAAI,CAAC,IAAI,CAA2C,CACrE,CAAC,IACE,CACT,CAAC;AACJ,CAAC;AArCD,yBAqCC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
export interface AvatarProps {
|
|
2
|
-
url: string;
|
|
3
|
-
sex: 'MALE' | 'FEMALE';
|
|
4
|
-
eyeBlink?: boolean;
|
|
5
|
-
headMovement?: boolean;
|
|
6
|
-
speaking?: boolean;
|
|
7
|
-
onLoaded?: () => void;
|
|
8
|
-
animation?: 'Idle' | 'Idle 1' | 'Idle 2' | 'Idle 3' | 'Loading' | 'Sad' | 'Talk 1' | 'Talk 2' | 'Talk 3';
|
|
9
|
-
}
|
|
10
|
-
export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }: AvatarProps): JSX.Element;
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const tslib_1 = require("tslib");
|
|
4
|
-
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
|
-
const react_1 = require("react");
|
|
6
|
-
const three_1 = require("three");
|
|
7
|
-
const drei_1 = require("@react-three/drei");
|
|
8
|
-
const useEyeBlink_1 = tslib_1.__importDefault(require("../utils/useEyeBlink"));
|
|
9
|
-
const useLoadingMorphAnim_1 = tslib_1.__importDefault(require("../utils/useLoadingMorphAnim"));
|
|
10
|
-
const useMouthSpeaking_1 = tslib_1.__importDefault(require("../utils/useMouthSpeaking"));
|
|
11
|
-
const fiber_1 = require("@react-three/fiber");
|
|
12
|
-
const utils_1 = require("../utils/utils");
|
|
13
|
-
const useSmile_1 = tslib_1.__importDefault(require("../utils/useSmile"));
|
|
14
|
-
const position = new three_1.Vector3(0, -1, 0);
|
|
15
|
-
const rotation = new three_1.Euler(0.175, 0, 0);
|
|
16
|
-
function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }) {
|
|
17
|
-
const { scene } = (0, drei_1.useGLTF)(url);
|
|
18
|
-
const { animations } = (0, drei_1.useGLTF)(sex === 'MALE'
|
|
19
|
-
? 'https://assets.memori.ai/api/v2/asset/5de7456f-0cd8-4e29-95a7-0cd0045a5325.glb'
|
|
20
|
-
: 'https://assets.memori.ai/api/v2/asset/84487a2b-377c-4565-800a-51459d580ec8.glb');
|
|
21
|
-
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
22
|
-
const anim = (0, drei_1.useAnimations)(animations, scene);
|
|
23
|
-
(0, useEyeBlink_1.default)(eyeBlink, nodes);
|
|
24
|
-
(0, useMouthSpeaking_1.default)(!!speaking, nodes);
|
|
25
|
-
(0, useLoadingMorphAnim_1.default)(animation === 'Loading', nodes);
|
|
26
|
-
(0, useSmile_1.default)(animation === null || animation === void 0 ? void 0 : animation.startsWith('Idle'), nodes);
|
|
27
|
-
(0, react_1.useEffect)(() => {
|
|
28
|
-
(0, utils_1.correctMaterials)(materials);
|
|
29
|
-
if (onLoaded)
|
|
30
|
-
onLoaded();
|
|
31
|
-
return () => {
|
|
32
|
-
Object.values(materials).forEach(fiber_1.dispose);
|
|
33
|
-
Object.values(nodes).filter(utils_1.isSkinnedMesh).forEach(fiber_1.dispose);
|
|
34
|
-
};
|
|
35
|
-
}, [materials, nodes, url, onLoaded]);
|
|
36
|
-
try {
|
|
37
|
-
if (animation && animation in anim.actions) {
|
|
38
|
-
Object.keys(anim.actions).forEach(name => {
|
|
39
|
-
let action = anim.actions[name];
|
|
40
|
-
if (!action)
|
|
41
|
-
return;
|
|
42
|
-
else if (name === animation)
|
|
43
|
-
action.fadeIn(0.3).play();
|
|
44
|
-
else
|
|
45
|
-
action.fadeOut(0.3).stop();
|
|
46
|
-
});
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
Object.values(anim.actions).forEach(action => {
|
|
50
|
-
if (!action)
|
|
51
|
-
return;
|
|
52
|
-
action === null || action === void 0 ? void 0 : action.fadeOut(0.2).reset().stop();
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
catch (e) {
|
|
57
|
-
console.log(e);
|
|
58
|
-
}
|
|
59
|
-
return ((0, jsx_runtime_1.jsx)("group", { position: position, rotation: rotation, children: (0, jsx_runtime_1.jsx)("primitive", { object: scene }) }));
|
|
60
|
-
}
|
|
61
|
-
exports.default = Avatar;
|
|
62
|
-
//# sourceMappingURL=fullbodyAvatar.js.map
|