@memori.ai/memori-react 7.11.4 → 7.12.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 +41 -0
- package/README.md +2 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +52 -75
- package/dist/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.js +2 -2
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.d.ts +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +8 -2
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/types.d.ts +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js +6 -3
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/PositionController.js +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/PositionController.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.d.ts +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.js +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/controls.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/constants.d.ts +74 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/constants.js +101 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/constants.js.map +1 -0
- package/dist/components/Chat/Chat.d.ts +10 -1
- package/dist/components/Chat/Chat.js +2 -10
- package/dist/components/Chat/Chat.js.map +1 -1
- package/dist/components/ChatBubble/ChatBubble.js +14 -4
- package/dist/components/ChatBubble/ChatBubble.js.map +1 -1
- package/dist/components/ChatInputs/ChatInputs.d.ts +11 -2
- package/dist/components/ChatInputs/ChatInputs.js +44 -6
- package/dist/components/ChatInputs/ChatInputs.js.map +1 -1
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.css +8 -0
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.js +75 -51
- package/dist/components/CompletionProviderStatus/CompletionProviderStatus.js.map +1 -1
- package/dist/components/ExpertsDrawer/ExpertsDrawer.js +1 -1
- package/dist/components/ExpertsDrawer/ExpertsDrawer.js.map +1 -1
- package/dist/components/FilePreview/FilePreview.css +155 -0
- package/dist/components/FilePreview/FilePreview.d.ts +12 -0
- package/dist/components/FilePreview/FilePreview.js +21 -0
- package/dist/components/FilePreview/FilePreview.js.map +1 -0
- package/dist/components/MemoriWidget/MemoriWidget.d.ts +3 -1
- package/dist/components/MemoriWidget/MemoriWidget.js +26 -11
- package/dist/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/dist/components/UploadButton/UploadButton.css +38 -0
- package/dist/components/UploadButton/UploadButton.d.ts +8 -0
- package/dist/components/UploadButton/UploadButton.js +79 -0
- package/dist/components/UploadButton/UploadButton.js.map +1 -0
- package/dist/components/icons/Preview.d.ts +5 -0
- package/dist/components/icons/Preview.js +6 -0
- package/dist/components/icons/Preview.js.map +1 -0
- package/dist/components/icons/Upload.d.ts +5 -0
- package/dist/components/icons/Upload.js +6 -0
- package/dist/components/icons/Upload.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/styles.css +2 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js +52 -75
- package/esm/components/Avatar/AvatarView/AvatarComponent/avatarComponent.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.js +2 -2
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.d.ts +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +8 -2
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/types.d.ts +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js +6 -3
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/PositionController.js +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/PositionController.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.d.ts +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.js +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/controls.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/constants.d.ts +74 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/constants.js +98 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/constants.js.map +1 -0
- package/esm/components/Chat/Chat.d.ts +10 -1
- package/esm/components/Chat/Chat.js +2 -10
- package/esm/components/Chat/Chat.js.map +1 -1
- package/esm/components/ChatBubble/ChatBubble.js +14 -4
- package/esm/components/ChatBubble/ChatBubble.js.map +1 -1
- package/esm/components/ChatInputs/ChatInputs.d.ts +11 -2
- package/esm/components/ChatInputs/ChatInputs.js +45 -7
- package/esm/components/ChatInputs/ChatInputs.js.map +1 -1
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.css +8 -0
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.js +76 -52
- package/esm/components/CompletionProviderStatus/CompletionProviderStatus.js.map +1 -1
- package/esm/components/ExpertsDrawer/ExpertsDrawer.js +1 -1
- package/esm/components/ExpertsDrawer/ExpertsDrawer.js.map +1 -1
- package/esm/components/FilePreview/FilePreview.css +155 -0
- package/esm/components/FilePreview/FilePreview.d.ts +12 -0
- package/esm/components/FilePreview/FilePreview.js +18 -0
- package/esm/components/FilePreview/FilePreview.js.map +1 -0
- package/esm/components/MemoriWidget/MemoriWidget.d.ts +3 -1
- package/esm/components/MemoriWidget/MemoriWidget.js +26 -11
- package/esm/components/MemoriWidget/MemoriWidget.js.map +1 -1
- package/esm/components/UploadButton/UploadButton.css +38 -0
- package/esm/components/UploadButton/UploadButton.d.ts +8 -0
- package/esm/components/UploadButton/UploadButton.js +76 -0
- package/esm/components/UploadButton/UploadButton.js.map +1 -0
- package/esm/components/icons/Preview.d.ts +5 -0
- package/esm/components/icons/Preview.js +4 -0
- package/esm/components/icons/Preview.js.map +1 -0
- package/esm/components/icons/Upload.d.ts +5 -0
- package/esm/components/icons/Upload.js +4 -0
- package/esm/components/icons/Upload.js.map +1 -0
- package/esm/index.d.ts +1 -0
- package/esm/index.js +3 -2
- package/esm/index.js.map +1 -1
- package/esm/styles.css +2 -0
- package/package.json +2 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx +120 -153
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.ts +3 -6
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx +11 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/types.ts +1 -0
- package/src/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.ts +33 -10
- package/src/components/Avatar/AvatarView/AvatarComponent/components/PositionController.ts +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/controls.tsx +2 -2
- package/src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/constants.ts +127 -0
- package/src/components/Chat/Chat.tsx +16 -10
- package/src/components/ChatBubble/ChatBubble.tsx +23 -2
- package/src/components/ChatInputs/ChatInputs.stories.tsx +5 -0
- package/src/components/ChatInputs/ChatInputs.test.tsx +6 -6
- package/src/components/ChatInputs/ChatInputs.tsx +91 -23
- package/src/components/CompletionProviderStatus/CompletionProviderStatus.css +8 -0
- package/src/components/CompletionProviderStatus/CompletionProviderStatus.stories.tsx +1 -1
- package/src/components/CompletionProviderStatus/CompletionProviderStatus.tsx +95 -66
- package/src/components/ExpertsDrawer/ExpertsDrawer.tsx +3 -1
- package/src/components/FilePreview/FilePreview.css +155 -0
- package/src/components/FilePreview/FilePreview.stories.tsx +66 -0
- package/src/components/FilePreview/FilePreview.test.tsx +26 -0
- package/src/components/FilePreview/FilePreview.tsx +85 -0
- package/src/components/FilePreview/__snapshots__/FilePreview.test.tsx.snap +149 -0
- package/src/components/MemoriWidget/MemoriWidget.tsx +68 -3
- package/src/components/StartPanel/__snapshots__/StartPanel.test.tsx.snap +240 -0
- package/src/components/UploadButton/UploadButton.css +38 -0
- package/src/components/UploadButton/UploadButton.stories.tsx +62 -0
- package/src/components/UploadButton/UploadButton.test.tsx +11 -0
- package/src/components/UploadButton/UploadButton.tsx +126 -0
- package/src/components/UploadButton/__snapshots__/UploadButton.test.tsx.snap +31 -0
- package/src/components/icons/Preview.tsx +23 -0
- package/src/components/icons/Upload.tsx +23 -0
- package/src/components/layouts/__snapshots__/Chat.test.tsx.snap +24 -0
- package/src/components/layouts/__snapshots__/FullPage.test.tsx.snap +24 -0
- package/src/components/layouts/__snapshots__/Totem.test.tsx.snap +24 -0
- package/src/components/layouts/__snapshots__/ZoomedFullBody.test.tsx.snap +24 -0
- package/src/components/layouts/layouts.stories.tsx +30 -46
- package/src/index.stories.tsx +68 -2
- package/src/index.tsx +4 -0
- package/src/styles.css +2 -0
- package/src/components/Avatar/AvatarView/AvatarComponent/components/constants.ts +0 -29
package/dist/index.js
CHANGED
|
@@ -28,7 +28,7 @@ const getPreferredLanguages = () => {
|
|
|
28
28
|
fallbackLng: 'it',
|
|
29
29
|
};
|
|
30
30
|
};
|
|
31
|
-
const Memori = ({ ownerUserName, ownerUserID, memoriName, memoriID, integrationID, tenantID, secretToken, sessionID, layout = 'DEFAULT', customLayout, showShare = true, showCopyButton = true, showTranslationOriginal = false, showSettings = true, showInstruct = false, showTypingText = false, showClear = false, showOnlyLastMessages = false, showInputs = true, showDates = false, showContextPerLine = false, showLogin, height = '100%', baseURL, apiURL = 'https://backend.memori.ai', engineURL = 'https://engine.memori.ai', tag, pin, context, initialQuestion, uiLang, spokenLang, multilingual, authToken, AZURE_COGNITIVE_SERVICES_TTS_KEY, enableAudio, defaultSpeakerActive = true, disableTextEnteredEvents = false, onStateChange, additionalInfo, customMediaRenderer, additionalSettings, userAvatar, useMathFormatting = false, }) => {
|
|
31
|
+
const Memori = ({ ownerUserName, ownerUserID, memoriName, memoriID, integrationID, tenantID, secretToken, sessionID, layout = 'DEFAULT', customLayout, showShare = true, showCopyButton = true, showTranslationOriginal = false, showSettings = true, showInstruct = false, showTypingText = false, showClear = false, showOnlyLastMessages = false, showInputs = true, showDates = false, showContextPerLine = false, showUpload = false, showLogin, height = '100%', baseURL, apiURL = 'https://backend.memori.ai', engineURL = 'https://engine.memori.ai', tag, pin, context, initialQuestion, uiLang, spokenLang, multilingual, authToken, AZURE_COGNITIVE_SERVICES_TTS_KEY, enableAudio, defaultSpeakerActive = true, disableTextEnteredEvents = false, onStateChange, additionalInfo, customMediaRenderer, additionalSettings, userAvatar, useMathFormatting = false, }) => {
|
|
32
32
|
var _a, _b, _c;
|
|
33
33
|
const [memori, setMemori] = (0, react_1.useState)();
|
|
34
34
|
const [tenant, setTenant] = (0, react_1.useState)();
|
|
@@ -100,7 +100,7 @@ const Memori = ({ ownerUserName, ownerUserID, memoriName, memoriID, integrationI
|
|
|
100
100
|
: `https://${tenantID}`), apiURL: apiURL, engineURL: engineURL, memori: {
|
|
101
101
|
...memori,
|
|
102
102
|
secretToken,
|
|
103
|
-
}, ownerUserName: ownerUserName !== null && ownerUserName !== void 0 ? ownerUserName : memori.ownerUserName, ownerUserID: ownerUserID !== null && ownerUserID !== void 0 ? ownerUserID : memori.ownerUserID, tenantID: tenantID, memoriLang: spokenLang !== null && spokenLang !== void 0 ? spokenLang : (_b = (_a = memori.culture) === null || _a === void 0 ? void 0 : _a.split('-')) === null || _b === void 0 ? void 0 : _b[0], multilingual: multilingual, tenant: tenant, secret: secretToken, sessionID: sessionID, showShare: showShare, showCopyButton: showCopyButton, showTranslationOriginal: showTranslationOriginal, showSettings: showSettings, showInstruct: showInstruct, showTypingText: showTypingText, showClear: showClear, showOnlyLastMessages: showOnlyLastMessages, showInputs: showInputs, showDates: showDates, showContextPerLine: showContextPerLine, showLogin: showLogin !== null && showLogin !== void 0 ? showLogin : memori === null || memori === void 0 ? void 0 : memori.enableDeepThought, integration: (_c = memori === null || memori === void 0 ? void 0 : memori.integrations) === null || _c === void 0 ? void 0 : _c.find(i => integrationID
|
|
103
|
+
}, ownerUserName: ownerUserName !== null && ownerUserName !== void 0 ? ownerUserName : memori.ownerUserName, ownerUserID: ownerUserID !== null && ownerUserID !== void 0 ? ownerUserID : memori.ownerUserID, tenantID: tenantID, memoriLang: spokenLang !== null && spokenLang !== void 0 ? spokenLang : (_b = (_a = memori.culture) === null || _a === void 0 ? void 0 : _a.split('-')) === null || _b === void 0 ? void 0 : _b[0], multilingual: multilingual, tenant: tenant, secret: secretToken, sessionID: sessionID, showShare: showShare, showCopyButton: showCopyButton, showTranslationOriginal: showTranslationOriginal, showSettings: showSettings, showInstruct: showInstruct, showTypingText: showTypingText, showClear: showClear, showOnlyLastMessages: showOnlyLastMessages, showInputs: showInputs, showDates: showDates, showContextPerLine: showContextPerLine, showLogin: showLogin !== null && showLogin !== void 0 ? showLogin : memori === null || memori === void 0 ? void 0 : memori.enableDeepThought, showUpload: showUpload, integration: (_c = memori === null || memori === void 0 ? void 0 : memori.integrations) === null || _c === void 0 ? void 0 : _c.find(i => integrationID
|
|
104
104
|
? i.integrationID === integrationID
|
|
105
105
|
: !!i.publish && i.type === 'LANDING_EXPERIENCE'), initialContextVars: context, initialQuestion: initialQuestion, authToken: authToken, AZURE_COGNITIVE_SERVICES_TTS_KEY: speechKey || AZURE_COGNITIVE_SERVICES_TTS_KEY, enableAudio: enableAudio, defaultSpeakerActive: defaultSpeakerActive, disableTextEnteredEvents: disableTextEnteredEvents, onStateChange: onStateChange, additionalInfo: additionalInfo, customMediaRenderer: customMediaRenderer, additionalSettings: additionalSettings, userAvatar: userAvatar, useMathFormatting: useMathFormatting, ...(tag && pin ? { personification: { tag, pin } } : {}) })) : ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
106
106
|
display: 'flex',
|
|
@@ -143,6 +143,7 @@ Memori.propTypes = {
|
|
|
143
143
|
showOnlyLastMessages: prop_types_1.default.bool,
|
|
144
144
|
showTypingText: prop_types_1.default.bool,
|
|
145
145
|
showLogin: prop_types_1.default.bool,
|
|
146
|
+
showUpload: prop_types_1.default.bool,
|
|
146
147
|
height: prop_types_1.default.oneOfType([prop_types_1.default.string, prop_types_1.default.number]),
|
|
147
148
|
baseURL: prop_types_1.default.string,
|
|
148
149
|
apiURL: prop_types_1.default.string,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":";;;;AAAA,iCAAgE;AAChE,oEAAmC;AAOnC,6FAA2D;AAE3D,kGAEgD;AAChD,2DAAyD;AAEzD,qDAA0C;AAC1C,6CAA6C;AAG7C,0DAA0B;AAC1B,iDAA+C;AAC/C,wEAAwC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
|
package/dist/styles.css
CHANGED
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
@import url('./components/ui/Details.css');
|
|
11
11
|
@import url('./components/ui/Expandable.css');
|
|
12
12
|
@import url('./components/ui/Slider.css');
|
|
13
|
+
@import url('./components/UploadButton/UploadButton.css');
|
|
14
|
+
@import url('./components/FilePreview/FilePreview.css');
|
|
13
15
|
|
|
14
16
|
@import url('./components/CompletionProviderStatus/CompletionProviderStatus.css');
|
|
15
17
|
@import url('./components/PoweredBy/PoweredBy.css');
|
|
@@ -3,32 +3,8 @@ import { useState, useEffect, useCallback } from 'react';
|
|
|
3
3
|
import AnimationControlPanel from './components/controls';
|
|
4
4
|
import { FullbodyAvatar } from './components/FullbodyAvatar/fullbodyAvatar';
|
|
5
5
|
import HalfBodyAvatar from './components/halfbodyAvatar';
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
Gioia2: { weight: 0 },
|
|
9
|
-
Gioia3: { weight: 0 },
|
|
10
|
-
Idle1: { weight: 1 },
|
|
11
|
-
Idle2: { weight: 0 },
|
|
12
|
-
Idle3: { weight: 0 },
|
|
13
|
-
Idle4: { weight: 0 },
|
|
14
|
-
Idle5: { weight: 0 },
|
|
15
|
-
Rabbia1: { weight: 0 },
|
|
16
|
-
Rabbia2: { weight: 0 },
|
|
17
|
-
Rabbia3: { weight: 0 },
|
|
18
|
-
Sorpresa1: { weight: 0 },
|
|
19
|
-
Sorpresa2: { weight: 0 },
|
|
20
|
-
Sorpresa3: { weight: 0 },
|
|
21
|
-
Timore1: { weight: 0 },
|
|
22
|
-
Timore2: { weight: 0 },
|
|
23
|
-
Timore3: { weight: 0 },
|
|
24
|
-
Tristezza1: { weight: 0 },
|
|
25
|
-
Tristezza2: { weight: 0 },
|
|
26
|
-
Tristezza3: { weight: 0 },
|
|
27
|
-
Loading1: { weight: 0 },
|
|
28
|
-
Loading2: { weight: 0 },
|
|
29
|
-
Loading3: { weight: 0 },
|
|
30
|
-
};
|
|
31
|
-
export const AvatarView = ({ stopProcessing, chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, halfBody, loading, avatarHeight, avatarDepth, updateCurrentViseme, resetVisemeQueue, setCameraZ, }) => {
|
|
6
|
+
import { BASE_ACTIONS, MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB, MAPPING_BLEND_SHAPE_TO_EMOTION_RPM, } from './constants';
|
|
7
|
+
export const AvatarView = ({ stopProcessing, chatEmission, showControls, animation, url, sex, eyeBlink, headMovement, halfBody, loading, avatarHeight = 50, avatarDepth = -50, updateCurrentViseme, resetVisemeQueue, setCameraZ, }) => {
|
|
32
8
|
const [currentBaseAction, setCurrentBaseAction] = useState({
|
|
33
9
|
action: animation || 'Idle1',
|
|
34
10
|
weight: 1,
|
|
@@ -36,74 +12,75 @@ export const AvatarView = ({ stopProcessing, chatEmission, showControls, animati
|
|
|
36
12
|
const [morphTargetInfluences, setMorphTargetInfluences] = useState({});
|
|
37
13
|
const [morphTargetDictionary, setMorphTargetDictionary] = useState({});
|
|
38
14
|
const [emotionMorphTargets, setEmotionMorphTargets] = useState({});
|
|
15
|
+
const [isRPM, setIsRPM] = useState(false);
|
|
39
16
|
const [timeScale, setTimeScale] = useState(0.8);
|
|
40
|
-
const
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
17
|
+
const emotionMap = {
|
|
18
|
+
Joy: { Joy: 1 },
|
|
19
|
+
Anger: { Anger: 1 },
|
|
20
|
+
Surprise: { Surprise: 1 },
|
|
21
|
+
Sadness: { Sadness: 1 },
|
|
22
|
+
Fear: { Fear: 1 },
|
|
23
|
+
};
|
|
24
|
+
const getDefaultEmotions = () => Object.keys(emotionMap).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
|
|
25
|
+
const handleRPMBlendShape = useCallback((outputContent) => MAPPING_BLEND_SHAPE_TO_EMOTION_RPM[outputContent], []);
|
|
26
|
+
const handleCustomGLBBlendShape = useCallback((outputContent) => MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB[outputContent], []);
|
|
27
|
+
const setEmotionMorphTargetInfluences = useCallback((action, outputContent) => {
|
|
28
|
+
if (action.startsWith('Loading'))
|
|
29
|
+
return;
|
|
30
|
+
const defaultEmotions = getDefaultEmotions();
|
|
31
|
+
if (outputContent === 'default') {
|
|
32
|
+
setEmotionMorphTargets(defaultEmotions);
|
|
44
33
|
return;
|
|
45
34
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
...defaultEmotions,
|
|
61
|
-
...emotionValues,
|
|
62
|
-
}));
|
|
63
|
-
}, []);
|
|
64
|
-
const onBaseActionChange = useCallback((action) => {
|
|
65
|
-
setEmotionMorphTargetInfluences(action);
|
|
66
|
-
setCurrentBaseAction({
|
|
67
|
-
action,
|
|
68
|
-
weight: 1,
|
|
69
|
-
});
|
|
70
|
-
}, []);
|
|
35
|
+
if (isRPM) {
|
|
36
|
+
const emotion = handleRPMBlendShape(outputContent);
|
|
37
|
+
setEmotionMorphTargets((_) => ({ ...defaultEmotions, ...emotion }));
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
const emotion = handleCustomGLBBlendShape(outputContent);
|
|
41
|
+
const emotionValues = emotion === 'default' ? defaultEmotions : emotionMap[emotion];
|
|
42
|
+
setEmotionMorphTargets((_) => ({ ...defaultEmotions, ...emotionValues }));
|
|
43
|
+
}
|
|
44
|
+
}, [isRPM, handleRPMBlendShape, handleCustomGLBBlendShape]);
|
|
45
|
+
const onBaseActionChange = useCallback((action, outputContent) => {
|
|
46
|
+
setEmotionMorphTargetInfluences(action, outputContent);
|
|
47
|
+
setCurrentBaseAction({ action, weight: 1 });
|
|
48
|
+
}, [setEmotionMorphTargetInfluences]);
|
|
71
49
|
const onMorphTargetInfluencesChange = useCallback((influences) => {
|
|
72
|
-
setMorphTargetInfluences(
|
|
73
|
-
...prevInfluences,
|
|
74
|
-
...influences,
|
|
75
|
-
}));
|
|
50
|
+
setMorphTargetInfluences(prev => ({ ...prev, ...influences }));
|
|
76
51
|
}, []);
|
|
77
52
|
const onMorphTargetDictionaryChange = useCallback((dictionary) => {
|
|
78
53
|
setMorphTargetDictionary(dictionary);
|
|
79
54
|
}, []);
|
|
80
|
-
const modifyTimeScale = useCallback((value) => {
|
|
81
|
-
setTimeScale(value);
|
|
82
|
-
}, []);
|
|
83
55
|
useEffect(() => {
|
|
84
56
|
var _a, _b;
|
|
57
|
+
if (loading) {
|
|
58
|
+
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
59
|
+
onBaseActionChange(`Loading${randomNumber}`, '');
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
85
62
|
const hasOutputTag = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.includes('<output class="memori-emotion">');
|
|
86
63
|
const outputContent = hasOutputTag
|
|
87
64
|
? (_b = (_a = chatEmission === null || chatEmission === void 0 ? void 0 : chatEmission.split('<output class="memori-emotion">')[1]) === null || _a === void 0 ? void 0 : _a.split('</output>')[0]) === null || _b === void 0 ? void 0 : _b.trim()
|
|
88
65
|
: null;
|
|
89
66
|
if (outputContent) {
|
|
90
67
|
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
91
|
-
|
|
92
|
-
onBaseActionChange(emotion);
|
|
68
|
+
onBaseActionChange(`${outputContent}${randomNumber}`, outputContent);
|
|
93
69
|
}
|
|
94
70
|
else {
|
|
95
71
|
const randomNumber = Math.floor(Math.random() * 5) + 1;
|
|
96
|
-
|
|
97
|
-
onBaseActionChange(animation);
|
|
98
|
-
}
|
|
99
|
-
}, [chatEmission]);
|
|
100
|
-
useEffect(() => {
|
|
101
|
-
if (loading) {
|
|
102
|
-
const randomNumber = Math.floor(Math.random() * 3) + 1;
|
|
103
|
-
const animation = `Loading${randomNumber}`;
|
|
104
|
-
onBaseActionChange(animation);
|
|
72
|
+
onBaseActionChange(`Idle${randomNumber === 3 ? 4 : randomNumber}`, '');
|
|
105
73
|
}
|
|
106
|
-
}, [loading]);
|
|
107
|
-
|
|
74
|
+
}, [chatEmission, loading, onBaseActionChange]);
|
|
75
|
+
const commonAvatarProps = {
|
|
76
|
+
url,
|
|
77
|
+
onCameraZChange: setCameraZ,
|
|
78
|
+
setMorphTargetInfluences,
|
|
79
|
+
setMorphTargetDictionary,
|
|
80
|
+
updateCurrentViseme,
|
|
81
|
+
avatarHeight,
|
|
82
|
+
avatarDepth,
|
|
83
|
+
};
|
|
84
|
+
return (_jsxs(_Fragment, { children: [showControls && (_jsx(AnimationControlPanel, { timeScale: timeScale, morphTargetDictionary: morphTargetDictionary, onBaseActionChange: onBaseActionChange, onMorphTargetInfluencesChange: onMorphTargetInfluencesChange, onMorphTargetDictionaryChange: onMorphTargetDictionaryChange, baseActions: BASE_ACTIONS, currentBaseAction: currentBaseAction, modifyTimeScale: setTimeScale })), halfBody ? (_jsx(HalfBodyAvatar, { ...commonAvatarProps, headMovement: headMovement })) : (_jsx(FullbodyAvatar, { ...commonAvatarProps, sex: sex, setIsRpm: setIsRPM, resetVisemeQueue: resetVisemeQueue, eyeBlink: eyeBlink, currentBaseAction: currentBaseAction, timeScale: timeScale, morphTargetInfluences: morphTargetInfluences, stopProcessing: stopProcessing, emotionMorphTargets: emotionMorphTargets, halfBody: halfBody }))] }));
|
|
108
85
|
};
|
|
109
86
|
//# sourceMappingURL=avatarComponent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"avatarComponent.js","sourceRoot":"","sources":["../../../../../src/components/Avatar/AvatarView/AvatarComponent/avatarComponent.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AnimationState } from './types';
|
|
2
2
|
import { LoopOnce } from 'three';
|
|
3
|
-
import { DEFAULT_CONFIG } from '
|
|
3
|
+
import { DEFAULT_CONFIG, MAX_IDLE_LOOPS_DEFAULT } from '../../constants';
|
|
4
4
|
export class AnimationController {
|
|
5
5
|
constructor(mixer, actions, config = DEFAULT_CONFIG) {
|
|
6
6
|
this.currentState = AnimationState.LOADING;
|
|
@@ -8,7 +8,7 @@ export class AnimationController {
|
|
|
8
8
|
this.lastIdleIndex = -1;
|
|
9
9
|
this.isTransitioning = false;
|
|
10
10
|
this.currentIdleLoopCount = 0;
|
|
11
|
-
this.MAX_IDLE_LOOPS =
|
|
11
|
+
this.MAX_IDLE_LOOPS = MAX_IDLE_LOOPS_DEFAULT;
|
|
12
12
|
this.lastAnimationTime = 0;
|
|
13
13
|
this.isChatAlreadyStarted = false;
|
|
14
14
|
this.mixer = mixer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnimationController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAmB,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAmC,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"AnimationController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/AnimationController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { FullbodyAvatarProps } from './types';
|
|
2
|
-
export declare function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight, avatarDepth, onCameraZChange, }: FullbodyAvatarProps): JSX.Element;
|
|
2
|
+
export declare function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight, avatarDepth, onCameraZChange, }: FullbodyAvatarProps): JSX.Element;
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js
CHANGED
|
@@ -7,8 +7,8 @@ import { AnimationState } from './types';
|
|
|
7
7
|
import { AnimationController } from './AnimationController';
|
|
8
8
|
import { MorphTargetController } from '../MorphTargetController';
|
|
9
9
|
import { AvatarPositionController } from '../PositionController';
|
|
10
|
-
import { AVATAR_POSITION, AVATAR_ROTATION, ANIMATION_URLS, DEFAULT_CONFIG, SCALE_LERP_FACTOR, } from '
|
|
11
|
-
export function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight = 50, avatarDepth = 0, onCameraZChange, }) {
|
|
10
|
+
import { AVATAR_POSITION, AVATAR_ROTATION, ANIMATION_URLS, DEFAULT_CONFIG, SCALE_LERP_FACTOR, } from '../../constants';
|
|
11
|
+
export function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight = 50, avatarDepth = 0, onCameraZChange, }) {
|
|
12
12
|
var _a;
|
|
13
13
|
const { scene } = useGLTF(url);
|
|
14
14
|
const { animations } = useGLTF(ANIMATION_URLS[sex]);
|
|
@@ -56,6 +56,12 @@ export function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, eyeBlin
|
|
|
56
56
|
scene === null || scene === void 0 ? void 0 : scene.traverse((object) => {
|
|
57
57
|
if (object instanceof SkinnedMesh &&
|
|
58
58
|
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
59
|
+
if (object.name === 'GBNL__Head') {
|
|
60
|
+
setIsRpm(false);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
setIsRpm(true);
|
|
64
|
+
}
|
|
59
65
|
foundMesh = object;
|
|
60
66
|
}
|
|
61
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EACL,cAAc,EACd,WAAW,GAGZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAuB,MAAM,SAAS,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EACL,eAAe,EACf,eAAe,EAEf,cAAc,EACd,cAAc,EACd,iBAAiB,GAClB,MAAM,
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MathUtils } from 'three';
|
|
2
|
-
import { EMOTION_SMOOTHING, VISEME_SMOOTHING, BLINK_CONFIG } from '
|
|
2
|
+
import { EMOTION_SMOOTHING, VISEME_SMOOTHING, BLINK_CONFIG } from '../constants';
|
|
3
3
|
export class MorphTargetController {
|
|
4
4
|
constructor(headMesh) {
|
|
5
5
|
this.currentEmotionValues = {};
|
|
@@ -9,6 +9,7 @@ export class MorphTargetController {
|
|
|
9
9
|
updateMorphTargets(currentTime, emotionMorphTargets, currentViseme, eyeBlink, blinkState) {
|
|
10
10
|
if (!this.headMesh.morphTargetDictionary ||
|
|
11
11
|
!this.headMesh.morphTargetInfluences) {
|
|
12
|
+
console.error('[MorphTargetController] Missing morphTargetDictionary or morphTargetInfluences');
|
|
12
13
|
return;
|
|
13
14
|
}
|
|
14
15
|
const blinkValue = this.calculateBlinkValue(currentTime, blinkState, eyeBlink);
|
|
@@ -20,7 +21,8 @@ export class MorphTargetController {
|
|
|
20
21
|
if (currentEmotionKeys.has(key)) {
|
|
21
22
|
const targetEmotionValue = emotionMorphTargets[key];
|
|
22
23
|
const currentEmotionValue = this.currentEmotionValues[key] || 0;
|
|
23
|
-
const newEmotionValue = MathUtils.lerp(currentEmotionValue, targetEmotionValue *
|
|
24
|
+
const newEmotionValue = MathUtils.lerp(currentEmotionValue, targetEmotionValue * 3, EMOTION_SMOOTHING);
|
|
25
|
+
console.log(`[MorphTargetController] Emotion ${key}: current=${currentEmotionValue}, target=${targetEmotionValue}, new=${newEmotionValue}`);
|
|
24
26
|
this.currentEmotionValues[key] = newEmotionValue;
|
|
25
27
|
targetValue += newEmotionValue;
|
|
26
28
|
}
|
|
@@ -32,7 +34,8 @@ export class MorphTargetController {
|
|
|
32
34
|
}
|
|
33
35
|
targetValue = MathUtils.clamp(targetValue, 0, 1);
|
|
34
36
|
if (this.headMesh.morphTargetInfluences) {
|
|
35
|
-
|
|
37
|
+
const finalValue = MathUtils.lerp(this.headMesh.morphTargetInfluences[index] || 0, targetValue, VISEME_SMOOTHING);
|
|
38
|
+
this.headMesh.morphTargetInfluences[index] = finalValue;
|
|
36
39
|
}
|
|
37
40
|
});
|
|
38
41
|
this.previousEmotionKeys = currentEmotionKeys;
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MorphTargetController.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"MorphTargetController.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/MorphTargetController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Vector3, MathUtils } from 'three';
|
|
2
|
-
import { AVATAR_POSITION, AVATAR_POSITION_ZOOMED } from '
|
|
2
|
+
import { AVATAR_POSITION, AVATAR_POSITION_ZOOMED } from '../constants';
|
|
3
3
|
export class AvatarPositionController {
|
|
4
4
|
constructor(defaultPosition = AVATAR_POSITION.clone(), zoomedPosition = AVATAR_POSITION_ZOOMED.clone(), initialCameraZ = 0.6) {
|
|
5
5
|
this.defaultPosition = defaultPosition;
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/PositionController.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionController.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/PositionController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"PositionController.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/PositionController.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ interface BaseAction {
|
|
|
5
5
|
}
|
|
6
6
|
export interface AnimationControlPanelProps {
|
|
7
7
|
baseActions: Record<string, BaseAction>;
|
|
8
|
-
onBaseActionChange: (action: string) => void;
|
|
8
|
+
onBaseActionChange: (action: string, outputContent: string) => void;
|
|
9
9
|
currentBaseAction: {
|
|
10
10
|
action: string;
|
|
11
11
|
weight: number;
|
|
@@ -16,7 +16,7 @@ const AnimationControlPanel = ({ onBaseActionChange, baseActions, modifyTimeScal
|
|
|
16
16
|
baseNames.forEach(name => {
|
|
17
17
|
const settings = baseActions[name];
|
|
18
18
|
panelSettingsRef.current[name] = () => {
|
|
19
|
-
onBaseActionChange(name);
|
|
19
|
+
onBaseActionChange(name, '');
|
|
20
20
|
};
|
|
21
21
|
const control = folder1.add(panelSettingsRef.current, name);
|
|
22
22
|
crossFadeControlsRef.current.push(control);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controls.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,EAAY,MAAM,OAAO,CAAC;AAC3D,OAAO,GAAG,MAAM,SAAS,CAAC;AA0B1B,MAAM,qBAAqB,GAAyC,CAAC,EACnE,kBAAkB,EAClB,WAAW,EACX,eAAe,EACf,6BAA6B,EAC7B,6BAA6B,EAC7B,qBAAqB,EACrB,SAAS,GACV,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,MAAM,CAAa,IAAI,CAAC,CAAC;IACxC,MAAM,gBAAgB,GAAG,MAAM,CAAsB;QACnD,mBAAmB,EAAE,SAAS;KAC/B,CAAC,CAAC;IACH,MAAM,oBAAoB,GAAG,MAAM,CAAQ,EAAE,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;QAEb,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;QACpC,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC;QAErB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAC9C,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAE/C,MAAM,SAAS,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAExD,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACnC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,GAAG,EAAE;gBACpC,kBAAkB,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"controls.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/controls.tsx"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import { useGraph, useFrame, useThree } from '@react-three/fiber';
|
|
|
6
6
|
import { correctMaterials, isSkinnedMesh } from '../../../../../helpers/utils';
|
|
7
7
|
import { MorphTargetController } from './MorphTargetController';
|
|
8
8
|
import { AvatarPositionController } from './PositionController';
|
|
9
|
-
import { AVATAR_POSITION, SCALE_LERP_FACTOR, AVATAR_POSITION_ZOOMED, } from '
|
|
9
|
+
import { AVATAR_POSITION, SCALE_LERP_FACTOR, AVATAR_POSITION_ZOOMED, } from '../constants';
|
|
10
10
|
import { hideHands } from '../../utils/utils';
|
|
11
11
|
import useHeadMovement from '../../utils/useHeadMovement';
|
|
12
12
|
export default function HalfBodyAvatar({ url, setMorphTargetInfluences, setMorphTargetDictionary, updateCurrentViseme, eyeBlink = false, avatarHeight = 50, avatarDepth = 0, headMovement = false, onLoaded, onCameraZChange, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAY,WAAW,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC/E,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,
|
|
1
|
+
{"version":3,"file":"halfbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/halfbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { Vector3, Euler } from 'three';
|
|
2
|
+
import { AnimationConfig } from './components/FullbodyAvatar/types';
|
|
3
|
+
export declare const AVATAR_POSITION: Vector3;
|
|
4
|
+
export declare const AVATAR_ROTATION: Euler;
|
|
5
|
+
export declare const AVATAR_POSITION_ZOOMED: Vector3;
|
|
6
|
+
export declare const SCALE_LERP_FACTOR = 0.1;
|
|
7
|
+
export declare const MAX_IDLE_LOOPS_DEFAULT = 5;
|
|
8
|
+
interface BaseAction {
|
|
9
|
+
weight: number;
|
|
10
|
+
action?: string;
|
|
11
|
+
}
|
|
12
|
+
export declare const BASE_ACTIONS: Record<string, BaseAction>;
|
|
13
|
+
export declare const MAPPING_EMOTIONS_ITALIAN_TO_ENGLISH: {
|
|
14
|
+
Gioia: string;
|
|
15
|
+
Rabbia: string;
|
|
16
|
+
Sorpresa: string;
|
|
17
|
+
Tristezza: string;
|
|
18
|
+
Timore: string;
|
|
19
|
+
};
|
|
20
|
+
export declare const MAPPING_BLEND_SHAPE_TO_EMOTION_RPM: {
|
|
21
|
+
Rabbia: {
|
|
22
|
+
browDownLeft: number;
|
|
23
|
+
browDownRight: number;
|
|
24
|
+
browOuterUpLeft: number;
|
|
25
|
+
browOuterUpRight: number;
|
|
26
|
+
mouthSmile: number;
|
|
27
|
+
};
|
|
28
|
+
Timore: {
|
|
29
|
+
browOuterUpLeft: number;
|
|
30
|
+
browOuterUpRight: number;
|
|
31
|
+
eyeWideLeft: number;
|
|
32
|
+
eyeWideRight: number;
|
|
33
|
+
};
|
|
34
|
+
Tristezza: {
|
|
35
|
+
browDownLeft: number;
|
|
36
|
+
browDownRight: number;
|
|
37
|
+
eyeSquintLeft: number;
|
|
38
|
+
eyeSquintRight: number;
|
|
39
|
+
mouthSmile: number;
|
|
40
|
+
};
|
|
41
|
+
Sorpresa: {
|
|
42
|
+
browInnerUp: number;
|
|
43
|
+
browOuterUpLeft: number;
|
|
44
|
+
browOuterUpRight: number;
|
|
45
|
+
eyeWideLeft: number;
|
|
46
|
+
eyeWideRight: number;
|
|
47
|
+
};
|
|
48
|
+
Gioia: {
|
|
49
|
+
browDownLeft: number;
|
|
50
|
+
browDownRight: number;
|
|
51
|
+
browInnerUp: number;
|
|
52
|
+
mouthSmile: number;
|
|
53
|
+
};
|
|
54
|
+
};
|
|
55
|
+
export declare const MAPPING_BLEND_SHAPE_TO_EMOTION_CUSTOM_GLB: {
|
|
56
|
+
Gioia: string;
|
|
57
|
+
Rabbia: string;
|
|
58
|
+
Sorpresa: string;
|
|
59
|
+
Tristezza: string;
|
|
60
|
+
Timore: string;
|
|
61
|
+
};
|
|
62
|
+
export declare const ANIMATION_URLS: {
|
|
63
|
+
MALE: string;
|
|
64
|
+
FEMALE: string;
|
|
65
|
+
};
|
|
66
|
+
export declare const BLINK_CONFIG: {
|
|
67
|
+
minInterval: number;
|
|
68
|
+
maxInterval: number;
|
|
69
|
+
blinkDuration: number;
|
|
70
|
+
};
|
|
71
|
+
export declare const DEFAULT_CONFIG: AnimationConfig;
|
|
72
|
+
export declare const EMOTION_SMOOTHING = 0.3;
|
|
73
|
+
export declare const VISEME_SMOOTHING = 0.5;
|
|
74
|
+
export {};
|