@memori.ai/memori-react 7.6.1 → 7.7.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 +30 -0
- package/dist/components/AttachmentMediaModal/AttachmentMediaModal.d.ts +14 -0
- package/dist/components/AttachmentMediaModal/AttachmentMediaModal.js +66 -0
- package/dist/components/AttachmentMediaModal/AttachmentMediaModal.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +51 -26
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js +8 -6
- package/dist/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/utils/useMouthSpeaking.js +1 -1
- package/dist/components/Avatar/AvatarView/utils/useMouthSpeaking.js.map +1 -1
- package/dist/components/ImageUpload/ImageUpload.css +168 -0
- package/dist/components/ImageUpload/ImageUpload.d.ts +28 -0
- package/dist/components/ImageUpload/ImageUpload.js +163 -0
- package/dist/components/ImageUpload/ImageUpload.js.map +1 -0
- package/dist/components/MemoriWidget/MemoriWidget.js +2 -1
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/components/layouts/Default.d.ts +17 -0
- package/dist/components/layouts/Default.js +8 -0
- package/dist/components/layouts/Default.js.map +1 -0
- package/dist/components/layouts/ZoomedFullBody.d.ts +2 -2
- package/dist/components/layouts/ZoomedFullBody.js +11 -2
- package/dist/components/layouts/ZoomedFullBody.js.map +1 -1
- package/dist/components/layouts/zoomed-full-body.css +16 -0
- package/dist/components/ui/Message.d.ts +17 -0
- package/dist/components/ui/Message.js +13 -0
- package/dist/components/ui/Message.js.map +1 -0
- package/dist/context/visemeContext.js +36 -11
- package/dist/context/visemeContext.js.map +1 -1
- package/dist/helpers/translations.js +10 -2
- package/dist/helpers/translations.js.map +1 -1
- package/dist/helpers/utils.js +5 -6
- package/dist/helpers/utils.js.map +1 -1
- package/dist/styles.css +1 -1
- package/esm/components/AttachmentMediaModal/AttachmentMediaModal.d.ts +14 -0
- package/esm/components/AttachmentMediaModal/AttachmentMediaModal.js +63 -0
- package/esm/components/AttachmentMediaModal/AttachmentMediaModal.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +53 -28
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js +8 -6
- package/esm/components/Avatar/AvatarView/components/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/utils/useMouthSpeaking.js +1 -1
- package/esm/components/Avatar/AvatarView/utils/useMouthSpeaking.js.map +1 -1
- package/esm/components/ImageUpload/ImageUpload.css +168 -0
- package/esm/components/ImageUpload/ImageUpload.d.ts +28 -0
- package/esm/components/ImageUpload/ImageUpload.js +160 -0
- package/esm/components/ImageUpload/ImageUpload.js.map +1 -0
- package/esm/components/MemoriWidget/MemoriWidget.js +2 -1
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/components/layouts/Default.d.ts +17 -0
- package/esm/components/layouts/Default.js +5 -0
- package/esm/components/layouts/Default.js.map +1 -0
- package/esm/components/layouts/ZoomedFullBody.d.ts +2 -2
- package/esm/components/layouts/ZoomedFullBody.js +11 -2
- package/esm/components/layouts/ZoomedFullBody.js.map +1 -1
- package/esm/components/layouts/zoomed-full-body.css +16 -0
- package/esm/components/ui/Message.d.ts +17 -0
- package/esm/components/ui/Message.js +10 -0
- package/esm/components/ui/Message.js.map +1 -0
- package/esm/context/visemeContext.js +36 -11
- package/esm/context/visemeContext.js.map +1 -1
- package/esm/helpers/translations.js +10 -2
- package/esm/helpers/translations.js.map +1 -1
- package/esm/helpers/utils.js +5 -6
- package/esm/helpers/utils.js.map +1 -1
- package/esm/styles.css +1 -1
- package/package.json +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx +81 -36
- package/src/components/MemoriWidget/MemoriWidget.tsx +3 -2
- package/src/components/layouts/ZoomedFullBody.test.tsx +1 -1
- package/src/components/layouts/ZoomedFullBody.tsx +38 -29
- package/src/components/layouts/__snapshots__/ZoomedFullBody.test.tsx.snap +25 -21
- package/src/components/layouts/zoomed-full-body.css +16 -0
- package/src/context/visemeContext.tsx +68 -51
- package/src/helpers/translations.ts +11 -8
- package/src/helpers/utils.ts +9 -8
- package/src/index.stories.tsx +23 -21
- package/src/styles.css +1 -1
- 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/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/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/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/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
package/CHANGELOG.md
CHANGED
|
@@ -1,11 +1,41 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [7.7.1](https://github.com/memori-ai/memori-react/compare/v7.7.0...v7.7.1) (2024-10-15)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* fine tuned lip sync ([5d71023](https://github.com/memori-ai/memori-react/commit/5d71023b78a1722872096a0577cb14cae8848eb8))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* fine tuned lip sync and base animations ([6905874](https://github.com/memori-ai/memori-react/commit/69058747e48944c7054802e829654895d4b7823a))
|
|
14
|
+
|
|
15
|
+
## [7.7.0](https://github.com/memori-ai/memori-react/compare/v7.6.1...v7.7.0) (2024-10-15)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### Features
|
|
19
|
+
|
|
20
|
+
* improve lip sync ([#20](https://github.com/memori-ai/memori-react/issues/20)) ([e13f520](https://github.com/memori-ai/memori-react/commit/e13f520eb91bd8af1cc42578da29316f0b25033e))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Bug Fixes
|
|
24
|
+
|
|
25
|
+
* avatar 3d animations, fine tuned lip sync values and removed useless function to useEffect ([1a51c26](https://github.com/memori-ai/memori-react/commit/1a51c26a0220bc9a312c7c34072188e642742111))
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Changes
|
|
29
|
+
|
|
30
|
+
* translate api as post ([04a963c](https://github.com/memori-ai/memori-react/commit/04a963c4bab72d613bbee4a0d7af01715ec1b0e0))
|
|
31
|
+
|
|
3
32
|
## [7.6.1](https://github.com/memori-ai/memori-react/compare/v7.6.0...v7.6.1) (2024-10-11)
|
|
4
33
|
|
|
5
34
|
|
|
6
35
|
### Bug Fixes
|
|
7
36
|
|
|
8
37
|
* added 'memori-' to all of hidden chat classes ([adebe23](https://github.com/memori-ai/memori-react/commit/adebe23427d249be67b9ee138f32dcaa312af672))
|
|
38
|
+
* added DateSelector inside the Jest ignore patterns ([92787c6](https://github.com/memori-ai/memori-react/commit/92787c6db38d88fb5f5ff56dca732e2bf29c7a40))
|
|
9
39
|
|
|
10
40
|
## [7.6.0](https://github.com/memori-ai/memori-react/compare/v7.5.1...v7.6.0) (2024-10-11)
|
|
11
41
|
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Asset, ResponseSpec } from '@memori.ai/memori-api-client/dist/types';
|
|
2
|
+
export interface Props {
|
|
3
|
+
visible: boolean;
|
|
4
|
+
authToken: string;
|
|
5
|
+
sessionID: string;
|
|
6
|
+
tenantID: string;
|
|
7
|
+
uploadAssetURL: string;
|
|
8
|
+
deleteAsset: (token: string, assetURL: string) => Promise<ResponseSpec>;
|
|
9
|
+
onCancel?: () => void;
|
|
10
|
+
onOk: (asset: Asset) => Promise<void>;
|
|
11
|
+
apiURL?: string;
|
|
12
|
+
}
|
|
13
|
+
declare const AttachmentMediaModal: ({ visible, authToken, sessionID, tenantID, uploadAssetURL, deleteAsset, onCancel, onOk, apiURL, }: Props) => JSX.Element;
|
|
14
|
+
export default AttachmentMediaModal;
|
|
@@ -0,0 +1,66 @@
|
|
|
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 react_i18next_1 = require("react-i18next");
|
|
7
|
+
const error_1 = require("../../helpers/error");
|
|
8
|
+
const constants_1 = require("../../helpers/constants");
|
|
9
|
+
const media_1 = require("../../helpers/media");
|
|
10
|
+
const Modal_1 = tslib_1.__importDefault(require("../ui/Modal"));
|
|
11
|
+
const Message_1 = tslib_1.__importDefault(require("../ui/Message"));
|
|
12
|
+
const Button_1 = tslib_1.__importDefault(require("../ui/Button"));
|
|
13
|
+
const ImageUpload_1 = tslib_1.__importDefault(require("../ImageUpload/ImageUpload"));
|
|
14
|
+
const AttachmentMediaModal = ({ visible, authToken, sessionID, tenantID, uploadAssetURL, deleteAsset, onCancel, onOk, apiURL, }) => {
|
|
15
|
+
const { t } = (0, react_i18next_1.useTranslation)();
|
|
16
|
+
const [asset, setAsset] = (0, react_1.useState)();
|
|
17
|
+
return ((0, jsx_runtime_1.jsx)(Modal_1.default, { open: visible, title: t('media.addMediaLabel'), className: "attachment-media-modal", closable: true, width: "100%", widthMd: "100%", onClose: () => {
|
|
18
|
+
if (onCancel)
|
|
19
|
+
onCancel();
|
|
20
|
+
}, footer: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(Button_1.default, { onClick: onCancel, children: t('cancel') }), (0, jsx_runtime_1.jsx)(Button_1.default, { primary: true, onClick: () => {
|
|
21
|
+
if (asset)
|
|
22
|
+
onOk(asset);
|
|
23
|
+
setAsset(undefined);
|
|
24
|
+
}, disabled: !asset, children: t('confirm') })] }), children: (0, jsx_runtime_1.jsx)(ImageUpload_1.default, { tenantID: tenantID, apiUrl: apiURL, uploadMultipleImages: false, maxNumberOfVisualizedUploads: 1, maxFileSizeInMB: 100, uploadUrl: uploadAssetURL, useImageCrop: false, allowedMimeTypes: constants_1.allowedMediaTypes, fileList: asset
|
|
25
|
+
? [
|
|
26
|
+
{
|
|
27
|
+
uid: `-1`,
|
|
28
|
+
name: asset.assetID,
|
|
29
|
+
status: 'done',
|
|
30
|
+
thumbUrl: (0, media_1.getResourceUrl)({
|
|
31
|
+
resourceURI: asset.assetURL,
|
|
32
|
+
tenantID,
|
|
33
|
+
apiURL,
|
|
34
|
+
sessionID,
|
|
35
|
+
}),
|
|
36
|
+
},
|
|
37
|
+
]
|
|
38
|
+
: [], uploadMessage: t('media.mediaUploadMessage'), imageProportions: 1, onUploadFinished: (file) => {
|
|
39
|
+
let newAsset = file.response.asset;
|
|
40
|
+
let response = file.response;
|
|
41
|
+
if (response.resultCode === 0) {
|
|
42
|
+
setAsset(newAsset);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
console.error(response, file);
|
|
46
|
+
Message_1.default.error(t((0, error_1.getErrori18nKey)(response.resultCode)));
|
|
47
|
+
}
|
|
48
|
+
}, onFileChanged: (_assetID, asset) => {
|
|
49
|
+
setAsset(a => ({
|
|
50
|
+
...(a || {}),
|
|
51
|
+
...asset,
|
|
52
|
+
}));
|
|
53
|
+
}, onRemove: async (file) => {
|
|
54
|
+
const resp = await deleteAsset(authToken, file.thumbUrl);
|
|
55
|
+
if (resp.resultCode === 0) {
|
|
56
|
+
setAsset(undefined);
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
console.error(resp, file);
|
|
60
|
+
Message_1.default.error(t((0, error_1.getErrori18nKey)(resp.resultCode)));
|
|
61
|
+
}
|
|
62
|
+
return resp.resultCode === 0;
|
|
63
|
+
} }) }));
|
|
64
|
+
};
|
|
65
|
+
exports.default = AttachmentMediaModal;
|
|
66
|
+
//# sourceMappingURL=AttachmentMediaModal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AttachmentMediaModal.js","sourceRoot":"","sources":["../../../src/components/AttachmentMediaModal/AttachmentMediaModal.tsx"],"names":[],"mappings":"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"}
|
|
@@ -26,5 +26,5 @@ interface FullbodyAvatarProps {
|
|
|
26
26
|
eyeBlink?: boolean;
|
|
27
27
|
clearVisemes: () => void;
|
|
28
28
|
}
|
|
29
|
-
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef,
|
|
29
|
+
export default function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, }: FullbodyAvatarProps): JSX.Element;
|
|
30
30
|
export {};
|
|
@@ -14,11 +14,11 @@ const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
|
|
|
14
14
|
const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
|
|
15
15
|
const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
|
|
16
16
|
const ANIMATION_URLS = {
|
|
17
|
-
MALE: 'https://assets.memori.ai/api/v2/asset/
|
|
18
|
-
FEMALE: 'https://assets.memori.ai/api/v2/asset/
|
|
17
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
18
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/0e49aa5d-f757-4292-a170-d843c2839a41.glb',
|
|
19
19
|
};
|
|
20
|
-
const
|
|
21
|
-
function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef,
|
|
20
|
+
const TRANSITION_DURATION = 0.5;
|
|
21
|
+
function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZoomed, setMorphTargetInfluences, setMorphTargetDictionary, morphTargetInfluences, eyeBlink, setMeshRef, }) {
|
|
22
22
|
const { scene } = (0, drei_1.useGLTF)(url);
|
|
23
23
|
const { animations } = (0, drei_1.useGLTF)(ANIMATION_URLS[sex]);
|
|
24
24
|
const { nodes, materials } = (0, fiber_1.useGraph)(scene);
|
|
@@ -27,6 +27,8 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
27
27
|
const avatarMeshRef = (0, react_1.useRef)();
|
|
28
28
|
const currentActionRef = (0, react_1.useRef)(null);
|
|
29
29
|
const isTransitioningRef = (0, react_1.useRef)(false);
|
|
30
|
+
const lastActionTimeRef = (0, react_1.useRef)(0);
|
|
31
|
+
const [isTransitioningToIdle, setIsTransitioningToIdle] = (0, react_1.useState)(false);
|
|
30
32
|
(0, useEyeBlink_1.useAvatarBlink)({
|
|
31
33
|
enabled: eyeBlink || false,
|
|
32
34
|
setMorphTargetInfluences,
|
|
@@ -42,7 +44,9 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
42
44
|
isTransitioningRef.current = true;
|
|
43
45
|
const finishCurrentAnimation = () => {
|
|
44
46
|
if (currentActionRef.current && !currentActionRef.current.paused) {
|
|
45
|
-
const remainingTime = (currentActionRef.current.getClip().duration -
|
|
47
|
+
const remainingTime = (currentActionRef.current.getClip().duration -
|
|
48
|
+
currentActionRef.current.time) *
|
|
49
|
+
1000;
|
|
46
50
|
setTimeout(() => {
|
|
47
51
|
startIdleAnimation();
|
|
48
52
|
}, remainingTime);
|
|
@@ -55,18 +59,19 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
55
59
|
const idleAnimations = Object.keys(actions).filter(key => key.startsWith('Idle'));
|
|
56
60
|
const randomIdle = idleAnimations[Math.floor(Math.random() * idleAnimations.length)];
|
|
57
61
|
const idleAction = actions[randomIdle];
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
if (currentActionRef.current && idleAction) {
|
|
63
|
+
currentActionRef.current.crossFadeTo(idleAction, TRANSITION_DURATION, true);
|
|
64
|
+
}
|
|
65
|
+
if (idleAction) {
|
|
66
|
+
idleAction.reset().fadeIn(TRANSITION_DURATION).play();
|
|
67
|
+
currentActionRef.current = idleAction;
|
|
62
68
|
}
|
|
63
|
-
idleAction === null || idleAction === void 0 ? void 0 : idleAction.reset().fadeIn(fadeInDuration).play();
|
|
64
|
-
currentActionRef.current = idleAction;
|
|
65
69
|
setTimeout(() => {
|
|
66
70
|
isTransitioningRef.current = false;
|
|
67
|
-
},
|
|
71
|
+
}, TRANSITION_DURATION * 1000);
|
|
68
72
|
};
|
|
69
|
-
if (currentActionRef.current &&
|
|
73
|
+
if (currentActionRef.current &&
|
|
74
|
+
!currentActionRef.current.getClip().name.startsWith('Idle')) {
|
|
70
75
|
finishCurrentAnimation();
|
|
71
76
|
}
|
|
72
77
|
else {
|
|
@@ -74,7 +79,7 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
74
79
|
}
|
|
75
80
|
}, [actions]);
|
|
76
81
|
(0, react_1.useEffect)(() => {
|
|
77
|
-
if (!actions || !currentBaseAction.action
|
|
82
|
+
if (!actions || !currentBaseAction.action)
|
|
78
83
|
return;
|
|
79
84
|
const newAction = actions[currentBaseAction.action];
|
|
80
85
|
if (!newAction) {
|
|
@@ -83,18 +88,23 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
83
88
|
}
|
|
84
89
|
const fadeOutDuration = 0.8;
|
|
85
90
|
const fadeInDuration = 0.8;
|
|
86
|
-
if (!currentBaseAction.action.startsWith('Idle')) {
|
|
87
|
-
setTimeout(() => {
|
|
88
|
-
transitionToIdle();
|
|
89
|
-
}, ANIMATION_DURATION);
|
|
90
|
-
}
|
|
91
91
|
if (currentActionRef.current) {
|
|
92
92
|
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
93
93
|
}
|
|
94
|
-
newAction
|
|
94
|
+
console.log(newAction);
|
|
95
95
|
newAction.reset().fadeIn(fadeInDuration).play();
|
|
96
96
|
currentActionRef.current = newAction;
|
|
97
|
-
|
|
97
|
+
newAction.timeScale = timeScale;
|
|
98
|
+
if (currentBaseAction.action.startsWith('Gioia') ||
|
|
99
|
+
currentBaseAction.action.startsWith('Rabbia') ||
|
|
100
|
+
currentBaseAction.action.startsWith('Sorpresa') ||
|
|
101
|
+
currentBaseAction.action.startsWith('Timore') ||
|
|
102
|
+
currentBaseAction.action.startsWith('Tristezza')) {
|
|
103
|
+
newAction.setLoop(three_1.LoopOnce, 1);
|
|
104
|
+
newAction.clampWhenFinished = true;
|
|
105
|
+
setIsTransitioningToIdle(true);
|
|
106
|
+
}
|
|
107
|
+
}, [actions, currentBaseAction, timeScale]);
|
|
98
108
|
(0, react_1.useEffect)(() => {
|
|
99
109
|
(0, utils_1.correctMaterials)(materials);
|
|
100
110
|
scene.traverse((object) => {
|
|
@@ -111,9 +121,11 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
111
121
|
});
|
|
112
122
|
onLoaded === null || onLoaded === void 0 ? void 0 : onLoaded();
|
|
113
123
|
return () => {
|
|
114
|
-
Object.values(materials).forEach(
|
|
115
|
-
Object.values(nodes)
|
|
116
|
-
|
|
124
|
+
Object.values(materials).forEach(material => material.dispose());
|
|
125
|
+
Object.values(nodes)
|
|
126
|
+
.filter(utils_1.isSkinnedMesh)
|
|
127
|
+
.forEach(mesh => mesh.geometry.dispose());
|
|
128
|
+
mixer.stopAllAction();
|
|
117
129
|
};
|
|
118
130
|
}, [
|
|
119
131
|
materials,
|
|
@@ -123,13 +135,13 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
123
135
|
setMorphTargetDictionary,
|
|
124
136
|
setMorphTargetInfluences,
|
|
125
137
|
setMeshRef,
|
|
126
|
-
|
|
138
|
+
mixer,
|
|
127
139
|
]);
|
|
128
140
|
(0, fiber_1.useFrame)((_, delta) => {
|
|
129
141
|
if (avatarMeshRef.current && avatarMeshRef.current.morphTargetDictionary) {
|
|
130
142
|
updateMorphTargetInfluences();
|
|
131
143
|
}
|
|
132
|
-
mixer.update(delta
|
|
144
|
+
mixer.update(delta);
|
|
133
145
|
function updateMorphTargetInfluences() {
|
|
134
146
|
Object.entries(morphTargetInfluences).forEach(([key, value]) => {
|
|
135
147
|
const index = avatarMeshRef.current.morphTargetDictionary[key];
|
|
@@ -141,6 +153,19 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, timeScale, isZo
|
|
|
141
153
|
}
|
|
142
154
|
});
|
|
143
155
|
}
|
|
156
|
+
if (isTransitioningToIdle && currentActionRef.current) {
|
|
157
|
+
if (currentActionRef.current.time >=
|
|
158
|
+
currentActionRef.current.getClip().duration) {
|
|
159
|
+
const idleNumber = Math.floor(Math.random() * 5) + 1;
|
|
160
|
+
const idleAction = actions[`Idle${idleNumber == 3 ? 4 : idleNumber}`];
|
|
161
|
+
if (idleAction) {
|
|
162
|
+
currentActionRef.current.fadeOut(0.5);
|
|
163
|
+
idleAction.reset().fadeIn(0.5).play();
|
|
164
|
+
currentActionRef.current = idleAction;
|
|
165
|
+
setIsTransitioningToIdle(false);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
}
|
|
144
169
|
});
|
|
145
170
|
return ((0, jsx_runtime_1.jsx)("group", { position: isZoomed ? AVATAR_POSITION_ZOOMED : AVATAR_POSITION, rotation: AVATAR_ROTATION, children: (0, jsx_runtime_1.jsx)("primitive", { object: scene }) }));
|
|
146
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":";;;AAAA,iCAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,13 +9,14 @@ const fiber_1 = require("@react-three/fiber");
|
|
|
9
9
|
const utils_1 = require("../utils/utils");
|
|
10
10
|
const useEyeBlink_1 = tslib_1.__importDefault(require("../utils/useEyeBlink"));
|
|
11
11
|
const useMouthSpeaking_1 = tslib_1.__importDefault(require("../utils/useMouthSpeaking"));
|
|
12
|
+
const useHeadMovement_1 = tslib_1.__importDefault(require("../utils/useHeadMovement"));
|
|
12
13
|
const useSmile_1 = tslib_1.__importDefault(require("../utils/useSmile"));
|
|
13
14
|
const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
|
|
14
15
|
const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
|
|
15
|
-
const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.
|
|
16
|
+
const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.53, 0);
|
|
16
17
|
const ANIMATION_URLS = {
|
|
17
|
-
MALE: 'https://assets.memori.ai/api/v2/asset/
|
|
18
|
-
FEMALE: 'https://assets.memori.ai/api/v2/asset/
|
|
18
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/5de7456f-0cd8-4e29-95a7-0cd0045a5325.glb',
|
|
19
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/84487a2b-377c-4565-800a-51459d580ec8.glb',
|
|
19
20
|
};
|
|
20
21
|
function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, additiveActions, timeScale, isZoomed, }) {
|
|
21
22
|
const { scene } = (0, drei_1.useGLTF)(url);
|
|
@@ -47,9 +48,10 @@ function FullbodyAvatar({ url, sex, onLoaded, currentBaseAction, additiveActions
|
|
|
47
48
|
newAction.fadeOut(fadeOutDuration);
|
|
48
49
|
};
|
|
49
50
|
}, [currentBaseAction, timeScale]);
|
|
50
|
-
(0, useEyeBlink_1.default)(additiveActions.
|
|
51
|
-
(0, useMouthSpeaking_1.default)(additiveActions.
|
|
52
|
-
(0,
|
|
51
|
+
(0, useEyeBlink_1.default)(additiveActions.blink.weight > 0, nodes);
|
|
52
|
+
(0, useMouthSpeaking_1.default)(additiveActions.speak.weight > 0, nodes);
|
|
53
|
+
(0, useHeadMovement_1.default)(additiveActions.headMovement.weight > 0, nodes);
|
|
54
|
+
(0, useSmile_1.default)(additiveActions.smile.weight > 0, nodes);
|
|
53
55
|
(0, fiber_1.useFrame)((_, delta) => {
|
|
54
56
|
mixer.update(delta * 0.001);
|
|
55
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,iCAMe;AACf,4CAA2D;AAC3D,8CAAiE;AACjE,0CAAiE;AACjE,+EAA+C;AAC/C,yFAAyD;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ function useMouthSpeaking(speaking, nodes) {
|
|
|
19
19
|
(0, react_1.useEffect)(() => {
|
|
20
20
|
if (!speaking)
|
|
21
21
|
return;
|
|
22
|
-
const mouthMesh = (nodes.Wolf3D_Head || nodes.
|
|
22
|
+
const mouthMesh = (nodes.Wolf3D_Head || nodes.Wolf3D_Avatar || nodes.Wolf3D_Avatar001);
|
|
23
23
|
mouthStateRef.current.mesh = mouthMesh;
|
|
24
24
|
if ((mouthMesh === null || mouthMesh === void 0 ? void 0 : mouthMesh.morphTargetDictionary) && (mouthMesh === null || mouthMesh === void 0 ? void 0 : mouthMesh.morphTargetInfluences)) {
|
|
25
25
|
mouthStateRef.current.morphIndices = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMouthSpeaking.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/utils/useMouthSpeaking.ts"],"names":[],"mappings":";;AAEA,iCAAuD;AACvD,8CAA8C;AAa9C,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAEpC,SAAwB,gBAAgB,CAAC,QAA6B,EAAE,KAAY;IAClF,MAAM,aAAa,GAAG,IAAA,cAAM,EAAa;QACvC,QAAQ,EAAE,GAAG;QACb,IAAI,EAAE,IAAI;QACV,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE;KAC1D,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACxC,aAAa,CAAC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACnC,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,uBAAuB,GAAG,uBAAuB,CAAC,GAAG,uBAAuB,CAAC;QACpH,UAAU,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ;YAAE,OAAO;QAEtB,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"useMouthSpeaking.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/utils/useMouthSpeaking.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
legend.helper {
|
|
2
|
+
display: inline-block;
|
|
3
|
+
width: auto;
|
|
4
|
+
border: 0;
|
|
5
|
+
margin: 0;
|
|
6
|
+
margin-bottom: 1rem;
|
|
7
|
+
font-size: 0.9em;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
legend.helper p {
|
|
11
|
+
margin-bottom: 0;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
.memori--upload .ant-upload-list-picture-card-container,
|
|
15
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card {
|
|
16
|
+
width: auto;
|
|
17
|
+
min-width: 100px;
|
|
18
|
+
max-width: 200px;
|
|
19
|
+
height: auto;
|
|
20
|
+
min-height: 100px;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card {
|
|
24
|
+
flex-direction: column;
|
|
25
|
+
align-items: center;
|
|
26
|
+
justify-content: center;
|
|
27
|
+
padding: 2rem 1.5rem;
|
|
28
|
+
border: 2px var(--medium-gray) dashed;
|
|
29
|
+
border-radius: 7px;
|
|
30
|
+
background: none;
|
|
31
|
+
opacity: 0.7;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card .ant-upload {
|
|
35
|
+
transition: color 0.3s ease;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card:hover,
|
|
39
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card:focus {
|
|
40
|
+
border-color: var(--memori-primary);
|
|
41
|
+
opacity: 1;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card:hover .ant-upload,
|
|
45
|
+
.memori--upload .ant-upload.ant-upload-select-picture-card:focus .ant-upload {
|
|
46
|
+
color: var(--memori-primary);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
.memori--upload .ant-upload-list {
|
|
50
|
+
display: flex;
|
|
51
|
+
flex-wrap: wrap;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
.memori--upload .ant-upload-list-item {
|
|
55
|
+
overflow: hidden;
|
|
56
|
+
padding: 0;
|
|
57
|
+
border: 0;
|
|
58
|
+
border-radius: 5px;
|
|
59
|
+
box-shadow: 0 0 0.5rem 0 rgba(0, 0, 0, 0.1);
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
.memori--upload .ant-upload-list-picture-card-container {
|
|
63
|
+
margin-bottom: 1rem;
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
.memori--list-item-wrapper {
|
|
67
|
+
position: relative;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
.memori--list-item-wrapper .ant-spin-nested-loading,
|
|
71
|
+
.memori--list-item-wrapper .ant-spin-container {
|
|
72
|
+
height: 100%;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
.memori--list-item-wrapper figure {
|
|
76
|
+
margin-bottom: 0;
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
.memori--list-item-wrapper figure img {
|
|
80
|
+
max-height: 200px;
|
|
81
|
+
border-radius: 5px;
|
|
82
|
+
object-fit: contain;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
.memori--list-item-wrapper figure figcaption {
|
|
86
|
+
padding: 1rem;
|
|
87
|
+
font-size: 0.8rem;
|
|
88
|
+
text-align: center;
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
.memori--list-item-wrapper .ant-upload-list-item-error .ant-upload-list-item-name {
|
|
92
|
+
position: static;
|
|
93
|
+
margin: 0 0 1rem;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
.memori--list-item-wrapper .list-item-actions {
|
|
97
|
+
position: absolute;
|
|
98
|
+
top: 50%;
|
|
99
|
+
left: 50%;
|
|
100
|
+
display: flex;
|
|
101
|
+
overflow: hidden;
|
|
102
|
+
width: 0;
|
|
103
|
+
height: 0;
|
|
104
|
+
align-items: center;
|
|
105
|
+
justify-content: center;
|
|
106
|
+
border-radius: 5px;
|
|
107
|
+
background: rgba(0, 0, 0, 0.1);
|
|
108
|
+
opacity: 0;
|
|
109
|
+
transition: all 0.2s ease;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
.attachment-media-modal .memori-modal--panel {
|
|
113
|
+
min-width: 50%;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
.ant-upload-list-item-container {
|
|
117
|
+
width: 200px !important;
|
|
118
|
+
height: auto !important;
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
.ant-upload.ant-upload-select {
|
|
122
|
+
width: 200px !important;
|
|
123
|
+
height: 200px !important;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
.memori--list-item-wrapper .list-item-actions a.action-button,
|
|
127
|
+
.memori--list-item-wrapper .list-item-actions button.action-button {
|
|
128
|
+
color: #fff;
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
.memori--list-item-wrapper .list-item-actions a.action-button + .action-button,
|
|
132
|
+
.memori--list-item-wrapper .list-item-actions button.action-button + .action-button {
|
|
133
|
+
margin-left: 0.5rem;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
.memori--list-item-wrapper .list-item-actions a.action-button:hover,
|
|
137
|
+
.memori--list-item-wrapper .list-item-actions button.action-button:hover,
|
|
138
|
+
.memori--list-item-wrapper .list-item-actions a.action-button:focus,
|
|
139
|
+
.memori--list-item-wrapper .list-item-actions button.action-button:focus {
|
|
140
|
+
color: #fff;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
.memori--list-item-wrapper:hover .list-item-actions,
|
|
144
|
+
.memori--list-item-wrapper:focus .list-item-actions {
|
|
145
|
+
top: 0;
|
|
146
|
+
left: 0;
|
|
147
|
+
width: 100%;
|
|
148
|
+
height: 100%;
|
|
149
|
+
background: rgba(0, 0, 0, 0.4);
|
|
150
|
+
opacity: 1;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
.media-title-label {
|
|
154
|
+
display: block;
|
|
155
|
+
margin-bottom: 0.5rem;
|
|
156
|
+
font-size: 0.9rem;
|
|
157
|
+
font-weight: 600;
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
.media-title-input {
|
|
161
|
+
width: 100%;
|
|
162
|
+
padding: 0.5rem 0.75rem;
|
|
163
|
+
border: 1px solid #d9d9d9;
|
|
164
|
+
border-radius: 5px;
|
|
165
|
+
background: #fff;
|
|
166
|
+
font-size: 0.9rem;
|
|
167
|
+
font-weight: 400;
|
|
168
|
+
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { UploadFile } from 'antd/lib/upload/interface';
|
|
2
|
+
import { Asset } from '@memori.ai/memori-api-client/dist/types';
|
|
3
|
+
import React from 'react';
|
|
4
|
+
export interface Props {
|
|
5
|
+
uploadMultipleImages: boolean;
|
|
6
|
+
maxNumberOfVisualizedUploads?: number;
|
|
7
|
+
fileList?: any[];
|
|
8
|
+
uploadUrl: string;
|
|
9
|
+
apiUrl?: string;
|
|
10
|
+
tenantID: string;
|
|
11
|
+
maxFileSizeInMB?: number;
|
|
12
|
+
fileResolution?: number[];
|
|
13
|
+
useImageCrop?: boolean;
|
|
14
|
+
uploadMessage: string;
|
|
15
|
+
imageProportions?: number;
|
|
16
|
+
imageProportionsHelper?: string;
|
|
17
|
+
allowedMimeTypes?: string[];
|
|
18
|
+
onRemove?: (file: UploadFile<any>) => Promise<boolean>;
|
|
19
|
+
onUploadFinished?: (file: UploadFile) => void;
|
|
20
|
+
onFileChanged?: (assetID: string, asset: Partial<Asset>) => void;
|
|
21
|
+
onFileNotValid?: () => void;
|
|
22
|
+
disabled?: boolean;
|
|
23
|
+
showHelper?: boolean;
|
|
24
|
+
additionalHelper?: string;
|
|
25
|
+
resourceType?: 'avatar' | 'cover' | undefined;
|
|
26
|
+
}
|
|
27
|
+
declare const ImageUpload: React.FC<Props>;
|
|
28
|
+
export default ImageUpload;
|