@memori.ai/memori-react 7.14.2 → 7.15.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 +12 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.d.ts +17 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js +73 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts +17 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js +25 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map +1 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +5 -3
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +26 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +166 -0
- package/dist/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -0
- package/dist/components/layouts/FullPage.js +1 -1
- package/dist/components/layouts/FullPage.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.d.ts +17 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js +69 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts +17 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js +22 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map +1 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js +5 -3
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js.map +1 -1
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.d.ts +26 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js +163 -0
- package/esm/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.js.map +1 -0
- package/esm/components/layouts/FullPage.js +1 -1
- package/esm/components/layouts/FullPage.js.map +1 -1
- package/package.json +1 -1
- package/src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx +5 -4
- package/src/components/layouts/FullPage.tsx +1 -1
- package/src/index.stories.tsx +18 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
|
|
2
2
|
|
|
3
|
+
## [7.15.0](https://github.com/memori-ai/memori-react/compare/v7.14.2...v7.15.0) (2025-01-29)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* enhance avatar animations and add new story example ([a02564d](https://github.com/memori-ai/memori-react/commit/a02564df11cc1c2b71d6475ac772c1185007041d))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* improve avatar mesh detection for different avatar types ([442a6c5](https://github.com/memori-ai/memori-react/commit/442a6c52304d25f980c3c90e404e9a16856a605d))
|
|
14
|
+
|
|
3
15
|
## [7.14.2](https://github.com/memori-ai/memori-react/compare/v7.14.1...v7.14.2) (2025-01-22)
|
|
4
16
|
|
|
5
17
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { SkinnedMesh } from 'three';
|
|
2
|
+
export declare class MorphTargetController {
|
|
3
|
+
private headMesh;
|
|
4
|
+
private currentEmotionValues;
|
|
5
|
+
private previousEmotionKeys;
|
|
6
|
+
constructor(headMesh: SkinnedMesh);
|
|
7
|
+
updateMorphTargets(currentTime: number, emotionMorphTargets: Record<string, number>, currentViseme: {
|
|
8
|
+
name: string;
|
|
9
|
+
weight: number;
|
|
10
|
+
} | null, eyeBlink: boolean, blinkState: {
|
|
11
|
+
isBlinking: boolean;
|
|
12
|
+
lastBlinkTime: number;
|
|
13
|
+
nextBlinkTime: number;
|
|
14
|
+
blinkStartTime: number;
|
|
15
|
+
}): void;
|
|
16
|
+
private calculateBlinkValue;
|
|
17
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.MorphTargetController = void 0;
|
|
4
|
+
const three_1 = require("three");
|
|
5
|
+
const constants_1 = require("./constants");
|
|
6
|
+
class MorphTargetController {
|
|
7
|
+
constructor(headMesh) {
|
|
8
|
+
this.currentEmotionValues = {};
|
|
9
|
+
this.previousEmotionKeys = new Set();
|
|
10
|
+
this.headMesh = headMesh;
|
|
11
|
+
}
|
|
12
|
+
updateMorphTargets(currentTime, emotionMorphTargets, currentViseme, eyeBlink, blinkState) {
|
|
13
|
+
if (!this.headMesh.morphTargetDictionary ||
|
|
14
|
+
!this.headMesh.morphTargetInfluences) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const blinkValue = this.calculateBlinkValue(currentTime, blinkState, eyeBlink);
|
|
18
|
+
const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
|
|
19
|
+
Object.entries(this.headMesh.morphTargetDictionary).forEach(([key, index]) => {
|
|
20
|
+
if (typeof index !== 'number')
|
|
21
|
+
return;
|
|
22
|
+
let targetValue = 0;
|
|
23
|
+
if (currentEmotionKeys.has(key)) {
|
|
24
|
+
const targetEmotionValue = emotionMorphTargets[key];
|
|
25
|
+
const currentEmotionValue = this.currentEmotionValues[key] || 0;
|
|
26
|
+
const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2.5, constants_1.EMOTION_SMOOTHING);
|
|
27
|
+
this.currentEmotionValues[key] = newEmotionValue;
|
|
28
|
+
targetValue += newEmotionValue;
|
|
29
|
+
}
|
|
30
|
+
if (currentViseme && key === currentViseme.name) {
|
|
31
|
+
targetValue += currentViseme.weight;
|
|
32
|
+
}
|
|
33
|
+
if (key === 'eyesClosed' && eyeBlink) {
|
|
34
|
+
targetValue += blinkValue;
|
|
35
|
+
}
|
|
36
|
+
targetValue = three_1.MathUtils.clamp(targetValue, 0, 1);
|
|
37
|
+
if (this.headMesh.morphTargetInfluences) {
|
|
38
|
+
this.headMesh.morphTargetInfluences[index] = three_1.MathUtils.lerp(this.headMesh.morphTargetInfluences[index] || 0, targetValue, constants_1.VISEME_SMOOTHING);
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
this.previousEmotionKeys = currentEmotionKeys;
|
|
42
|
+
}
|
|
43
|
+
calculateBlinkValue(currentTime, blinkState, eyeBlink) {
|
|
44
|
+
if (!eyeBlink)
|
|
45
|
+
return 0;
|
|
46
|
+
let blinkValue = 0;
|
|
47
|
+
if (currentTime >= blinkState.nextBlinkTime && !blinkState.isBlinking) {
|
|
48
|
+
blinkState.isBlinking = true;
|
|
49
|
+
blinkState.blinkStartTime = currentTime;
|
|
50
|
+
blinkState.lastBlinkTime = currentTime;
|
|
51
|
+
blinkState.nextBlinkTime =
|
|
52
|
+
currentTime +
|
|
53
|
+
Math.random() * (constants_1.BLINK_CONFIG.maxInterval - constants_1.BLINK_CONFIG.minInterval) +
|
|
54
|
+
constants_1.BLINK_CONFIG.minInterval;
|
|
55
|
+
}
|
|
56
|
+
if (blinkState.isBlinking) {
|
|
57
|
+
const blinkProgress = (currentTime - blinkState.blinkStartTime) / constants_1.BLINK_CONFIG.blinkDuration;
|
|
58
|
+
if (blinkProgress <= 0.5) {
|
|
59
|
+
blinkValue = blinkProgress * 2;
|
|
60
|
+
}
|
|
61
|
+
else if (blinkProgress <= 1) {
|
|
62
|
+
blinkValue = 2 - blinkProgress * 2;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
blinkState.isBlinking = false;
|
|
66
|
+
blinkValue = 0;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return blinkValue;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
exports.MorphTargetController = MorphTargetController;
|
|
73
|
+
//# sourceMappingURL=MorhTargetController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MorhTargetController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.ts"],"names":[],"mappings":"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"}
|
package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Vector3, Euler } from 'three';
|
|
2
|
+
import { AnimationConfig } from './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 ANIMATION_URLS: {
|
|
7
|
+
MALE: string;
|
|
8
|
+
FEMALE: string;
|
|
9
|
+
};
|
|
10
|
+
export declare const BLINK_CONFIG: {
|
|
11
|
+
minInterval: number;
|
|
12
|
+
maxInterval: number;
|
|
13
|
+
blinkDuration: number;
|
|
14
|
+
};
|
|
15
|
+
export declare const DEFAULT_CONFIG: AnimationConfig;
|
|
16
|
+
export declare const EMOTION_SMOOTHING = 0.3;
|
|
17
|
+
export declare const VISEME_SMOOTHING = 0.5;
|
package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js
ADDED
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.VISEME_SMOOTHING = exports.EMOTION_SMOOTHING = exports.DEFAULT_CONFIG = exports.BLINK_CONFIG = exports.ANIMATION_URLS = exports.AVATAR_POSITION_ZOOMED = exports.AVATAR_ROTATION = exports.AVATAR_POSITION = void 0;
|
|
4
|
+
const three_1 = require("three");
|
|
5
|
+
exports.AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
|
|
6
|
+
exports.AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
|
|
7
|
+
exports.AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
|
|
8
|
+
exports.ANIMATION_URLS = {
|
|
9
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
10
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/2adc934b-24b2-45bd-94ad-ffec58d3cb32.glb',
|
|
11
|
+
};
|
|
12
|
+
exports.BLINK_CONFIG = {
|
|
13
|
+
minInterval: 1000,
|
|
14
|
+
maxInterval: 5000,
|
|
15
|
+
blinkDuration: 150,
|
|
16
|
+
};
|
|
17
|
+
exports.DEFAULT_CONFIG = {
|
|
18
|
+
fadeInDuration: 0.8,
|
|
19
|
+
fadeOutDuration: 0.8,
|
|
20
|
+
idleCount: 5,
|
|
21
|
+
timeScale: 1.0,
|
|
22
|
+
};
|
|
23
|
+
exports.EMOTION_SMOOTHING = 0.3;
|
|
24
|
+
exports.VISEME_SMOOTHING = 0.5;
|
|
25
|
+
//# sourceMappingURL=constants.js.map
|
package/dist/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.ts"],"names":[],"mappings":";;;AAAA,iCAAuC;AAG1B,QAAA,eAAe,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACxC,QAAA,eAAe,GAAG,IAAI,aAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACzC,QAAA,sBAAsB,GAAG,IAAI,eAAO,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAElD,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,gFAAgF;IACtF,MAAM,EACJ,gFAAgF;CACnF,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,GAAG;CACnB,CAAC;AAEW,QAAA,cAAc,GAAoB;IAC7C,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,GAAG;IACpB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC;AAEW,QAAA,iBAAiB,GAAG,GAAG,CAAC;AACxB,QAAA,gBAAgB,GAAG,GAAG,CAAC"}
|
|
@@ -14,8 +14,10 @@ const constants_1 = require("../../constants");
|
|
|
14
14
|
function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, avatarHeight = 50, avatarDepth = 0, onCameraZChange, }) {
|
|
15
15
|
var _a;
|
|
16
16
|
const { scene } = (0, drei_1.useGLTF)(url);
|
|
17
|
-
const { animations } = (0, drei_1.useGLTF)(
|
|
18
|
-
const {
|
|
17
|
+
const { animations: baseAnimations } = (0, drei_1.useGLTF)(url);
|
|
18
|
+
const { animations: additionalAnimations } = (0, drei_1.useGLTF)(constants_1.ANIMATION_URLS[sex]);
|
|
19
|
+
const mergedAnimations = (0, react_1.useMemo)(() => [...baseAnimations, ...additionalAnimations], [baseAnimations, additionalAnimations]);
|
|
20
|
+
const { actions } = (0, drei_1.useAnimations)(mergedAnimations, scene);
|
|
19
21
|
const animationControllerRef = (0, react_1.useRef)();
|
|
20
22
|
const morphTargetControllerRef = (0, react_1.useRef)();
|
|
21
23
|
const positionControllerRef = (0, react_1.useRef)();
|
|
@@ -58,7 +60,7 @@ function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScale, eyeB
|
|
|
58
60
|
let foundMesh;
|
|
59
61
|
scene === null || scene === void 0 ? void 0 : scene.traverse((object) => {
|
|
60
62
|
if (object instanceof three_1.SkinnedMesh &&
|
|
61
|
-
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
63
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1')) {
|
|
62
64
|
if (object.name === 'GBNL__Head') {
|
|
63
65
|
setIsRpm(false);
|
|
64
66
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,iCAKe;AACf,4CAA2D;AAC3D,8CAA8C;AAC9C,mCAA8D;AAC9D,4EAAyE;AACzE,gFAA6E;AAC7E,sFAAmF;AACnF,+CAOyB;AAEzB,SAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,GAAG,EAAE,EACjB,WAAW,GAAG,CAAC,EACf,eAAe,GACK;;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,IAAA,cAAO,EAAC,0BAAc,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
interface FullbodyAvatarProps {
|
|
2
|
+
url: string;
|
|
3
|
+
sex: 'MALE' | 'FEMALE';
|
|
4
|
+
onLoaded?: () => void;
|
|
5
|
+
currentBaseAction: {
|
|
6
|
+
action: string;
|
|
7
|
+
weight: number;
|
|
8
|
+
};
|
|
9
|
+
timeScale: number;
|
|
10
|
+
isZoomed?: boolean;
|
|
11
|
+
eyeBlink?: boolean;
|
|
12
|
+
stopProcessing: () => void;
|
|
13
|
+
resetVisemeQueue: () => void;
|
|
14
|
+
updateCurrentViseme: (currentTime: number) => {
|
|
15
|
+
name: string;
|
|
16
|
+
weight: number;
|
|
17
|
+
} | null;
|
|
18
|
+
smoothMorphTarget?: boolean;
|
|
19
|
+
morphTargetSmoothing?: number;
|
|
20
|
+
morphTargetInfluences: Record<string, number>;
|
|
21
|
+
setMorphTargetDictionary: (morphTargetDictionary: Record<string, number>) => void;
|
|
22
|
+
setMorphTargetInfluences: (morphTargetInfluences: Record<string, number>) => void;
|
|
23
|
+
emotionMorphTargets: Record<string, number>;
|
|
24
|
+
}
|
|
25
|
+
export default function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }: FullbodyAvatarProps): JSX.Element;
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
4
|
+
const react_1 = require("react");
|
|
5
|
+
const three_1 = require("three");
|
|
6
|
+
const drei_1 = require("@react-three/drei");
|
|
7
|
+
const fiber_1 = require("@react-three/fiber");
|
|
8
|
+
const AVATAR_POSITION = new three_1.Vector3(0, -1, 0);
|
|
9
|
+
const AVATAR_ROTATION = new three_1.Euler(0.175, 0, 0);
|
|
10
|
+
const AVATAR_POSITION_ZOOMED = new three_1.Vector3(0, -1.45, 0);
|
|
11
|
+
const ANIMATION_URLS = {
|
|
12
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
13
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/8d1a5853-f05a-4a34-9f99-6eff64986081.glb',
|
|
14
|
+
};
|
|
15
|
+
const BLINK_CONFIG = {
|
|
16
|
+
minInterval: 1000,
|
|
17
|
+
maxInterval: 5000,
|
|
18
|
+
blinkDuration: 150,
|
|
19
|
+
};
|
|
20
|
+
const EMOTION_SMOOTHING = 0.3;
|
|
21
|
+
const VISME_SMOOTHING = 0.5;
|
|
22
|
+
function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }) {
|
|
23
|
+
const { scene } = (0, drei_1.useGLTF)(url);
|
|
24
|
+
const { animations } = (0, drei_1.useGLTF)(ANIMATION_URLS[sex]);
|
|
25
|
+
const { actions } = (0, drei_1.useAnimations)(animations, scene);
|
|
26
|
+
const mixerRef = (0, react_1.useRef)();
|
|
27
|
+
const headMeshRef = (0, react_1.useRef)();
|
|
28
|
+
const currentActionRef = (0, react_1.useRef)(null);
|
|
29
|
+
const isTransitioningToIdleRef = (0, react_1.useRef)(false);
|
|
30
|
+
const lastBlinkTimeRef = (0, react_1.useRef)(0);
|
|
31
|
+
const nextBlinkTimeRef = (0, react_1.useRef)(0);
|
|
32
|
+
const isBlinkingRef = (0, react_1.useRef)(false);
|
|
33
|
+
const blinkStartTimeRef = (0, react_1.useRef)(0);
|
|
34
|
+
const currentEmotionRef = (0, react_1.useRef)({});
|
|
35
|
+
const previousEmotionKeysRef = (0, react_1.useRef)(new Set());
|
|
36
|
+
const headMesh = (0, react_1.useMemo)(() => {
|
|
37
|
+
let foundMesh;
|
|
38
|
+
scene.traverse((object) => {
|
|
39
|
+
if (object instanceof three_1.SkinnedMesh &&
|
|
40
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
41
|
+
foundMesh = object;
|
|
42
|
+
}
|
|
43
|
+
});
|
|
44
|
+
return foundMesh;
|
|
45
|
+
}, [scene]);
|
|
46
|
+
(0, react_1.useEffect)(() => {
|
|
47
|
+
if (headMesh) {
|
|
48
|
+
headMeshRef.current = headMesh;
|
|
49
|
+
if (headMesh.morphTargetDictionary && headMesh.morphTargetInfluences) {
|
|
50
|
+
setMorphTargetDictionary(headMesh.morphTargetDictionary);
|
|
51
|
+
const initialInfluences = Object.keys(headMesh.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
|
|
52
|
+
setMorphTargetInfluences(initialInfluences);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
mixerRef.current = new three_1.AnimationMixer(scene);
|
|
56
|
+
}, [headMesh, scene, setMorphTargetDictionary, setMorphTargetInfluences]);
|
|
57
|
+
const handleAnimationChange = (0, react_1.useCallback)(() => {
|
|
58
|
+
if (!actions || !currentBaseAction.action)
|
|
59
|
+
return;
|
|
60
|
+
const newAction = actions[currentBaseAction.action];
|
|
61
|
+
if (!newAction) {
|
|
62
|
+
console.warn(`Animation "${currentBaseAction.action}" not found in actions.`);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const fadeOutDuration = 0.8;
|
|
66
|
+
const fadeInDuration = 0.8;
|
|
67
|
+
if (currentActionRef.current) {
|
|
68
|
+
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
69
|
+
}
|
|
70
|
+
newAction.reset().fadeIn(fadeInDuration).play();
|
|
71
|
+
currentActionRef.current = newAction;
|
|
72
|
+
newAction.timeScale = timeScale;
|
|
73
|
+
if (currentBaseAction.action.startsWith('Gioia') ||
|
|
74
|
+
currentBaseAction.action.startsWith('Rabbia') ||
|
|
75
|
+
currentBaseAction.action.startsWith('Sorpresa') ||
|
|
76
|
+
currentBaseAction.action.startsWith('Timore') ||
|
|
77
|
+
currentBaseAction.action.startsWith('Tristezza')) {
|
|
78
|
+
newAction.setLoop(three_1.LoopOnce, 1);
|
|
79
|
+
newAction.clampWhenFinished = true;
|
|
80
|
+
isTransitioningToIdleRef.current = true;
|
|
81
|
+
}
|
|
82
|
+
}, [actions, currentBaseAction, timeScale]);
|
|
83
|
+
(0, react_1.useEffect)(() => {
|
|
84
|
+
handleAnimationChange();
|
|
85
|
+
}, [handleAnimationChange]);
|
|
86
|
+
const updateFrame = (0, react_1.useCallback)((currentTime) => {
|
|
87
|
+
var _a;
|
|
88
|
+
if (!headMeshRef.current ||
|
|
89
|
+
!headMeshRef.current.morphTargetDictionary ||
|
|
90
|
+
!headMeshRef.current.morphTargetInfluences)
|
|
91
|
+
return;
|
|
92
|
+
let blinkValue = 0;
|
|
93
|
+
if (eyeBlink) {
|
|
94
|
+
if (currentTime >= nextBlinkTimeRef.current && !isBlinkingRef.current) {
|
|
95
|
+
isBlinkingRef.current = true;
|
|
96
|
+
blinkStartTimeRef.current = currentTime;
|
|
97
|
+
lastBlinkTimeRef.current = currentTime;
|
|
98
|
+
nextBlinkTimeRef.current =
|
|
99
|
+
currentTime +
|
|
100
|
+
Math.random() *
|
|
101
|
+
(BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
|
|
102
|
+
BLINK_CONFIG.minInterval;
|
|
103
|
+
}
|
|
104
|
+
if (isBlinkingRef.current) {
|
|
105
|
+
const blinkProgress = (currentTime - blinkStartTimeRef.current) /
|
|
106
|
+
BLINK_CONFIG.blinkDuration;
|
|
107
|
+
if (blinkProgress <= 0.5) {
|
|
108
|
+
blinkValue = blinkProgress * 2;
|
|
109
|
+
}
|
|
110
|
+
else if (blinkProgress <= 1) {
|
|
111
|
+
blinkValue = 2 - blinkProgress * 2;
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
isBlinkingRef.current = false;
|
|
115
|
+
blinkValue = 0;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
const currentViseme = updateCurrentViseme(currentTime / 1000);
|
|
120
|
+
const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
|
|
121
|
+
Object.entries(headMeshRef.current.morphTargetDictionary).forEach(([key, index]) => {
|
|
122
|
+
if (typeof index === 'number') {
|
|
123
|
+
let targetValue = 0;
|
|
124
|
+
if (currentEmotionKeys.has(key)) {
|
|
125
|
+
const targetEmotionValue = emotionMorphTargets[key];
|
|
126
|
+
const currentEmotionValue = currentEmotionRef.current[key] || 0;
|
|
127
|
+
const newEmotionValue = three_1.MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2.5, EMOTION_SMOOTHING);
|
|
128
|
+
currentEmotionRef.current[key] = newEmotionValue;
|
|
129
|
+
targetValue += newEmotionValue;
|
|
130
|
+
}
|
|
131
|
+
if (currentViseme && key === currentViseme.name) {
|
|
132
|
+
targetValue += currentViseme.weight;
|
|
133
|
+
}
|
|
134
|
+
if (key === 'eyesClosed' && eyeBlink) {
|
|
135
|
+
targetValue += blinkValue;
|
|
136
|
+
}
|
|
137
|
+
targetValue = three_1.MathUtils.clamp(targetValue, 0, 1);
|
|
138
|
+
if (headMeshRef.current &&
|
|
139
|
+
headMeshRef.current.morphTargetInfluences) {
|
|
140
|
+
headMeshRef.current.morphTargetInfluences[index] = three_1.MathUtils.lerp(headMeshRef.current.morphTargetInfluences[index], targetValue, VISME_SMOOTHING);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
});
|
|
144
|
+
previousEmotionKeysRef.current = currentEmotionKeys;
|
|
145
|
+
if (isTransitioningToIdleRef.current && currentActionRef.current) {
|
|
146
|
+
if (currentActionRef.current.time >=
|
|
147
|
+
currentActionRef.current.getClip().duration) {
|
|
148
|
+
const idleNumber = Math.floor(Math.random() * 5) + 1;
|
|
149
|
+
const idleAction = actions[`Idle${idleNumber === 3 ? 4 : idleNumber}`];
|
|
150
|
+
if (idleAction) {
|
|
151
|
+
currentActionRef.current.fadeOut(0.5);
|
|
152
|
+
idleAction.reset().fadeIn(0.5).play();
|
|
153
|
+
currentActionRef.current = idleAction;
|
|
154
|
+
isTransitioningToIdleRef.current = false;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
(_a = mixerRef.current) === null || _a === void 0 ? void 0 : _a.update(0.01);
|
|
159
|
+
}, [actions, emotionMorphTargets, eyeBlink, updateCurrentViseme]);
|
|
160
|
+
(0, fiber_1.useFrame)(state => {
|
|
161
|
+
updateFrame(state.clock.elapsedTime * 1000);
|
|
162
|
+
});
|
|
163
|
+
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 }) }));
|
|
164
|
+
}
|
|
165
|
+
exports.default = FullbodyAvatar;
|
|
166
|
+
//# sourceMappingURL=fullbodyAvatar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
5
5
|
const Spin_1 = tslib_1.__importDefault(require("../ui/Spin"));
|
|
6
|
-
const FullPageLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [integrationStyle, integrationBackground, (0, jsx_runtime_1.jsxs)(Spin_1.default, { spinning: loading, children: [Header && headerProps && (0, jsx_runtime_1.jsx)(Header, { ...headerProps }), (0, jsx_runtime_1.jsxs)("div", { className: "memori--grid", children: [(0, jsx_runtime_1.jsxs)("div", { className: "memori--grid-column memori--grid-column-left", children: [Avatar && avatarProps && (0, jsx_runtime_1.jsx)(Avatar, { ...avatarProps }), (0, jsx_runtime_1.jsx)("div", { id: "extension" })] }), (0, jsx_runtime_1.jsx)("div", { className: "memori--grid-column memori--grid-column-right", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? ((0, jsx_runtime_1.jsx)(Chat, { ...chatProps })) : startPanelProps ? ((0, jsx_runtime_1.jsx)(StartPanel, { ...startPanelProps })) : null }), poweredBy] })] })] }));
|
|
6
|
+
const FullPageLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [integrationStyle, integrationBackground, (0, jsx_runtime_1.jsxs)(Spin_1.default, { spinning: loading, children: [Header && headerProps && (0, jsx_runtime_1.jsx)(Header, { ...headerProps }), (0, jsx_runtime_1.jsxs)("div", { className: "memori--grid", children: [(0, jsx_runtime_1.jsxs)("div", { className: "memori--grid-column memori--grid-column-left", children: [Avatar && avatarProps && (0, jsx_runtime_1.jsx)(Avatar, { chatProps: chatProps, ...avatarProps }), (0, jsx_runtime_1.jsx)("div", { id: "extension" })] }), (0, jsx_runtime_1.jsx)("div", { className: "memori--grid-column memori--grid-column-right", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? ((0, jsx_runtime_1.jsx)(Chat, { ...chatProps })) : startPanelProps ? ((0, jsx_runtime_1.jsx)(StartPanel, { ...startPanelProps })) : null }), poweredBy] })] })] }));
|
|
7
7
|
exports.default = FullPageLayout;
|
|
8
8
|
//# sourceMappingURL=FullPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FullPage.js","sourceRoot":"","sources":["../../../src/components/layouts/FullPage.tsx"],"names":[],"mappings":";;;;AACA,8DAA8B;AAG9B,MAAM,cAAc,GAA0B,CAAC,EAC7C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,6DACG,gBAAgB,EAChB,qBAAqB,EAEtB,wBAAC,cAAI,IAAC,QAAQ,EAAE,OAAO,aACpB,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,OAAK,WAAW,GAAI,EAErD,iCAAK,SAAS,EAAC,cAAc,aAC3B,iCAAK,SAAS,EAAC,8CAA8C,aAC1D,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"FullPage.js","sourceRoot":"","sources":["../../../src/components/layouts/FullPage.tsx"],"names":[],"mappings":";;;;AACA,8DAA8B;AAG9B,MAAM,cAAc,GAA0B,CAAC,EAC7C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,6DACG,gBAAgB,EAChB,qBAAqB,EAEtB,wBAAC,cAAI,IAAC,QAAQ,EAAE,OAAO,aACpB,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,OAAK,WAAW,GAAI,EAErD,iCAAK,SAAS,EAAC,cAAc,aAC3B,iCAAK,SAAS,EAAC,8CAA8C,aAC1D,MAAM,IAAI,WAAW,IAAI,uBAAC,MAAM,IAAC,SAAS,EAAE,SAAS,KAAO,WAAW,GAAI,EAE5E,gCAAK,EAAE,EAAC,WAAW,GAAG,IAClB,EACN,gCAAK,SAAS,EAAC,+CAA+C,YAC3D,SAAS,IAAI,qBAAqB,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CACzD,uBAAC,IAAI,OAAK,SAAS,GAAI,CACxB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CACpB,uBAAC,UAAU,OAAK,eAAe,GAAI,CACpC,CAAC,CAAC,CAAC,IAAI,GACJ,EAEL,SAAS,IACN,IACD,IACN,CACJ,CAAC;AAEF,kBAAe,cAAc,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { SkinnedMesh } from 'three';
|
|
2
|
+
export declare class MorphTargetController {
|
|
3
|
+
private headMesh;
|
|
4
|
+
private currentEmotionValues;
|
|
5
|
+
private previousEmotionKeys;
|
|
6
|
+
constructor(headMesh: SkinnedMesh);
|
|
7
|
+
updateMorphTargets(currentTime: number, emotionMorphTargets: Record<string, number>, currentViseme: {
|
|
8
|
+
name: string;
|
|
9
|
+
weight: number;
|
|
10
|
+
} | null, eyeBlink: boolean, blinkState: {
|
|
11
|
+
isBlinking: boolean;
|
|
12
|
+
lastBlinkTime: number;
|
|
13
|
+
nextBlinkTime: number;
|
|
14
|
+
blinkStartTime: number;
|
|
15
|
+
}): void;
|
|
16
|
+
private calculateBlinkValue;
|
|
17
|
+
}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { MathUtils } from 'three';
|
|
2
|
+
import { EMOTION_SMOOTHING, VISEME_SMOOTHING, BLINK_CONFIG } from './constants';
|
|
3
|
+
export class MorphTargetController {
|
|
4
|
+
constructor(headMesh) {
|
|
5
|
+
this.currentEmotionValues = {};
|
|
6
|
+
this.previousEmotionKeys = new Set();
|
|
7
|
+
this.headMesh = headMesh;
|
|
8
|
+
}
|
|
9
|
+
updateMorphTargets(currentTime, emotionMorphTargets, currentViseme, eyeBlink, blinkState) {
|
|
10
|
+
if (!this.headMesh.morphTargetDictionary ||
|
|
11
|
+
!this.headMesh.morphTargetInfluences) {
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const blinkValue = this.calculateBlinkValue(currentTime, blinkState, eyeBlink);
|
|
15
|
+
const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
|
|
16
|
+
Object.entries(this.headMesh.morphTargetDictionary).forEach(([key, index]) => {
|
|
17
|
+
if (typeof index !== 'number')
|
|
18
|
+
return;
|
|
19
|
+
let targetValue = 0;
|
|
20
|
+
if (currentEmotionKeys.has(key)) {
|
|
21
|
+
const targetEmotionValue = emotionMorphTargets[key];
|
|
22
|
+
const currentEmotionValue = this.currentEmotionValues[key] || 0;
|
|
23
|
+
const newEmotionValue = MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2.5, EMOTION_SMOOTHING);
|
|
24
|
+
this.currentEmotionValues[key] = newEmotionValue;
|
|
25
|
+
targetValue += newEmotionValue;
|
|
26
|
+
}
|
|
27
|
+
if (currentViseme && key === currentViseme.name) {
|
|
28
|
+
targetValue += currentViseme.weight;
|
|
29
|
+
}
|
|
30
|
+
if (key === 'eyesClosed' && eyeBlink) {
|
|
31
|
+
targetValue += blinkValue;
|
|
32
|
+
}
|
|
33
|
+
targetValue = MathUtils.clamp(targetValue, 0, 1);
|
|
34
|
+
if (this.headMesh.morphTargetInfluences) {
|
|
35
|
+
this.headMesh.morphTargetInfluences[index] = MathUtils.lerp(this.headMesh.morphTargetInfluences[index] || 0, targetValue, VISEME_SMOOTHING);
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
this.previousEmotionKeys = currentEmotionKeys;
|
|
39
|
+
}
|
|
40
|
+
calculateBlinkValue(currentTime, blinkState, eyeBlink) {
|
|
41
|
+
if (!eyeBlink)
|
|
42
|
+
return 0;
|
|
43
|
+
let blinkValue = 0;
|
|
44
|
+
if (currentTime >= blinkState.nextBlinkTime && !blinkState.isBlinking) {
|
|
45
|
+
blinkState.isBlinking = true;
|
|
46
|
+
blinkState.blinkStartTime = currentTime;
|
|
47
|
+
blinkState.lastBlinkTime = currentTime;
|
|
48
|
+
blinkState.nextBlinkTime =
|
|
49
|
+
currentTime +
|
|
50
|
+
Math.random() * (BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
|
|
51
|
+
BLINK_CONFIG.minInterval;
|
|
52
|
+
}
|
|
53
|
+
if (blinkState.isBlinking) {
|
|
54
|
+
const blinkProgress = (currentTime - blinkState.blinkStartTime) / BLINK_CONFIG.blinkDuration;
|
|
55
|
+
if (blinkProgress <= 0.5) {
|
|
56
|
+
blinkValue = blinkProgress * 2;
|
|
57
|
+
}
|
|
58
|
+
else if (blinkProgress <= 1) {
|
|
59
|
+
blinkValue = 2 - blinkProgress * 2;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
blinkState.isBlinking = false;
|
|
63
|
+
blinkValue = 0;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return blinkValue;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=MorhTargetController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MorhTargetController.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/MorhTargetController.ts"],"names":[],"mappings":"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"}
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.d.ts
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Vector3, Euler } from 'three';
|
|
2
|
+
import { AnimationConfig } from './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 ANIMATION_URLS: {
|
|
7
|
+
MALE: string;
|
|
8
|
+
FEMALE: string;
|
|
9
|
+
};
|
|
10
|
+
export declare const BLINK_CONFIG: {
|
|
11
|
+
minInterval: number;
|
|
12
|
+
maxInterval: number;
|
|
13
|
+
blinkDuration: number;
|
|
14
|
+
};
|
|
15
|
+
export declare const DEFAULT_CONFIG: AnimationConfig;
|
|
16
|
+
export declare const EMOTION_SMOOTHING = 0.3;
|
|
17
|
+
export declare const VISEME_SMOOTHING = 0.5;
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Vector3, Euler } from 'three';
|
|
2
|
+
export const AVATAR_POSITION = new Vector3(0, -1, 0);
|
|
3
|
+
export const AVATAR_ROTATION = new Euler(0.175, 0, 0);
|
|
4
|
+
export const AVATAR_POSITION_ZOOMED = new Vector3(0, -1.45, 0);
|
|
5
|
+
export const ANIMATION_URLS = {
|
|
6
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
7
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/2adc934b-24b2-45bd-94ad-ffec58d3cb32.glb',
|
|
8
|
+
};
|
|
9
|
+
export const BLINK_CONFIG = {
|
|
10
|
+
minInterval: 1000,
|
|
11
|
+
maxInterval: 5000,
|
|
12
|
+
blinkDuration: 150,
|
|
13
|
+
};
|
|
14
|
+
export const DEFAULT_CONFIG = {
|
|
15
|
+
fadeInDuration: 0.8,
|
|
16
|
+
fadeOutDuration: 0.8,
|
|
17
|
+
idleCount: 5,
|
|
18
|
+
timeScale: 1.0,
|
|
19
|
+
};
|
|
20
|
+
export const EMOTION_SMOOTHING = 0.3;
|
|
21
|
+
export const VISEME_SMOOTHING = 0.5;
|
|
22
|
+
//# sourceMappingURL=constants.js.map
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAGvC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACrD,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAE/D,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,IAAI,EAAE,gFAAgF;IACtF,MAAM,EACJ,gFAAgF;CACnF,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,GAAG;CACnB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAoB;IAC7C,cAAc,EAAE,GAAG;IACnB,eAAe,EAAE,GAAG;IACpB,SAAS,EAAE,CAAC;IACZ,SAAS,EAAE,GAAG;CACf,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAC;AACrC,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,CAAC"}
|
package/esm/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.js
CHANGED
|
@@ -11,8 +11,10 @@ import { AVATAR_POSITION, AVATAR_ROTATION, ANIMATION_URLS, DEFAULT_CONFIG, SCALE
|
|
|
11
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
|
-
const { animations } = useGLTF(
|
|
15
|
-
const {
|
|
14
|
+
const { animations: baseAnimations } = useGLTF(url);
|
|
15
|
+
const { animations: additionalAnimations } = useGLTF(ANIMATION_URLS[sex]);
|
|
16
|
+
const mergedAnimations = useMemo(() => [...baseAnimations, ...additionalAnimations], [baseAnimations, additionalAnimations]);
|
|
17
|
+
const { actions } = useAnimations(mergedAnimations, scene);
|
|
16
18
|
const animationControllerRef = useRef();
|
|
17
19
|
const morphTargetControllerRef = useRef();
|
|
18
20
|
const positionControllerRef = useRef();
|
|
@@ -55,7 +57,7 @@ export function FullbodyAvatar({ url, sex, setIsRpm, currentBaseAction, timeScal
|
|
|
55
57
|
let foundMesh;
|
|
56
58
|
scene === null || scene === void 0 ? void 0 : scene.traverse((object) => {
|
|
57
59
|
if (object instanceof SkinnedMesh &&
|
|
58
|
-
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
60
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1')) {
|
|
59
61
|
if (object.name === 'GBNL__Head') {
|
|
60
62
|
setIsRpm(false);
|
|
61
63
|
}
|
|
@@ -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,oCAAoC,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,yCAAyC,CAAC;AACnF,OAAO,EACL,eAAe,EACf,eAAe,EAEf,cAAc,EACd,cAAc,EACd,iBAAiB,GAClB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,UAAU,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,QAAQ,EACR,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,GAAG,EAAE,EACjB,WAAW,GAAG,CAAC,EACf,eAAe,GACK;;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/FullbodyAvatar/fullbodyAvatar.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
interface FullbodyAvatarProps {
|
|
2
|
+
url: string;
|
|
3
|
+
sex: 'MALE' | 'FEMALE';
|
|
4
|
+
onLoaded?: () => void;
|
|
5
|
+
currentBaseAction: {
|
|
6
|
+
action: string;
|
|
7
|
+
weight: number;
|
|
8
|
+
};
|
|
9
|
+
timeScale: number;
|
|
10
|
+
isZoomed?: boolean;
|
|
11
|
+
eyeBlink?: boolean;
|
|
12
|
+
stopProcessing: () => void;
|
|
13
|
+
resetVisemeQueue: () => void;
|
|
14
|
+
updateCurrentViseme: (currentTime: number) => {
|
|
15
|
+
name: string;
|
|
16
|
+
weight: number;
|
|
17
|
+
} | null;
|
|
18
|
+
smoothMorphTarget?: boolean;
|
|
19
|
+
morphTargetSmoothing?: number;
|
|
20
|
+
morphTargetInfluences: Record<string, number>;
|
|
21
|
+
setMorphTargetDictionary: (morphTargetDictionary: Record<string, number>) => void;
|
|
22
|
+
setMorphTargetInfluences: (morphTargetInfluences: Record<string, number>) => void;
|
|
23
|
+
emotionMorphTargets: Record<string, number>;
|
|
24
|
+
}
|
|
25
|
+
export default function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }: FullbodyAvatarProps): JSX.Element;
|
|
26
|
+
export {};
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
|
+
import { useEffect, useRef, useMemo, useCallback } from 'react';
|
|
3
|
+
import { Vector3, Euler, AnimationMixer, SkinnedMesh, MathUtils, LoopOnce, } from 'three';
|
|
4
|
+
import { useAnimations, useGLTF } from '@react-three/drei';
|
|
5
|
+
import { useFrame } from '@react-three/fiber';
|
|
6
|
+
const AVATAR_POSITION = new Vector3(0, -1, 0);
|
|
7
|
+
const AVATAR_ROTATION = new Euler(0.175, 0, 0);
|
|
8
|
+
const AVATAR_POSITION_ZOOMED = new Vector3(0, -1.45, 0);
|
|
9
|
+
const ANIMATION_URLS = {
|
|
10
|
+
MALE: 'https://assets.memori.ai/api/v2/asset/2c5e88a4-cf62-408b-9ef0-518b099dfcb2.glb',
|
|
11
|
+
FEMALE: 'https://assets.memori.ai/api/v2/asset/8d1a5853-f05a-4a34-9f99-6eff64986081.glb',
|
|
12
|
+
};
|
|
13
|
+
const BLINK_CONFIG = {
|
|
14
|
+
minInterval: 1000,
|
|
15
|
+
maxInterval: 5000,
|
|
16
|
+
blinkDuration: 150,
|
|
17
|
+
};
|
|
18
|
+
const EMOTION_SMOOTHING = 0.3;
|
|
19
|
+
const VISME_SMOOTHING = 0.5;
|
|
20
|
+
export default function FullbodyAvatar({ url, sex, currentBaseAction, timeScale, isZoomed, eyeBlink, updateCurrentViseme, setMorphTargetDictionary, setMorphTargetInfluences, emotionMorphTargets, }) {
|
|
21
|
+
const { scene } = useGLTF(url);
|
|
22
|
+
const { animations } = useGLTF(ANIMATION_URLS[sex]);
|
|
23
|
+
const { actions } = useAnimations(animations, scene);
|
|
24
|
+
const mixerRef = useRef();
|
|
25
|
+
const headMeshRef = useRef();
|
|
26
|
+
const currentActionRef = useRef(null);
|
|
27
|
+
const isTransitioningToIdleRef = useRef(false);
|
|
28
|
+
const lastBlinkTimeRef = useRef(0);
|
|
29
|
+
const nextBlinkTimeRef = useRef(0);
|
|
30
|
+
const isBlinkingRef = useRef(false);
|
|
31
|
+
const blinkStartTimeRef = useRef(0);
|
|
32
|
+
const currentEmotionRef = useRef({});
|
|
33
|
+
const previousEmotionKeysRef = useRef(new Set());
|
|
34
|
+
const headMesh = useMemo(() => {
|
|
35
|
+
let foundMesh;
|
|
36
|
+
scene.traverse((object) => {
|
|
37
|
+
if (object instanceof SkinnedMesh &&
|
|
38
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')) {
|
|
39
|
+
foundMesh = object;
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
return foundMesh;
|
|
43
|
+
}, [scene]);
|
|
44
|
+
useEffect(() => {
|
|
45
|
+
if (headMesh) {
|
|
46
|
+
headMeshRef.current = headMesh;
|
|
47
|
+
if (headMesh.morphTargetDictionary && headMesh.morphTargetInfluences) {
|
|
48
|
+
setMorphTargetDictionary(headMesh.morphTargetDictionary);
|
|
49
|
+
const initialInfluences = Object.keys(headMesh.morphTargetDictionary).reduce((acc, key) => ({ ...acc, [key]: 0 }), {});
|
|
50
|
+
setMorphTargetInfluences(initialInfluences);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
mixerRef.current = new AnimationMixer(scene);
|
|
54
|
+
}, [headMesh, scene, setMorphTargetDictionary, setMorphTargetInfluences]);
|
|
55
|
+
const handleAnimationChange = useCallback(() => {
|
|
56
|
+
if (!actions || !currentBaseAction.action)
|
|
57
|
+
return;
|
|
58
|
+
const newAction = actions[currentBaseAction.action];
|
|
59
|
+
if (!newAction) {
|
|
60
|
+
console.warn(`Animation "${currentBaseAction.action}" not found in actions.`);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
const fadeOutDuration = 0.8;
|
|
64
|
+
const fadeInDuration = 0.8;
|
|
65
|
+
if (currentActionRef.current) {
|
|
66
|
+
currentActionRef.current.fadeOut(fadeOutDuration);
|
|
67
|
+
}
|
|
68
|
+
newAction.reset().fadeIn(fadeInDuration).play();
|
|
69
|
+
currentActionRef.current = newAction;
|
|
70
|
+
newAction.timeScale = timeScale;
|
|
71
|
+
if (currentBaseAction.action.startsWith('Gioia') ||
|
|
72
|
+
currentBaseAction.action.startsWith('Rabbia') ||
|
|
73
|
+
currentBaseAction.action.startsWith('Sorpresa') ||
|
|
74
|
+
currentBaseAction.action.startsWith('Timore') ||
|
|
75
|
+
currentBaseAction.action.startsWith('Tristezza')) {
|
|
76
|
+
newAction.setLoop(LoopOnce, 1);
|
|
77
|
+
newAction.clampWhenFinished = true;
|
|
78
|
+
isTransitioningToIdleRef.current = true;
|
|
79
|
+
}
|
|
80
|
+
}, [actions, currentBaseAction, timeScale]);
|
|
81
|
+
useEffect(() => {
|
|
82
|
+
handleAnimationChange();
|
|
83
|
+
}, [handleAnimationChange]);
|
|
84
|
+
const updateFrame = useCallback((currentTime) => {
|
|
85
|
+
var _a;
|
|
86
|
+
if (!headMeshRef.current ||
|
|
87
|
+
!headMeshRef.current.morphTargetDictionary ||
|
|
88
|
+
!headMeshRef.current.morphTargetInfluences)
|
|
89
|
+
return;
|
|
90
|
+
let blinkValue = 0;
|
|
91
|
+
if (eyeBlink) {
|
|
92
|
+
if (currentTime >= nextBlinkTimeRef.current && !isBlinkingRef.current) {
|
|
93
|
+
isBlinkingRef.current = true;
|
|
94
|
+
blinkStartTimeRef.current = currentTime;
|
|
95
|
+
lastBlinkTimeRef.current = currentTime;
|
|
96
|
+
nextBlinkTimeRef.current =
|
|
97
|
+
currentTime +
|
|
98
|
+
Math.random() *
|
|
99
|
+
(BLINK_CONFIG.maxInterval - BLINK_CONFIG.minInterval) +
|
|
100
|
+
BLINK_CONFIG.minInterval;
|
|
101
|
+
}
|
|
102
|
+
if (isBlinkingRef.current) {
|
|
103
|
+
const blinkProgress = (currentTime - blinkStartTimeRef.current) /
|
|
104
|
+
BLINK_CONFIG.blinkDuration;
|
|
105
|
+
if (blinkProgress <= 0.5) {
|
|
106
|
+
blinkValue = blinkProgress * 2;
|
|
107
|
+
}
|
|
108
|
+
else if (blinkProgress <= 1) {
|
|
109
|
+
blinkValue = 2 - blinkProgress * 2;
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
isBlinkingRef.current = false;
|
|
113
|
+
blinkValue = 0;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
const currentViseme = updateCurrentViseme(currentTime / 1000);
|
|
118
|
+
const currentEmotionKeys = new Set(Object.keys(emotionMorphTargets));
|
|
119
|
+
Object.entries(headMeshRef.current.morphTargetDictionary).forEach(([key, index]) => {
|
|
120
|
+
if (typeof index === 'number') {
|
|
121
|
+
let targetValue = 0;
|
|
122
|
+
if (currentEmotionKeys.has(key)) {
|
|
123
|
+
const targetEmotionValue = emotionMorphTargets[key];
|
|
124
|
+
const currentEmotionValue = currentEmotionRef.current[key] || 0;
|
|
125
|
+
const newEmotionValue = MathUtils.lerp(currentEmotionValue, targetEmotionValue * 2.5, EMOTION_SMOOTHING);
|
|
126
|
+
currentEmotionRef.current[key] = newEmotionValue;
|
|
127
|
+
targetValue += newEmotionValue;
|
|
128
|
+
}
|
|
129
|
+
if (currentViseme && key === currentViseme.name) {
|
|
130
|
+
targetValue += currentViseme.weight;
|
|
131
|
+
}
|
|
132
|
+
if (key === 'eyesClosed' && eyeBlink) {
|
|
133
|
+
targetValue += blinkValue;
|
|
134
|
+
}
|
|
135
|
+
targetValue = MathUtils.clamp(targetValue, 0, 1);
|
|
136
|
+
if (headMeshRef.current &&
|
|
137
|
+
headMeshRef.current.morphTargetInfluences) {
|
|
138
|
+
headMeshRef.current.morphTargetInfluences[index] = MathUtils.lerp(headMeshRef.current.morphTargetInfluences[index], targetValue, VISME_SMOOTHING);
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
previousEmotionKeysRef.current = currentEmotionKeys;
|
|
143
|
+
if (isTransitioningToIdleRef.current && currentActionRef.current) {
|
|
144
|
+
if (currentActionRef.current.time >=
|
|
145
|
+
currentActionRef.current.getClip().duration) {
|
|
146
|
+
const idleNumber = Math.floor(Math.random() * 5) + 1;
|
|
147
|
+
const idleAction = actions[`Idle${idleNumber === 3 ? 4 : idleNumber}`];
|
|
148
|
+
if (idleAction) {
|
|
149
|
+
currentActionRef.current.fadeOut(0.5);
|
|
150
|
+
idleAction.reset().fadeIn(0.5).play();
|
|
151
|
+
currentActionRef.current = idleAction;
|
|
152
|
+
isTransitioningToIdleRef.current = false;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
(_a = mixerRef.current) === null || _a === void 0 ? void 0 : _a.update(0.01);
|
|
157
|
+
}, [actions, emotionMorphTargets, eyeBlink, updateCurrentViseme]);
|
|
158
|
+
useFrame(state => {
|
|
159
|
+
updateFrame(state.clock.elapsedTime * 1000);
|
|
160
|
+
});
|
|
161
|
+
return (_jsx("group", { position: isZoomed ? AVATAR_POSITION_ZOOMED : AVATAR_POSITION, rotation: AVATAR_ROTATION, children: _jsx("primitive", { object: scene }) }));
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=fullbodyAvatar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fullbodyAvatar.js","sourceRoot":"","sources":["../../../../../../src/components/Avatar/AvatarView/AvatarComponent/components/fullbodyAvatar.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EACL,OAAO,EACP,KAAK,EACL,cAAc,EACd,WAAW,EAEX,SAAS,EAET,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAY,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AA8BxD,MAAM,eAAe,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC9C,MAAM,eAAe,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/C,MAAM,sBAAsB,GAAG,IAAI,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;AAExD,MAAM,cAAc,GAAG;IACrB,IAAI,EAAE,gFAAgF;IACtF,MAAM,EACJ,gFAAgF;CACnF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,IAAI;IACjB,aAAa,EAAE,GAAG;CACnB,CAAC;AAEF,MAAM,iBAAiB,GAAG,GAAG,CAAC;AAC9B,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,EACrC,GAAG,EACH,GAAG,EACH,iBAAiB,EACjB,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,mBAAmB,GACC;IACpB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,MAAM,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAErD,MAAM,QAAQ,GAAG,MAAM,EAAkB,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAM,EAAe,CAAC;IAC1C,MAAM,gBAAgB,GAAG,MAAM,CAAyB,IAAI,CAAC,CAAC;IAC9D,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,gBAAgB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,iBAAiB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IAEpC,MAAM,iBAAiB,GAAG,MAAM,CAAyB,EAAE,CAAC,CAAC;IAC7D,MAAM,sBAAsB,GAAG,MAAM,CAAc,IAAI,GAAG,EAAE,CAAC,CAAC;IAG9D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,EAAE;QAC5B,IAAI,SAAkC,CAAC;QACvC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAgB,EAAE,EAAE;YAClC,IACE,MAAM,YAAY,WAAW;gBAC7B,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,EACjE;gBACA,SAAS,GAAG,MAAM,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,EAAE;YACZ,WAAW,CAAC,OAAO,GAAG,QAAQ,CAAC;YAC/B,IAAI,QAAQ,CAAC,qBAAqB,IAAI,QAAQ,CAAC,qBAAqB,EAAE;gBACpE,wBAAwB,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;gBACzD,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CACnC,QAAQ,CAAC,qBAAqB,CAC/B,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACnD,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;aAC7C;SACF;QACD,QAAQ,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,wBAAwB,EAAE,wBAAwB,CAAC,CAAC,CAAC;IAG1E,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC7C,IAAI,CAAC,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM;YAAE,OAAO;QAElD,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,CAAC,IAAI,CACV,cAAc,iBAAiB,CAAC,MAAM,yBAAyB,CAChE,CAAC;YACF,OAAO;SACR;QAED,MAAM,eAAe,GAAG,GAAG,CAAC;QAC5B,MAAM,cAAc,GAAG,GAAG,CAAC;QAE3B,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAC5B,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;SACnD;QAED,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC;QAChD,gBAAgB,CAAC,OAAO,GAAG,SAAS,CAAC;QACrC,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;QAEhC,IACE,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;YAC5C,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC7C,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC;YAC/C,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;YAC7C,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,EAChD;YACA,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YAC/B,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC;YACnC,wBAAwB,CAAC,OAAO,GAAG,IAAI,CAAC;SACzC;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACb,qBAAqB,EAAE,CAAC;IAC1B,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,CAAC;IAG5B,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,WAAmB,EAAE,EAAE;;QACtB,IACE,CAAC,WAAW,CAAC,OAAO;YACpB,CAAC,WAAW,CAAC,OAAO,CAAC,qBAAqB;YAC1C,CAAC,WAAW,CAAC,OAAO,CAAC,qBAAqB;YAE1C,OAAO;QAET,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,QAAQ,EAAE;YACZ,IAAI,WAAW,IAAI,gBAAgB,CAAC,OAAO,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;gBACrE,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC7B,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC;gBACxC,gBAAgB,CAAC,OAAO,GAAG,WAAW,CAAC;gBACvC,gBAAgB,CAAC,OAAO;oBACtB,WAAW;wBACX,IAAI,CAAC,MAAM,EAAE;4BACX,CAAC,YAAY,CAAC,WAAW,GAAG,YAAY,CAAC,WAAW,CAAC;wBACvD,YAAY,CAAC,WAAW,CAAC;aAC5B;YAED,IAAI,aAAa,CAAC,OAAO,EAAE;gBACzB,MAAM,aAAa,GACjB,CAAC,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC;oBACzC,YAAY,CAAC,aAAa,CAAC;gBAC7B,IAAI,aAAa,IAAI,GAAG,EAAE;oBACxB,UAAU,GAAG,aAAa,GAAG,CAAC,CAAC;iBAChC;qBAAM,IAAI,aAAa,IAAI,CAAC,EAAE;oBAC7B,UAAU,GAAG,CAAC,GAAG,aAAa,GAAG,CAAC,CAAC;iBACpC;qBAAM;oBACL,aAAa,CAAC,OAAO,GAAG,KAAK,CAAC;oBAC9B,UAAU,GAAG,CAAC,CAAC;iBAChB;aACF;SACF;QAGD,MAAM,aAAa,GAAG,mBAAmB,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;QAC9D,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAGrE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAC/D,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACf,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;gBAC7B,IAAI,WAAW,GAAG,CAAC,CAAC;gBAEpB,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;oBAC/B,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;oBACpD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAChE,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,mBAAmB,EACnB,kBAAkB,GAAG,GAAG,EACxB,iBAAiB,CAClB,CAAC;oBACF,iBAAiB,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;oBACjD,WAAW,IAAI,eAAe,CAAC;iBAChC;gBAED,IAAI,aAAa,IAAI,GAAG,KAAK,aAAa,CAAC,IAAI,EAAE;oBAC/C,WAAW,IAAI,aAAa,CAAC,MAAM,CAAC;iBACrC;gBAED,IAAI,GAAG,KAAK,YAAY,IAAI,QAAQ,EAAE;oBACpC,WAAW,IAAI,UAAU,CAAC;iBAC3B;gBAED,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjD,IACE,WAAW,CAAC,OAAO;oBACnB,WAAW,CAAC,OAAO,CAAC,qBAAqB,EACzC;oBACA,WAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC,IAAI,CAC/D,WAAW,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAChD,WAAW,EACX,eAAe,CAChB,CAAC;iBACH;aACF;QACH,CAAC,CACF,CAAC;QAGF,sBAAsB,CAAC,OAAO,GAAG,kBAAkB,CAAC;QAGpD,IAAI,wBAAwB,CAAC,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE;YAChE,IACE,gBAAgB,CAAC,OAAO,CAAC,IAAI;gBAC7B,gBAAgB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,QAAQ,EAC3C;gBACA,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;gBACrD,MAAM,UAAU,GACd,OAAO,CAAC,OAAO,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC;gBAEtD,IAAI,UAAU,EAAE;oBACd,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;oBACtC,UAAU,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;oBACtC,gBAAgB,CAAC,OAAO,GAAG,UAAU,CAAC;oBACtC,wBAAwB,CAAC,OAAO,GAAG,KAAK,CAAC;iBAC1C;aACF;SACF;QAED,MAAA,QAAQ,CAAC,OAAO,0CAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC,EACD,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAC9D,CAAC;IAEF,QAAQ,CAAC,KAAK,CAAC,EAAE;QACf,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,OAAO,CACL,gBACE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,eAAe,EAC7D,QAAQ,EAAE,eAAe,YAEzB,oBAAW,MAAM,EAAE,KAAK,GAAI,GACtB,CACT,CAAC;AACJ,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
2
2
|
import Spin from '../ui/Spin';
|
|
3
|
-
const FullPageLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => (_jsxs(_Fragment, { children: [integrationStyle, integrationBackground, _jsxs(Spin, { spinning: loading, children: [Header && headerProps && _jsx(Header, { ...headerProps }), _jsxs("div", { className: "memori--grid", children: [_jsxs("div", { className: "memori--grid-column memori--grid-column-left", children: [Avatar && avatarProps && _jsx(Avatar, { ...avatarProps }), _jsx("div", { id: "extension" })] }), _jsx("div", { className: "memori--grid-column memori--grid-column-right", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? (_jsx(Chat, { ...chatProps })) : startPanelProps ? (_jsx(StartPanel, { ...startPanelProps })) : null }), poweredBy] })] })] }));
|
|
3
|
+
const FullPageLayout = ({ Header, headerProps, Avatar, avatarProps, Chat, chatProps, StartPanel, startPanelProps, integrationStyle, integrationBackground, sessionId, hasUserActivatedSpeak, loading = false, poweredBy, }) => (_jsxs(_Fragment, { children: [integrationStyle, integrationBackground, _jsxs(Spin, { spinning: loading, children: [Header && headerProps && _jsx(Header, { ...headerProps }), _jsxs("div", { className: "memori--grid", children: [_jsxs("div", { className: "memori--grid-column memori--grid-column-left", children: [Avatar && avatarProps && _jsx(Avatar, { chatProps: chatProps, ...avatarProps }), _jsx("div", { id: "extension" })] }), _jsx("div", { className: "memori--grid-column memori--grid-column-right", children: sessionId && hasUserActivatedSpeak && Chat && chatProps ? (_jsx(Chat, { ...chatProps })) : startPanelProps ? (_jsx(StartPanel, { ...startPanelProps })) : null }), poweredBy] })] })] }));
|
|
4
4
|
export default FullPageLayout;
|
|
5
5
|
//# sourceMappingURL=FullPage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FullPage.js","sourceRoot":"","sources":["../../../src/components/layouts/FullPage.tsx"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,YAAY,CAAC;AAG9B,MAAM,cAAc,GAA0B,CAAC,EAC7C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,8BACG,gBAAgB,EAChB,qBAAqB,EAEtB,MAAC,IAAI,IAAC,QAAQ,EAAE,OAAO,aACpB,MAAM,IAAI,WAAW,IAAI,KAAC,MAAM,OAAK,WAAW,GAAI,EAErD,eAAK,SAAS,EAAC,cAAc,aAC3B,eAAK,SAAS,EAAC,8CAA8C,aAC1D,MAAM,IAAI,WAAW,IAAI,KAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"FullPage.js","sourceRoot":"","sources":["../../../src/components/layouts/FullPage.tsx"],"names":[],"mappings":";AACA,OAAO,IAAI,MAAM,YAAY,CAAC;AAG9B,MAAM,cAAc,GAA0B,CAAC,EAC7C,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,IAAI,EACJ,SAAS,EACT,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,qBAAqB,EACrB,SAAS,EACT,qBAAqB,EACrB,OAAO,GAAG,KAAK,EACf,SAAS,GACV,EAAE,EAAE,CAAC,CACJ,8BACG,gBAAgB,EAChB,qBAAqB,EAEtB,MAAC,IAAI,IAAC,QAAQ,EAAE,OAAO,aACpB,MAAM,IAAI,WAAW,IAAI,KAAC,MAAM,OAAK,WAAW,GAAI,EAErD,eAAK,SAAS,EAAC,cAAc,aAC3B,eAAK,SAAS,EAAC,8CAA8C,aAC1D,MAAM,IAAI,WAAW,IAAI,KAAC,MAAM,IAAC,SAAS,EAAE,SAAS,KAAO,WAAW,GAAI,EAE5E,cAAK,EAAE,EAAC,WAAW,GAAG,IAClB,EACN,cAAK,SAAS,EAAC,+CAA+C,YAC3D,SAAS,IAAI,qBAAqB,IAAI,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CACzD,KAAC,IAAI,OAAK,SAAS,GAAI,CACxB,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CACpB,KAAC,UAAU,OAAK,eAAe,GAAI,CACpC,CAAC,CAAC,CAAC,IAAI,GACJ,EAEL,SAAS,IACN,IACD,IACN,CACJ,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
package/package.json
CHANGED
|
@@ -36,8 +36,10 @@ export function FullbodyAvatar({
|
|
|
36
36
|
onCameraZChange,
|
|
37
37
|
}: FullbodyAvatarProps) {
|
|
38
38
|
const { scene } = useGLTF(url);
|
|
39
|
-
const { animations } = useGLTF(
|
|
40
|
-
const {
|
|
39
|
+
const { animations: baseAnimations } = useGLTF(url);
|
|
40
|
+
const { animations: additionalAnimations } = useGLTF(ANIMATION_URLS[sex]);
|
|
41
|
+
const mergedAnimations = useMemo(() => [...baseAnimations, ...additionalAnimations], [baseAnimations, additionalAnimations]);
|
|
42
|
+
const { actions } = useAnimations(mergedAnimations, scene);
|
|
41
43
|
|
|
42
44
|
const animationControllerRef = useRef<AnimationController>();
|
|
43
45
|
const morphTargetControllerRef = useRef<MorphTargetController>();
|
|
@@ -98,9 +100,8 @@ export function FullbodyAvatar({
|
|
|
98
100
|
scene?.traverse((object: Object3D) => {
|
|
99
101
|
if (
|
|
100
102
|
object instanceof SkinnedMesh &&
|
|
101
|
-
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar')
|
|
103
|
+
(object.name === 'GBNL__Head' || object.name === 'Wolf3D_Avatar' || object.name === 'Wolf3D_Avatar006_1')
|
|
102
104
|
) {
|
|
103
|
-
// console.log('[FullbodyAvatar] Found head mesh:', object.name);
|
|
104
105
|
if(object.name === 'GBNL__Head') {
|
|
105
106
|
setIsRpm(false);
|
|
106
107
|
} else {
|
|
@@ -27,7 +27,7 @@ const FullPageLayout: React.FC<LayoutProps> = ({
|
|
|
27
27
|
|
|
28
28
|
<div className="memori--grid">
|
|
29
29
|
<div className="memori--grid-column memori--grid-column-left">
|
|
30
|
-
{Avatar && avatarProps && <Avatar {...avatarProps} />}
|
|
30
|
+
{Avatar && avatarProps && <Avatar chatProps={chatProps} {...avatarProps} />}
|
|
31
31
|
|
|
32
32
|
<div id="extension" />
|
|
33
33
|
</div>
|
package/src/index.stories.tsx
CHANGED
|
@@ -250,6 +250,24 @@ NunzioFiore.args = {
|
|
|
250
250
|
enableAudio: 'true',
|
|
251
251
|
};
|
|
252
252
|
|
|
253
|
+
export const DancingAvatar = Template.bind({});
|
|
254
|
+
DancingAvatar.args = {
|
|
255
|
+
memoriName: 'Dancing Avatar',
|
|
256
|
+
ownerUserName: 'andrea.patini3',
|
|
257
|
+
memoriID: '04a56ff0-c202-425d-907d-1ca0b7563e44',
|
|
258
|
+
ownerUserID: '58770358-a5db-4b49-b3a4-734fc468e745',
|
|
259
|
+
tenantID: 'aisuru-staging.aclambda.online',
|
|
260
|
+
apiURL: 'https://backend-staging.memori.ai',
|
|
261
|
+
engineURL: 'https://engine-staging-tmp.memori.ai',
|
|
262
|
+
baseURL: 'https://aisuru-staging.aclambda.online',
|
|
263
|
+
uiLang: 'IT',
|
|
264
|
+
spokenLang: 'IT',
|
|
265
|
+
layout: 'FULLPAGE',
|
|
266
|
+
multilingual: 'true',
|
|
267
|
+
showShare: 'true',
|
|
268
|
+
integrationID: '16a142a0-cb4e-4484-b2b1-662f965fc29c',
|
|
269
|
+
};
|
|
270
|
+
|
|
253
271
|
const TemplateWithBatchButton: Story<Props> = args => (
|
|
254
272
|
<div>
|
|
255
273
|
<button
|