增加物理结算

SpineThumbnailGenerateServer/js/renderer.js

@@ -136,8 +136,12 @@ function readSkeletonData(spine, skeletonPath, atlas, isBinary) {
 	return loader.readSkeletonData(fs.readFileSync(skeletonPath, 'utf8'));
 }
 
-function updateWorld(spine, skeleton) {
-	if (spine.Physics && spine.Physics.update !== undefined) skeleton.updateWorldTransform(spine.Physics.update);
+function updateWorld(spine, skeleton, delta = 0, resetPhysics = false) {
+	if (spine.Physics && spine.Physics.update !== undefined) {
+		if (delta > 0 && typeof skeleton.update === 'function') skeleton.update(delta);
+		const mode = resetPhysics && spine.Physics.reset !== undefined ? spine.Physics.reset : spine.Physics.update;
+		skeleton.updateWorldTransform(mode);
+	}
 	else skeleton.updateWorldTransform();
 }
 
@@ -191,7 +195,7 @@ async function renderThumbnail(options) {
 	utils.applySkin(skeleton, utils.preferredSkin(data));
 	if (typeof skeleton.setToSetupPose === 'function') skeleton.setToSetupPose();
 	else if (typeof skeleton.setupPose === 'function') skeleton.setupPose();
-	updateWorld(spine, skeleton);
+	updateWorld(spine, skeleton, 0, true);
 
 	const bounds = boundsOf(spine, skeleton);
 
@@ -275,7 +279,7 @@ function firstAnimation(data) {
 	return null;
 }
 
-function applyAnimationPose(spine, targetSkeleton, targetState, animation, time) {
+function applyAnimationPose(spine, targetSkeleton, targetState, animation, time, previousTime) {
 	if (typeof targetState.clearTracks === 'function') targetState.clearTracks();
 	else if (typeof targetState.clearTrack === 'function') targetState.clearTrack(0);
 	if (typeof targetSkeleton.setToSetupPose === 'function') targetSkeleton.setToSetupPose();
@@ -283,7 +287,7 @@ function applyAnimationPose(spine, targetSkeleton, targetState, animation, time)
 	if (entry) entry.loop = false;
 	targetState.update(Math.max(0, time));
 	targetState.apply(targetSkeleton);
-	updateWorld(spine, targetSkeleton);
+	updateWorld(spine, targetSkeleton, previousTime === undefined ? 0 : Math.max(0, time - previousTime), previousTime === undefined);
 }
 
 function mergeBounds(total, next) {
@@ -319,8 +323,10 @@ async function measureVisibleBounds(loaded, targetSkeleton, fallbackBounds, pose
 	try {
 		probe = window.SpineCanvasClipping.createRenderer(loaded.spine, context, loaded.runtimeDir);
 		probe.premultipliedAlpha = loaded.premultipliedAlpha;
+		let previousIndex = -1;
 		for (let index = 0; index < poseCount; index += step) {
-			applyPose(index);
+			applyPose(index, previousIndex);
+			previousIndex = index;
 			context.setTransform(1, 0, 0, 1, 0, 0);
 			context.clearRect(0, 0, size, size);
 			context.save();
@@ -397,13 +403,13 @@ async function renderAnimatedSourceFrames(loaded, animation, options) {
 	const state = new spine.AnimationState(stateData);
 
 	let bounds = null;
-	for (const time of sampleTimes) {
-		applyAnimationPose(spine, skeleton, state, animation, time);
+	for (let index = 0; index < sampleTimes.length; index++) {
+		applyAnimationPose(spine, skeleton, state, animation, sampleTimes[index], index ? sampleTimes[index - 1] : undefined);
 		bounds = mergeBounds(bounds, boundsOf(spine, skeleton));
 	}
 	if (!bounds || bounds.width <= 0 || bounds.height <= 0) throw new Error('骨骼数据没有可绘制的范围');
-	bounds = await measureVisibleBounds(loaded, skeleton, bounds, sampleTimes.length, (index) => {
-		applyAnimationPose(spine, skeleton, state, animation, sampleTimes[index]);
+	bounds = await measureVisibleBounds(loaded, skeleton, bounds, sampleTimes.length, (index, previousIndex) => {
+		applyAnimationPose(spine, skeleton, state, animation, sampleTimes[index], previousIndex >= 0 ? sampleTimes[previousIndex] : undefined);
 	}, options.probe) || bounds;
 
 	const canvas = document.createElement('canvas');
@@ -421,7 +427,7 @@ async function renderAnimatedSourceFrames(loaded, animation, options) {
 		renderer = window.SpineCanvasClipping.createRenderer(spine, ctx, loaded.runtimeDir);
 		renderer.premultipliedAlpha = loaded.premultipliedAlpha;
 		for (let index = 0; index < sampleTimes.length; index++) {
-			applyAnimationPose(spine, skeleton, state, animation, sampleTimes[index]);
+			applyAnimationPose(spine, skeleton, state, animation, sampleTimes[index], index ? sampleTimes[index - 1] : undefined);
 			ctx.setTransform(1, 0, 0, 1, 0, 0);
 			ctx.fillStyle = '#1e1e1e';
 			ctx.fillRect(0, 0, size, size);