|
@@ -60,10 +60,10 @@ export const addAM = (data: AnimationModel): Promise<AnimationModel3D> => {
|
|
|
paths: {},
|
|
|
subtitles: {},
|
|
|
};
|
|
|
- const am = animationGroup.addAnimationModel(data)
|
|
|
- am.bus.on('loadDone', () => {
|
|
|
- amMap[key].am = am
|
|
|
- })
|
|
|
+ const am = animationGroup.addAnimationModel(data);
|
|
|
+ am.bus.on("loadDone", () => {
|
|
|
+ amMap[key].am = am;
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
{ immediate: true }
|
|
@@ -121,18 +121,17 @@ export const addFrame = (
|
|
|
([map, exists]) => {
|
|
|
if (!map.am) return;
|
|
|
if (exists && !map.frames[data.id]) {
|
|
|
-
|
|
|
map.frames[data.id] = map.am.addFrame(data);
|
|
|
} else if (!exists && map.frames[data.id]) {
|
|
|
map.frames[data.id].destroy();
|
|
|
delete map.frames[data.id];
|
|
|
}
|
|
|
},
|
|
|
- {immediate: true}
|
|
|
+ { immediate: true }
|
|
|
);
|
|
|
|
|
|
- const stopAttrib = mergeFuns(() =>
|
|
|
- watchEffect(() => amMap[key].frames[data.id]?.changeTime(data.time)),
|
|
|
+ const stopAttrib = mergeFuns(
|
|
|
+ () => watchEffect(() => amMap[key].frames[data.id]?.changeTime(data.time)),
|
|
|
watchEffect(() => data.mat && amMap[key].frames[data.id]?.setMat(data.mat))
|
|
|
);
|
|
|
|
|
@@ -184,7 +183,7 @@ export const addAction = (
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- {immediate: true}
|
|
|
+ { immediate: true }
|
|
|
);
|
|
|
|
|
|
const stopAttrib = mergeFuns(
|
|
@@ -247,7 +246,7 @@ export const addPath = (
|
|
|
delete map.paths[data.id];
|
|
|
}
|
|
|
},
|
|
|
- {immediate: true}
|
|
|
+ { immediate: true }
|
|
|
);
|
|
|
|
|
|
const stopAttrib = mergeFuns(
|
|
@@ -288,7 +287,7 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
|
|
|
}
|
|
|
const key = getAMKey(am);
|
|
|
const size = ref({ width: 0, height: 0 });
|
|
|
- const show = ref(false)
|
|
|
+ const show = ref(false);
|
|
|
const pixel = ref<Pos>();
|
|
|
const stopLoad = watch(
|
|
|
() => {
|
|
@@ -314,16 +313,19 @@ export const addSubtitle = (data: AnimationModelSubtitle) => {
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- {immediate: true}
|
|
|
+ { immediate: true }
|
|
|
);
|
|
|
|
|
|
const stopAttrib = mergeFuns(
|
|
|
watch([currentTime, () => amMap[am.id].am, size], () => {
|
|
|
- if (currentTime.value >= data.time && (data.time + data.duration) <= currentTime.value) {
|
|
|
- amMap[am.id].am?.getCurrentSubtitlePixel(size.value)
|
|
|
- show.value = true
|
|
|
+ if (
|
|
|
+ currentTime.value >= data.time &&
|
|
|
+ data.time + data.duration <= currentTime.value
|
|
|
+ ) {
|
|
|
+ amMap[am.id].am?.getCurrentSubtitlePixel(size.value);
|
|
|
+ show.value = true;
|
|
|
} else {
|
|
|
- show.value = false
|
|
|
+ show.value = false;
|
|
|
}
|
|
|
})
|
|
|
);
|
|
@@ -346,10 +348,14 @@ export const associationAnimation = (sdk: SDK, el: HTMLDivElement) => {
|
|
|
animationGroup = sdk.createAnimationGroup();
|
|
|
|
|
|
watchEffect(() => {
|
|
|
+ console.error("发送setCurrentTime", currentTime.value);
|
|
|
animationGroup.setCurrentTime(currentTime.value);
|
|
|
});
|
|
|
|
|
|
- animationGroup.bus.on('currentTime', time => currentTime.value = time)
|
|
|
+ animationGroup.bus.on("currentTime", (time) => {
|
|
|
+ console.error("接收setCurrentTime", time);
|
|
|
+ currentTime.value = time;
|
|
|
+ });
|
|
|
|
|
|
watch(
|
|
|
() => [...ams.value],
|