@memori.ai/memori-react 2.21.0 → 2.22.0
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 +7 -0
- package/dist/components/AvatarView/components/fullbodyAvatar.js +1 -3
- package/dist/components/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/AvatarView/components/fullbodyAvatar.js +1 -3
- package/esm/components/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/package.json +1 -1
- package/src/components/AvatarView/components/fullbodyAvatar.tsx +1 -19
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [2.22.0](https://github.com/memori-ai/memori-react/compare/v2.21.0...v2.22.0) (2023-12-06)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* fix loading animations, united in one glb ([e56fbd3](https://github.com/memori-ai/memori-react/commit/e56fbd33e8614f9f74d2d8f2462af454213e40f4))
|
|
9
|
+
|
|
3
10
|
## [2.21.0](https://github.com/memori-ai/memori-react/compare/v2.20.2...v2.21.0) (2023-12-05)
|
|
4
11
|
|
|
5
12
|
|
|
@@ -18,10 +18,8 @@ function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }) {
|
|
|
18
18
|
const { animations } = (0, drei_1.useGLTF)(sex === 'MALE'
|
|
19
19
|
? 'https://assets.memori.ai/api/v2/asset/5de7456f-0cd8-4e29-95a7-0cd0045a5325.glb'
|
|
20
20
|
: 'https://assets.memori.ai/api/v2/asset/84487a2b-377c-4565-800a-51459d580ec8.glb');
|
|
21
|
-
const { animations: loadingAnimations } = (0, drei_1.useGLTF)('https://assets.memori.ai/api/v2/asset/ebb61fe1-6b0d-4b11-a032-292b7ef307a4.glb');
|
|
22
21
|
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
23
22
|
const anim = (0, drei_1.useAnimations)(animations, scene);
|
|
24
|
-
const loadingAnim = (0, drei_1.useAnimations)(loadingAnimations.filter(a => a.name === 'Loading'), scene);
|
|
25
23
|
(0, useEyeBlink_1.default)(eyeBlink, nodes);
|
|
26
24
|
(0, useMouthSpeaking_1.default)(!!speaking, nodes);
|
|
27
25
|
(0, useLoadingMorphAnim_1.default)(animation === 'Loading', nodes);
|
|
@@ -41,7 +39,7 @@ function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animation, }) {
|
|
|
41
39
|
let action = anim.actions[name];
|
|
42
40
|
if (!action)
|
|
43
41
|
return;
|
|
44
|
-
else if (name === animation
|
|
42
|
+
else if (name === animation)
|
|
45
43
|
action.fadeIn(0.3).play();
|
|
46
44
|
else
|
|
47
45
|
action.fadeOut(0.3).stop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAwD;AACxD,iCAOe;AACf,4CAA2D;AAC3D,+EAA+C;AAC/C,+FAA+D;AAC/D,yFAAyD;AACzD,8CAAuD;AACvD,0CAA4E;AAC5E,yEAAyC;AAqBzC,MAAM,QAAQ,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,MAAM,QAAQ,GAAG,IAAI,aAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAExC,SAAwB,MAAM,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,GACG;IACZ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAO,EAC5B,GAAG,KAAK,MAAM;QACZ,CAAC,CAAC,gFAAgF;QAClF,CAAC,CAAC,gFAAgF,CACrF,CAAC;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAwD;AACxD,iCAOe;AACf,4CAA2D;AAC3D,+EAA+C;AAC/C,+FAA+D;AAC/D,yFAAyD;AACzD,8CAAuD;AACvD,0CAA4E;AAC5E,yEAAyC;AAqBzC,MAAM,QAAQ,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,MAAM,QAAQ,GAAG,IAAI,aAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAExC,SAAwB,MAAM,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,GACG;IACZ,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAO,EAC5B,GAAG,KAAK,MAAM;QACZ,CAAC,CAAC,gFAAgF;QAClF,CAAC,CAAC,gFAAgF,CACrF,CAAC;IACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE7C,MAAM,IAAI,GAAG,IAAA,oBAAa,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAE9C,IAAA,qBAAW,EAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IAE7B,IAAA,0BAAgB,EAAC,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpC,IAAA,6BAAmB,EAAC,SAAS,KAAK,SAAS,EAAE,KAAK,CAAC,CAAC;IACpD,IAAA,kBAAQ,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC;IAE/C,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,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,IAAI;QACF,IAAI,SAAS,IAAI,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE;YAC1C,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvC,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,CAAC,MAAM;oBAAE,OAAO;qBACf,IAAI,IAAI,KAAK,SAAS;oBAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;;oBAClD,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAClC,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC3C,IAAI,CAAC,MAAM;oBAAE,OAAO;gBACpB,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,CAAC,GAAG,EAAE,KAAK,GAAG,IAAI,EAAE,CAAC;YACtC,CAAC,CAAC,CAAC;SACJ;KACF;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,OAAO,CACL,kCAAO,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,YAC3C,sCAAW,MAAM,EAAE,KAAK,GAAI,GACtB,CACT,CAAC;AACJ,CAAC;AA3DD,yBA2DC"}
|
|
@@ -15,10 +15,8 @@ export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animati
|
|
|
15
15
|
const { animations } = useGLTF(sex === 'MALE'
|
|
16
16
|
? 'https://assets.memori.ai/api/v2/asset/5de7456f-0cd8-4e29-95a7-0cd0045a5325.glb'
|
|
17
17
|
: 'https://assets.memori.ai/api/v2/asset/84487a2b-377c-4565-800a-51459d580ec8.glb');
|
|
18
|
-
const { animations: loadingAnimations } = useGLTF('https://assets.memori.ai/api/v2/asset/ebb61fe1-6b0d-4b11-a032-292b7ef307a4.glb');
|
|
19
18
|
const { nodes, materials } = useGraph(scene);
|
|
20
19
|
const anim = useAnimations(animations, scene);
|
|
21
|
-
const loadingAnim = useAnimations(loadingAnimations.filter(a => a.name === 'Loading'), scene);
|
|
22
20
|
useEyeBlink(eyeBlink, nodes);
|
|
23
21
|
useMouthSpeaking(!!speaking, nodes);
|
|
24
22
|
useLoadingMorphAnim(animation === 'Loading', nodes);
|
|
@@ -38,7 +36,7 @@ export default function Avatar({ url, sex, eyeBlink, speaking, onLoaded, animati
|
|
|
38
36
|
let action = anim.actions[name];
|
|
39
37
|
if (!action)
|
|
40
38
|
return;
|
|
41
|
-
else if (name === animation
|
|
39
|
+
else if (name === animation)
|
|
42
40
|
action.fadeIn(0.3).play();
|
|
43
41
|
else
|
|
44
42
|
action.fadeOut(0.3).stop();
|
|
@@ -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,EAGL,OAAO,EACP,KAAK,GAGN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,mBAAmB,MAAM,8BAA8B,CAAC;AAC/D,OAAO,gBAAgB,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAa,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAqBzC,MAAM,QAAQ,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACvC,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAExC,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,GACG;IACZ,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAC5B,GAAG,KAAK,MAAM;QACZ,CAAC,CAAC,gFAAgF;QAClF,CAAC,CAAC,gFAAgF,CACrF,CAAC;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../src/components/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -51,21 +51,9 @@ export default function Avatar({
|
|
|
51
51
|
? 'https://assets.memori.ai/api/v2/asset/5de7456f-0cd8-4e29-95a7-0cd0045a5325.glb'
|
|
52
52
|
: 'https://assets.memori.ai/api/v2/asset/84487a2b-377c-4565-800a-51459d580ec8.glb'
|
|
53
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
|
-
// );
|
|
59
|
-
const { animations: loadingAnimations } = useGLTF(
|
|
60
|
-
'https://assets.memori.ai/api/v2/asset/ebb61fe1-6b0d-4b11-a032-292b7ef307a4.glb'
|
|
61
|
-
);
|
|
62
54
|
const { nodes, materials } = useGraph(scene);
|
|
63
55
|
|
|
64
56
|
const anim = useAnimations(animations, scene);
|
|
65
|
-
const loadingAnim = useAnimations(
|
|
66
|
-
loadingAnimations.filter(a => a.name === 'Loading'),
|
|
67
|
-
scene
|
|
68
|
-
);
|
|
69
57
|
|
|
70
58
|
useEyeBlink(eyeBlink, nodes);
|
|
71
59
|
// useHeadMovement(headMovement, nodes);
|
|
@@ -90,15 +78,9 @@ export default function Avatar({
|
|
|
90
78
|
Object.keys(anim.actions).forEach(name => {
|
|
91
79
|
let action = anim.actions[name];
|
|
92
80
|
if (!action) return;
|
|
93
|
-
else if (name === animation
|
|
94
|
-
action.fadeIn(0.3).play();
|
|
81
|
+
else if (name === animation) action.fadeIn(0.3).play();
|
|
95
82
|
else action.fadeOut(0.3).stop();
|
|
96
83
|
});
|
|
97
|
-
// if (animation === 'Loading') {
|
|
98
|
-
// loadingAnim.actions['Loading']?.fadeIn(0.3).play();
|
|
99
|
-
// } else {
|
|
100
|
-
// loadingAnim.actions['Loading']?.fadeOut(0.3).stop();
|
|
101
|
-
// }
|
|
102
84
|
} else {
|
|
103
85
|
Object.values(anim.actions).forEach(action => {
|
|
104
86
|
if (!action) return;
|