Skip to content

⚡ Bolt: Replace Map iterator array conversions with for...of loops #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
meet447 wants to merge 1 commit into from
Closed

⚡ Bolt: Replace Map iterator array conversions with for...of loops #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions src/hooks/useVRM.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,14 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {

// Play idle animation if available
const idleNames = ["idle", "breathingidle", "breathing_idle", "standing", "default"];
const clipKeys = Array.from(clipsRef.current.keys());
for (const name of idleNames) {
const match = clipKeys.find(
(k) => k.toLowerCase().includes(name)
);
let match: string | undefined;
for (const k of clipsRef.current.keys()) {
if (k.toLowerCase().includes(name)) {
match = k;
break;
}
}
if (match) {
playAnimation(match);
break;
Expand All @@ -423,7 +426,7 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {

console.log("[VRM] Model loaded:", modelPath);
console.log("[VRM] Expressions:", Object.keys(vrm.expressionManager?.expressionMap || {}));
console.log("[VRM] Animations:", [...clipsRef.current.keys()]);
console.log("[VRM] Animations:", Array.from(clipsRef.current.keys()));

startAnimationLoop();
} catch (err) {
Expand Down Expand Up @@ -462,9 +465,14 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {
}

// Try to play matching animation if available
const matchingAnim = [...clipsRef.current.keys()].find(
(k) => k.toLowerCase().includes(expressionName.toLowerCase())
);
let matchingAnim: string | undefined;
const lowerExpr = expressionName.toLowerCase();
for (const k of clipsRef.current.keys()) {
if (k.toLowerCase().includes(lowerExpr)) {
matchingAnim = k;
break;
}
}
if (matchingAnim) {
playAnimation(matchingAnim);
}
Expand All @@ -479,9 +487,13 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {
if (getAudioLevels) audioLevelsGetterRef.current = getAudioLevels;

// Play talking animation if available
const talkAnim = [...clipsRef.current.keys()].find(
(k) => k.toLowerCase().includes("talk")
);
let talkAnim: string | undefined;
for (const k of clipsRef.current.keys()) {
if (k.toLowerCase().includes("talk")) {
talkAnim = k;
break;
}
}
if (talkAnim) playAnimation(talkAnim);
}, [playAnimation]);

Expand All @@ -493,11 +505,14 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {

// Return to idle animation
const idleNames = ["idle", "breathingidle", "breathing_idle", "standing", "default"];
const clipKeys = Array.from(clipsRef.current.keys());
for (const name of idleNames) {
const match = clipKeys.find(
(k) => k.toLowerCase().includes(name)
);
let match: string | undefined;
for (const k of clipsRef.current.keys()) {
if (k.toLowerCase().includes(name)) {
match = k;
break;
}
}
if (match) {
playAnimation(match);
break;
Expand Down Expand Up @@ -540,7 +555,7 @@ export function useVRM(canvasRef: React.RefObject<HTMLCanvasElement | null>) {
mouthValue: Math.round(mouthValueRef.current * 100) / 100,
mappingEmotions: [],
availableExpressions: Object.keys(vrmRef.current?.expressionManager?.expressionMap || {}),
availableMotionGroups: [...clipsRef.current.keys()],
availableMotionGroups: Array.from(clipsRef.current.keys()),
lastError: "",
}), []);

Expand Down
Loading