@memori.ai/memori-react 2.0.4 → 2.0.6
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 +14 -0
- package/dist/components/Avatar/Avatar.js +1 -1
- package/dist/components/Avatar/Avatar.js.map +1 -1
- package/dist/components/AvatarView/components/fullbodyAvatar.d.ts +1 -1
- package/dist/components/AvatarView/components/fullbodyAvatar.js +20 -7
- package/dist/components/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.d.ts +2 -0
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.js +34 -0
- package/dist/components/AvatarView/utils/useLoadingMorphAnim.js.map +1 -0
- package/dist/components/AvatarView/utils/useSmile.d.ts +2 -0
- package/dist/components/AvatarView/utils/useSmile.js +30 -0
- package/dist/components/AvatarView/utils/useSmile.js.map +1 -0
- package/dist/components/layouts/totem.css +4 -0
- package/esm/components/Avatar/Avatar.js +1 -1
- package/esm/components/Avatar/Avatar.js.map +1 -1
- package/esm/components/AvatarView/components/fullbodyAvatar.d.ts +1 -1
- package/esm/components/AvatarView/components/fullbodyAvatar.js +21 -8
- package/esm/components/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.d.ts +2 -0
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.js +31 -0
- package/esm/components/AvatarView/utils/useLoadingMorphAnim.js.map +1 -0
- package/esm/components/AvatarView/utils/useSmile.d.ts +2 -0
- package/esm/components/AvatarView/utils/useSmile.js +27 -0
- package/esm/components/AvatarView/utils/useSmile.js.map +1 -0
- package/esm/components/layouts/totem.css +4 -0
- package/package.json +1 -1
- package/src/components/Avatar/Avatar.tsx +1 -1
- package/src/components/AvatarView/components/fullbodyAvatar.tsx +31 -7
- package/src/components/AvatarView/utils/useLoadingMorphAnim.ts +38 -0
- package/src/components/AvatarView/utils/useSmile.ts +31 -0
- package/src/components/layouts/totem.css +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [2.0.6](https://github.com/memori-ai/memori-react/compare/v2.0.5...v2.0.6) (2023-04-27)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* loading animation from separate glb, add smiling + loading anim morph targets influences ([754a711](https://github.com/memori-ai/memori-react/commit/754a711c5f185a76ed8b201207ea29888053b944))
|
|
9
|
+
|
|
10
|
+
## [2.0.5](https://github.com/memori-ai/memori-react/compare/v2.0.4...v2.0.5) (2023-04-24)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* totem layout blob z-index ([5808bdf](https://github.com/memori-ai/memori-react/commit/5808bdfa6875a3083e787b40f49c3cc836edfdd5))
|
|
16
|
+
|
|
3
17
|
## [2.0.4](https://github.com/memori-ai/memori-react/compare/v2.0.3...v2.0.4) (2023-04-24)
|
|
4
18
|
|
|
5
19
|
|
|
@@ -49,7 +49,7 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
|
|
|
49
49
|
resourceURI: memori.avatarURL,
|
|
50
50
|
baseURL: baseUrl,
|
|
51
51
|
apiURL: apiUrl,
|
|
52
|
-
}), headMovement:
|
|
52
|
+
}), headMovement: true, eyeBlink: true, halfBody: integrationConfig.avatar === 'readyplayerme', animation: animation, speaking: isPlayingAudio, style: integrationConfig.avatar === 'readyplayerme'
|
|
53
53
|
? {
|
|
54
54
|
width: '300px',
|
|
55
55
|
height: '300px',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,4 +7,4 @@ export interface AvatarProps {
|
|
|
7
7
|
onLoaded?: () => void;
|
|
8
8
|
animation?: 'Idle' | 'Idle 1' | 'Idle 2' | 'Idle 3' | 'Loading' | 'Sad' | 'Talk 1' | 'Talk 2' | 'Talk 3';
|
|
9
9
|
}
|
|
10
|
-
export default function Avatar({ url, sex, eyeBlink,
|
|
10
|
+
export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }: AvatarProps): JSX.Element;
|
|
@@ -6,22 +6,29 @@ const react_1 = require("react");
|
|
|
6
6
|
const three_1 = require("three");
|
|
7
7
|
const drei_1 = require("@react-three/drei");
|
|
8
8
|
const useEyeBlink_1 = tslib_1.__importDefault(require("../utils/useEyeBlink"));
|
|
9
|
-
const
|
|
9
|
+
const useLoadingMorphAnim_1 = tslib_1.__importDefault(require("../utils/useLoadingMorphAnim"));
|
|
10
10
|
const useMouthSpeaking_1 = tslib_1.__importDefault(require("../utils/useMouthSpeaking"));
|
|
11
11
|
const fiber_1 = require("@react-three/fiber");
|
|
12
12
|
const utils_1 = require("../utils/utils");
|
|
13
|
+
const useSmile_1 = tslib_1.__importDefault(require("../utils/useSmile"));
|
|
13
14
|
const position = new three_1.Vector3(0, -1, 0);
|
|
14
15
|
const rotation = new three_1.Euler(0.175, 0, 0);
|
|
15
|
-
function Avatar({ url, sex, eyeBlink,
|
|
16
|
+
function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }) {
|
|
17
|
+
var _a, _b;
|
|
16
18
|
const { scene } = (0, drei_1.useGLTF)(url);
|
|
17
19
|
const { animations } = (0, drei_1.useGLTF)(sex === 'MALE'
|
|
18
20
|
? 'https://assets.memori.ai/api/v2/asset/b11eef07-c45b-4959-9d43-be8105365c1f.glb'
|
|
19
21
|
: 'https://assets.memori.ai/api/v2/asset/24dc2bd7-d6b5-4492-ab29-791928b0a669.glb');
|
|
22
|
+
const { animations: loadingAnimations } = (0, drei_1.useGLTF)(sex === 'MALE'
|
|
23
|
+
? 'https://assets.memori.ai/api/v2/asset/2150d3d3-b77d-4489-8455-e6239334e8a7.glb'
|
|
24
|
+
: 'https://assets.memori.ai/api/v2/asset/0a04e5b2-1a02-4964-9534-75c2a7574660.glb');
|
|
20
25
|
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
21
26
|
const anim = (0, drei_1.useAnimations)(animations, scene);
|
|
27
|
+
const loadingAnim = (0, drei_1.useAnimations)(loadingAnimations.filter(a => a.name === 'Loading'), scene);
|
|
22
28
|
(0, useEyeBlink_1.default)(eyeBlink, nodes);
|
|
23
|
-
(0, useHeadMovement_1.default)(headMovement, nodes);
|
|
24
29
|
(0, useMouthSpeaking_1.default)(!!speaking, nodes);
|
|
30
|
+
(0, useLoadingMorphAnim_1.default)(animation === 'Loading', nodes);
|
|
31
|
+
(0, useSmile_1.default)(animation !== 'Sad' && animation !== 'Loading', nodes);
|
|
25
32
|
(0, react_1.useEffect)(() => {
|
|
26
33
|
(0, utils_1.correctMaterials)(materials);
|
|
27
34
|
if (onLoaded)
|
|
@@ -37,17 +44,23 @@ function Avatar({ url, sex, eyeBlink, headMovement, speaking, onLoaded, animatio
|
|
|
37
44
|
let action = anim.actions[name];
|
|
38
45
|
if (!action)
|
|
39
46
|
return;
|
|
40
|
-
else if (name === animation)
|
|
41
|
-
action.play();
|
|
47
|
+
else if (name === animation && animation !== 'Loading')
|
|
48
|
+
action.fadeIn(0.3).play();
|
|
42
49
|
else
|
|
43
|
-
action.stop();
|
|
50
|
+
action.fadeOut(0.3).stop();
|
|
44
51
|
});
|
|
52
|
+
if (animation === 'Loading') {
|
|
53
|
+
(_a = loadingAnim.actions['Loading']) === null || _a === void 0 ? void 0 : _a.fadeIn(0.3).play();
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
(_b = loadingAnim.actions['Loading']) === null || _b === void 0 ? void 0 : _b.fadeOut(0.3).stop();
|
|
57
|
+
}
|
|
45
58
|
}
|
|
46
59
|
else {
|
|
47
60
|
Object.values(anim.actions).forEach(action => {
|
|
48
61
|
if (!action)
|
|
49
62
|
return;
|
|
50
|
-
action === null || action === void 0 ? void 0 : action.reset().stop();
|
|
63
|
+
action === null || action === void 0 ? void 0 : action.fadeOut(0.2).reset().stop();
|
|
51
64
|
});
|
|
52
65
|
}
|
|
53
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
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
|
+
let headMesh;
|
|
6
|
+
let eyesClosedMorphIndex = 0;
|
|
7
|
+
let viseme_UMorphIndex = 0;
|
|
8
|
+
function useLoadingMorphAnim(loading, nodes) {
|
|
9
|
+
(0, react_1.useEffect)(() => {
|
|
10
|
+
if (!loading)
|
|
11
|
+
return;
|
|
12
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
13
|
+
nodes.Wolf3D_Avatar ||
|
|
14
|
+
nodes.Wolf3D_Avatar001);
|
|
15
|
+
if ((headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetDictionary) && (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences)) {
|
|
16
|
+
eyesClosedMorphIndex = headMesh.morphTargetDictionary.mouthOpen;
|
|
17
|
+
viseme_UMorphIndex = headMesh.morphTargetDictionary.viseme_U;
|
|
18
|
+
}
|
|
19
|
+
}, [nodes, loading]);
|
|
20
|
+
(0, fiber_1.useFrame)(() => {
|
|
21
|
+
if (!loading) {
|
|
22
|
+
if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
23
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0;
|
|
24
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
else if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
28
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0.56;
|
|
29
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0.67;
|
|
30
|
+
}
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
exports.default = useLoadingMorphAnim;
|
|
34
|
+
//# sourceMappingURL=useLoadingMorphAnim.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useLoadingMorphAnim.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/utils/useLoadingMorphAnim.ts"],"names":[],"mappings":";;AAEA,iCAAkC;AAClC,8CAA8C;AAE9C,IAAI,QAAqB,CAAC;AAC1B,IAAI,oBAAoB,GAAW,CAAC,CAAC;AACrC,IAAI,kBAAkB,GAAW,CAAC,CAAC;AAEnC,SAAwB,mBAAmB,CACzC,OAA4B,EAC5B,KAAY;IAEZ,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW;YAC3B,KAAK,CAAC,aAAa;YACnB,KAAK,CAAC,gBAAgB,CAAgB,CAAC;QAEzC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,CAAA,EAAE;YACtE,oBAAoB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAChE,kBAAkB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC;SAC9D;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAErB,IAAA,gBAAQ,EAAC,GAAG,EAAE;QACZ,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;gBACnC,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBACzD,QAAQ,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;aACxD;SACF;aAAM,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;YAC1C,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;YAC5D,QAAQ,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AA5BD,sCA4BC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
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
|
+
let headMesh;
|
|
6
|
+
let mouthSmileMorphIndex = 0;
|
|
7
|
+
function useSmile(smiling, nodes) {
|
|
8
|
+
(0, react_1.useEffect)(() => {
|
|
9
|
+
if (!smiling)
|
|
10
|
+
return;
|
|
11
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
12
|
+
nodes.Wolf3D_Avatar ||
|
|
13
|
+
nodes.Wolf3D_Avatar001);
|
|
14
|
+
if ((headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetDictionary) && (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences)) {
|
|
15
|
+
mouthSmileMorphIndex = headMesh.morphTargetDictionary.mouthSmile;
|
|
16
|
+
}
|
|
17
|
+
}, [nodes, smiling]);
|
|
18
|
+
(0, fiber_1.useFrame)(() => {
|
|
19
|
+
if (!smiling) {
|
|
20
|
+
if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
21
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 0;
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
else if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
25
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 1 / 3;
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
exports.default = useSmile;
|
|
30
|
+
//# sourceMappingURL=useSmile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useSmile.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/utils/useSmile.ts"],"names":[],"mappings":";;AAEA,iCAAkC;AAClC,8CAA8C;AAE9C,IAAI,QAAqB,CAAC;AAC1B,IAAI,oBAAoB,GAAW,CAAC,CAAC;AAErC,SAAwB,QAAQ,CAAC,OAA4B,EAAE,KAAY;IACzE,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW;YAC3B,KAAK,CAAC,aAAa;YACnB,KAAK,CAAC,gBAAgB,CAAgB,CAAC;QAEzC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,CAAA,EAAE;YACtE,oBAAoB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,UAAU,CAAC;SAClE;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAErB,IAAA,gBAAQ,EAAC,GAAG,EAAE;QACZ,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;gBACnC,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;aAC1D;SACF;aAAM,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;YAC1C,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,2BAsBC"}
|
|
@@ -46,7 +46,7 @@ const Avatar = ({ memori, integration, integrationConfig, tenant, instruct = fal
|
|
|
46
46
|
resourceURI: memori.avatarURL,
|
|
47
47
|
baseURL: baseUrl,
|
|
48
48
|
apiURL: apiUrl,
|
|
49
|
-
}), headMovement:
|
|
49
|
+
}), headMovement: true, eyeBlink: true, halfBody: integrationConfig.avatar === 'readyplayerme', animation: animation, speaking: isPlayingAudio, style: integrationConfig.avatar === 'readyplayerme'
|
|
50
50
|
? {
|
|
51
51
|
width: '300px',
|
|
52
52
|
height: '300px',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAMlE,OAAO,aAAa,MAAM,gCAAgC,CAAC;AAC3D,OAAO,OAAO,MAAM,eAAe,CAAC;AACpC,OAAO,UAAwC,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,WAAW,MAAM,qCAAqC,CAAC;AAC9D,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,YAAY,MAAM,uBAAuB,CAAC;AACjD,OAAO,IAAI,MAAM,eAAe,CAAC;AACjC,OAAO,EAAE,MAAM,YAAY,CAAC;AAiB5B,MAAM,MAAM,GAAoB,CAAC,EAC/B,MAAM,EACN,WAAW,EACX,iBAAiB,EACjB,MAAM,EACN,QAAQ,GAAG,KAAK,EAChB,eAAe,GAAG,KAAK,EACvB,kBAAkB,EAClB,qBAAqB,GAAG,KAAK,EAC7B,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAK,EACf,OAAO,EACP,MAAM,GACP,EAAE,EAAE;IACH,MAAM,EAAE,CAAC,EAAE,GAAG,cAAc,EAAE,CAAC;IAC/B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CACH,cAAc;QACZ,CAAC,CAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAC7B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACG;QACpC,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,SAAS;YACX,CAAC,CAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CACG,EACxC,CAAC,cAAc,EAAE,OAAO,CAAC,CAC1B,CAAC;IAEF,OAAO,CACL,8BACG,CAAC,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,eAAe;gBAC7C,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,oBAAoB;gBAClD,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,WAAW,CAAC;iBAC5C,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,SAAS,CAAA,CAAC,CAAC,CAAC,CAC7B,8BACE,eACE,SAAS,EAAE,EAAE,CAAC,wBAAwB,EAAE;4BACtC,MAAM,EAAE,CAAC,eAAe;yBACzB,CAAC,aAED,QAAQ;gCACP,CAAC,iBAAiB,CAAC,MAAM,KAAK,eAAe;oCAC3C,iBAAiB,CAAC,MAAM,KAAK,oBAAoB,CAAC,IAAI,CACtD,KAAC,aAAa,IACZ,QAAQ,EACN,cAAK,SAAS,EAAC,wBAAwB,YACpC,QAAQ,IAAI,CACX,KAAC,IAAI,IACH,QAAQ,EAAE,cAAc,EACxB,MAAM,EACJ,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,MAAK,YAAY;4CAC1C,MAAM,CAAC,SAAS;4CAChB,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;4CACzB,CAAC,CAAC,cAAc,CAAC;gDACb,IAAI,EAAE,QAAQ;gDACd,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE;gDACpB,WAAW,EAAE,MAAM,CAAC,SAAS;gDAC7B,OAAO,EAAE,OAAO;gDAChB,MAAM,EAAE,MAAM;6CACf,CAAC;4CACJ,CAAC,CAAC,SAAS,GAEf,CACH,GACG,YAGR,KAAC,UAAU,IACT,GAAG,EAAE,iBAAiB,CAAC,SAAS,EAChC,GAAG,EAAE,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EACtD,WAAW,EAAE,cAAc,CAAC;wCAC1B,IAAI,EAAE,QAAQ;wCACd,QAAQ,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE;wCACpB,WAAW,EAAE,MAAM,CAAC,SAAS;wCAC7B,OAAO,EAAE,OAAO;wCAChB,MAAM,EAAE,MAAM;qCACf,CAAC,EACF,YAAY,
|
|
1
|
+
{"version":3,"file":"Avatar.js","sourceRoot":"","sources":["../../../src/components/Avatar/Avatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,4 +7,4 @@ export interface AvatarProps {
|
|
|
7
7
|
onLoaded?: () => void;
|
|
8
8
|
animation?: 'Idle' | 'Idle 1' | 'Idle 2' | 'Idle 3' | 'Loading' | 'Sad' | 'Talk 1' | 'Talk 2' | 'Talk 3';
|
|
9
9
|
}
|
|
10
|
-
export default function Avatar({ url, sex, eyeBlink,
|
|
10
|
+
export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }: AvatarProps): JSX.Element;
|
|
@@ -1,24 +1,31 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { useEffect } from 'react';
|
|
3
|
-
import { Vector3, Euler } from 'three';
|
|
3
|
+
import { Vector3, Euler, } from 'three';
|
|
4
4
|
import { useAnimations, useGLTF } from '@react-three/drei';
|
|
5
5
|
import useEyeBlink from '../utils/useEyeBlink';
|
|
6
|
-
import
|
|
6
|
+
import useLoadingMorphAnim from '../utils/useLoadingMorphAnim';
|
|
7
7
|
import useMouthSpeaking from '../utils/useMouthSpeaking';
|
|
8
8
|
import { dispose, useGraph } from '@react-three/fiber';
|
|
9
9
|
import { correctMaterials, isSkinnedMesh } from '../utils/utils';
|
|
10
|
+
import useSmile from '../utils/useSmile';
|
|
10
11
|
const position = new Vector3(0, -1, 0);
|
|
11
12
|
const rotation = new Euler(0.175, 0, 0);
|
|
12
|
-
export default function Avatar({ url, sex, eyeBlink,
|
|
13
|
+
export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }) {
|
|
14
|
+
var _a, _b;
|
|
13
15
|
const { scene } = useGLTF(url);
|
|
14
16
|
const { animations } = useGLTF(sex === 'MALE'
|
|
15
17
|
? 'https://assets.memori.ai/api/v2/asset/b11eef07-c45b-4959-9d43-be8105365c1f.glb'
|
|
16
18
|
: 'https://assets.memori.ai/api/v2/asset/24dc2bd7-d6b5-4492-ab29-791928b0a669.glb');
|
|
19
|
+
const { animations: loadingAnimations } = useGLTF(sex === 'MALE'
|
|
20
|
+
? 'https://assets.memori.ai/api/v2/asset/2150d3d3-b77d-4489-8455-e6239334e8a7.glb'
|
|
21
|
+
: 'https://assets.memori.ai/api/v2/asset/0a04e5b2-1a02-4964-9534-75c2a7574660.glb');
|
|
17
22
|
const { nodes, materials } = useGraph(scene);
|
|
18
23
|
const anim = useAnimations(animations, scene);
|
|
24
|
+
const loadingAnim = useAnimations(loadingAnimations.filter(a => a.name === 'Loading'), scene);
|
|
19
25
|
useEyeBlink(eyeBlink, nodes);
|
|
20
|
-
useHeadMovement(headMovement, nodes);
|
|
21
26
|
useMouthSpeaking(!!speaking, nodes);
|
|
27
|
+
useLoadingMorphAnim(animation === 'Loading', nodes);
|
|
28
|
+
useSmile(animation !== 'Sad' && animation !== 'Loading', nodes);
|
|
22
29
|
useEffect(() => {
|
|
23
30
|
correctMaterials(materials);
|
|
24
31
|
if (onLoaded)
|
|
@@ -34,17 +41,23 @@ export default function Avatar({ url, sex, eyeBlink, headMovement, speaking, onL
|
|
|
34
41
|
let action = anim.actions[name];
|
|
35
42
|
if (!action)
|
|
36
43
|
return;
|
|
37
|
-
else if (name === animation)
|
|
38
|
-
action.play();
|
|
44
|
+
else if (name === animation && animation !== 'Loading')
|
|
45
|
+
action.fadeIn(0.3).play();
|
|
39
46
|
else
|
|
40
|
-
action.stop();
|
|
47
|
+
action.fadeOut(0.3).stop();
|
|
41
48
|
});
|
|
49
|
+
if (animation === 'Loading') {
|
|
50
|
+
(_a = loadingAnim.actions['Loading']) === null || _a === void 0 ? void 0 : _a.fadeIn(0.3).play();
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
(_b = loadingAnim.actions['Loading']) === null || _b === void 0 ? void 0 : _b.fadeOut(0.3).stop();
|
|
54
|
+
}
|
|
42
55
|
}
|
|
43
56
|
else {
|
|
44
57
|
Object.values(anim.actions).forEach(action => {
|
|
45
58
|
if (!action)
|
|
46
59
|
return;
|
|
47
|
-
action === null || action === void 0 ? void 0 : action.reset().stop();
|
|
60
|
+
action === null || action === void 0 ? void 0 : action.fadeOut(0.2).reset().stop();
|
|
48
61
|
});
|
|
49
62
|
}
|
|
50
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAQ,SAAS,EAAW,MAAM,OAAO,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { useEffect } from 'react';
|
|
2
|
+
import { useFrame } from '@react-three/fiber';
|
|
3
|
+
let headMesh;
|
|
4
|
+
let eyesClosedMorphIndex = 0;
|
|
5
|
+
let viseme_UMorphIndex = 0;
|
|
6
|
+
export default function useLoadingMorphAnim(loading, nodes) {
|
|
7
|
+
useEffect(() => {
|
|
8
|
+
if (!loading)
|
|
9
|
+
return;
|
|
10
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
11
|
+
nodes.Wolf3D_Avatar ||
|
|
12
|
+
nodes.Wolf3D_Avatar001);
|
|
13
|
+
if ((headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetDictionary) && (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences)) {
|
|
14
|
+
eyesClosedMorphIndex = headMesh.morphTargetDictionary.mouthOpen;
|
|
15
|
+
viseme_UMorphIndex = headMesh.morphTargetDictionary.viseme_U;
|
|
16
|
+
}
|
|
17
|
+
}, [nodes, loading]);
|
|
18
|
+
useFrame(() => {
|
|
19
|
+
if (!loading) {
|
|
20
|
+
if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
21
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0;
|
|
22
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
else if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
26
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0.56;
|
|
27
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0.67;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=useLoadingMorphAnim.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useLoadingMorphAnim.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/utils/useLoadingMorphAnim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,IAAI,QAAqB,CAAC;AAC1B,IAAI,oBAAoB,GAAW,CAAC,CAAC;AACrC,IAAI,kBAAkB,GAAW,CAAC,CAAC;AAEnC,MAAM,CAAC,OAAO,UAAU,mBAAmB,CACzC,OAA4B,EAC5B,KAAY;IAEZ,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW;YAC3B,KAAK,CAAC,aAAa;YACnB,KAAK,CAAC,gBAAgB,CAAgB,CAAC;QAEzC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,CAAA,EAAE;YACtE,oBAAoB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAChE,kBAAkB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC;SAC9D;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAErB,QAAQ,CAAC,GAAG,EAAE;QACZ,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;gBACnC,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBACzD,QAAQ,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;aACxD;SACF;aAAM,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;YAC1C,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC;YAC5D,QAAQ,CAAC,qBAAqB,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;SAC3D;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import { useEffect } from 'react';
|
|
2
|
+
import { useFrame } from '@react-three/fiber';
|
|
3
|
+
let headMesh;
|
|
4
|
+
let mouthSmileMorphIndex = 0;
|
|
5
|
+
export default function useSmile(smiling, nodes) {
|
|
6
|
+
useEffect(() => {
|
|
7
|
+
if (!smiling)
|
|
8
|
+
return;
|
|
9
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
10
|
+
nodes.Wolf3D_Avatar ||
|
|
11
|
+
nodes.Wolf3D_Avatar001);
|
|
12
|
+
if ((headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetDictionary) && (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences)) {
|
|
13
|
+
mouthSmileMorphIndex = headMesh.morphTargetDictionary.mouthSmile;
|
|
14
|
+
}
|
|
15
|
+
}, [nodes, smiling]);
|
|
16
|
+
useFrame(() => {
|
|
17
|
+
if (!smiling) {
|
|
18
|
+
if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
19
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 0;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
else if (headMesh === null || headMesh === void 0 ? void 0 : headMesh.morphTargetInfluences) {
|
|
23
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 1 / 3;
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=useSmile.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useSmile.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/utils/useSmile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C,IAAI,QAAqB,CAAC;AAC1B,IAAI,oBAAoB,GAAW,CAAC,CAAC;AAErC,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,OAA4B,EAAE,KAAY;IACzE,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,QAAQ,GAAG,CAAC,KAAK,CAAC,WAAW;YAC3B,KAAK,CAAC,aAAa;YACnB,KAAK,CAAC,gBAAgB,CAAgB,CAAC;QAEzC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,MAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,CAAA,EAAE;YACtE,oBAAoB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,UAAU,CAAC;SAClE;IACH,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IAErB,QAAQ,CAAC,GAAG,EAAE;QACZ,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;gBACnC,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;aAC1D;SACF;aAAM,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,qBAAqB,EAAE;YAC1C,QAAQ,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/package.json
CHANGED
|
@@ -116,7 +116,7 @@ const Avatar: React.FC<Props> = ({
|
|
|
116
116
|
baseURL: baseUrl,
|
|
117
117
|
apiURL: apiUrl,
|
|
118
118
|
})}
|
|
119
|
-
headMovement
|
|
119
|
+
headMovement
|
|
120
120
|
eyeBlink
|
|
121
121
|
halfBody={integrationConfig.avatar === 'readyplayerme'}
|
|
122
122
|
animation={animation}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
1
|
import React, { memo, useEffect, useMemo } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
AnimationMixer,
|
|
4
|
+
Object3D,
|
|
5
|
+
Vector3,
|
|
6
|
+
Euler,
|
|
7
|
+
AnimationActionLoopStyles,
|
|
8
|
+
SkinnedMesh,
|
|
9
|
+
} from 'three';
|
|
3
10
|
import { useAnimations, useGLTF } from '@react-three/drei';
|
|
4
11
|
import useEyeBlink from '../utils/useEyeBlink';
|
|
5
|
-
import
|
|
12
|
+
import useLoadingMorphAnim from '../utils/useLoadingMorphAnim';
|
|
6
13
|
import useMouthSpeaking from '../utils/useMouthSpeaking';
|
|
7
14
|
import { dispose, useGraph } from '@react-three/fiber';
|
|
8
15
|
import { correctMaterials, hideHands, isSkinnedMesh } from '../utils/utils';
|
|
16
|
+
import useSmile from '../utils/useSmile';
|
|
9
17
|
|
|
10
18
|
export interface AvatarProps {
|
|
11
19
|
url: string;
|
|
@@ -33,7 +41,6 @@ export default function Avatar({
|
|
|
33
41
|
url,
|
|
34
42
|
sex,
|
|
35
43
|
eyeBlink,
|
|
36
|
-
headMovement,
|
|
37
44
|
speaking,
|
|
38
45
|
onLoaded,
|
|
39
46
|
animation,
|
|
@@ -44,13 +51,24 @@ export default function Avatar({
|
|
|
44
51
|
? 'https://assets.memori.ai/api/v2/asset/b11eef07-c45b-4959-9d43-be8105365c1f.glb'
|
|
45
52
|
: 'https://assets.memori.ai/api/v2/asset/24dc2bd7-d6b5-4492-ab29-791928b0a669.glb'
|
|
46
53
|
);
|
|
54
|
+
const { animations: loadingAnimations } = useGLTF(
|
|
55
|
+
sex === 'MALE'
|
|
56
|
+
? 'https://assets.memori.ai/api/v2/asset/2150d3d3-b77d-4489-8455-e6239334e8a7.glb'
|
|
57
|
+
: 'https://assets.memori.ai/api/v2/asset/0a04e5b2-1a02-4964-9534-75c2a7574660.glb'
|
|
58
|
+
);
|
|
47
59
|
const { nodes, materials } = useGraph(scene);
|
|
48
60
|
|
|
49
61
|
const anim = useAnimations(animations, scene);
|
|
62
|
+
const loadingAnim = useAnimations(
|
|
63
|
+
loadingAnimations.filter(a => a.name === 'Loading'),
|
|
64
|
+
scene
|
|
65
|
+
);
|
|
50
66
|
|
|
51
67
|
useEyeBlink(eyeBlink, nodes);
|
|
52
|
-
useHeadMovement(headMovement, nodes);
|
|
68
|
+
// useHeadMovement(headMovement, nodes);
|
|
53
69
|
useMouthSpeaking(!!speaking, nodes);
|
|
70
|
+
useLoadingMorphAnim(animation === 'Loading', nodes);
|
|
71
|
+
useSmile(animation !== 'Sad' && animation !== 'Loading', nodes);
|
|
54
72
|
|
|
55
73
|
useEffect(() => {
|
|
56
74
|
correctMaterials(materials);
|
|
@@ -69,13 +87,19 @@ export default function Avatar({
|
|
|
69
87
|
Object.keys(anim.actions).forEach(name => {
|
|
70
88
|
let action = anim.actions[name];
|
|
71
89
|
if (!action) return;
|
|
72
|
-
else if (name === animation
|
|
73
|
-
|
|
90
|
+
else if (name === animation && animation !== 'Loading')
|
|
91
|
+
action.fadeIn(0.3).play();
|
|
92
|
+
else action.fadeOut(0.3).stop();
|
|
74
93
|
});
|
|
94
|
+
if (animation === 'Loading') {
|
|
95
|
+
loadingAnim.actions['Loading']?.fadeIn(0.3).play();
|
|
96
|
+
} else {
|
|
97
|
+
loadingAnim.actions['Loading']?.fadeOut(0.3).stop();
|
|
98
|
+
}
|
|
75
99
|
} else {
|
|
76
100
|
Object.values(anim.actions).forEach(action => {
|
|
77
101
|
if (!action) return;
|
|
78
|
-
action?.reset().stop();
|
|
102
|
+
action?.fadeOut(0.2).reset().stop();
|
|
79
103
|
});
|
|
80
104
|
}
|
|
81
105
|
} catch (e) {
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { Nodes } from './utils';
|
|
2
|
+
import { SkinnedMesh } from 'three';
|
|
3
|
+
import { useEffect } from 'react';
|
|
4
|
+
import { useFrame } from '@react-three/fiber';
|
|
5
|
+
|
|
6
|
+
let headMesh: SkinnedMesh;
|
|
7
|
+
let eyesClosedMorphIndex: number = 0;
|
|
8
|
+
let viseme_UMorphIndex: number = 0;
|
|
9
|
+
|
|
10
|
+
export default function useLoadingMorphAnim(
|
|
11
|
+
loading: boolean | undefined,
|
|
12
|
+
nodes: Nodes
|
|
13
|
+
) {
|
|
14
|
+
useEffect(() => {
|
|
15
|
+
if (!loading) return;
|
|
16
|
+
|
|
17
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
18
|
+
nodes.Wolf3D_Avatar ||
|
|
19
|
+
nodes.Wolf3D_Avatar001) as SkinnedMesh;
|
|
20
|
+
|
|
21
|
+
if (headMesh?.morphTargetDictionary && headMesh?.morphTargetInfluences) {
|
|
22
|
+
eyesClosedMorphIndex = headMesh.morphTargetDictionary.mouthOpen;
|
|
23
|
+
viseme_UMorphIndex = headMesh.morphTargetDictionary.viseme_U;
|
|
24
|
+
}
|
|
25
|
+
}, [nodes, loading]);
|
|
26
|
+
|
|
27
|
+
useFrame(() => {
|
|
28
|
+
if (!loading) {
|
|
29
|
+
if (headMesh?.morphTargetInfluences) {
|
|
30
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0;
|
|
31
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0;
|
|
32
|
+
}
|
|
33
|
+
} else if (headMesh?.morphTargetInfluences) {
|
|
34
|
+
headMesh.morphTargetInfluences[eyesClosedMorphIndex] = 0.56;
|
|
35
|
+
headMesh.morphTargetInfluences[viseme_UMorphIndex] = 0.67;
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Nodes } from './utils';
|
|
2
|
+
import { SkinnedMesh } from 'three';
|
|
3
|
+
import { useEffect } from 'react';
|
|
4
|
+
import { useFrame } from '@react-three/fiber';
|
|
5
|
+
|
|
6
|
+
let headMesh: SkinnedMesh;
|
|
7
|
+
let mouthSmileMorphIndex: number = 0;
|
|
8
|
+
|
|
9
|
+
export default function useSmile(smiling: boolean | undefined, nodes: Nodes) {
|
|
10
|
+
useEffect(() => {
|
|
11
|
+
if (!smiling) return;
|
|
12
|
+
|
|
13
|
+
headMesh = (nodes.Wolf3D_Head ||
|
|
14
|
+
nodes.Wolf3D_Avatar ||
|
|
15
|
+
nodes.Wolf3D_Avatar001) as SkinnedMesh;
|
|
16
|
+
|
|
17
|
+
if (headMesh?.morphTargetDictionary && headMesh?.morphTargetInfluences) {
|
|
18
|
+
mouthSmileMorphIndex = headMesh.morphTargetDictionary.mouthSmile;
|
|
19
|
+
}
|
|
20
|
+
}, [nodes, smiling]);
|
|
21
|
+
|
|
22
|
+
useFrame(() => {
|
|
23
|
+
if (!smiling) {
|
|
24
|
+
if (headMesh?.morphTargetInfluences) {
|
|
25
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 0;
|
|
26
|
+
}
|
|
27
|
+
} else if (headMesh?.morphTargetInfluences) {
|
|
28
|
+
headMesh.morphTargetInfluences[mouthSmileMorphIndex] = 1 / 3;
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
}
|