🐞 fix: 修复canvas-size参数失效问题

fix #2

Author: Nattsu39

Diff for: src/handler.ts

@@ -2,19 +2,19 @@ import fs from "fs/promises";
 import { createCanvas } from "node-canvas-webgl";
 import { FfmpegFrameExporter } from "./exporter.js";
 import { AssetPath, SpineRenderer, TexturePath, loadTexture } from "./renderer.js";
-import { formatOutputPath, traverseDir } from "./utils.js";
+import { formatOutputPath, traverseDir, Viewsize } from "./utils.js";
 import { TExporterType } from "./exporter.js";
 import { AssetManager, ManagedWebGLRenderingContext } from "@node-spine-runtimes/webgl-3.8.99";
 import sharp from "sharp";
 import path from "path";
 import { formatString } from "./utils.js";
 
-export function parseCanvasSize(size: string) {
-	const canvasWxH = size.split("x");
-	if (canvasWxH.length !== 2) {
+export function parseCanvasSize(size: string): Viewsize {
+	const canvasSize = size.split("x");
+	if (canvasSize.length !== 2) {
 		throw new Error("Canvas size format error! \n" + "Correct format: [width]x[height], for example 500x500.");
 	}
-	return { width: parseInt(canvasWxH[0]), height: parseInt(canvasWxH[1]) };
+	return { width: parseInt(canvasSize[0]), height: parseInt(canvasSize[1]) };
 }
 
 export interface SpineAnimationExportOptions {
@@ -48,10 +48,7 @@ export async function exportSpineAnimation(inputDir: string, options: SpineAnima
 	};
 	await checkParams();
 
-	const isOldCanvasMode = typeof canvasSize === "string";
-	const size = isOldCanvasMode ? parseCanvasSize(canvasSize) : { width: 1000, height: 1000 };
-
-	const renderer = new SpineRenderer(createCanvas(size.width, size.height));
+	const renderer = new SpineRenderer(createCanvas(1000, 1000));
 	const exporter = new FfmpegFrameExporter(exporterMaxConcurrent)
 
 	const paths = await traverseDir(inputDir, AssetPath);
@@ -67,12 +64,13 @@ export async function exportSpineAnimation(inputDir: string, options: SpineAnima
 				if (selectedAnimation.length && !selectedAnimation.includes(animationName)) {
 					continue;
 				}
-
+				const viewsize = typeof canvasSize === "string" ? parseCanvasSize(canvasSize) : undefined;
 				console.log(`${assetProcess}Start rendering the animation '${animationName}' of asset '${assetName}'...`);
 				const animationFrames = renderer.render({
 					skeleton,
 					state,
 					animationName,
+					viewsize,
 					fps,
 					endPosition,
 				});
@@ -85,7 +83,7 @@ export async function exportSpineAnimation(inputDir: string, options: SpineAnima
 					{
 						outputPath: formatOutputPath(outputPath, formatObject),
 						fps,
-						autoCrop: isOldCanvasMode,
+						autoCrop: viewsize !== undefined,
 					}
 				);
 			}

Diff for: src/renderer.ts

@@ -23,7 +23,7 @@ import {
 } from "@node-spine-runtimes/webgl-3.8.99";
 import fs from "fs";
 import path from "path";
-import { sleep, replacePathSpecific, removePathExtension } from "./utils.js";
+import { sleep, replacePathSpecific, removePathExtension, Viewsize } from "./utils.js";
 
 export interface LoadedResult {
 	skeleton: Skeleton;
@@ -33,6 +33,7 @@ export interface LoadedResult {
 export interface RenderOptions extends LoadedResult {
 	animationName?: string;
 	fps: number;
+	viewsize?: Viewsize;
 	endPosition?: number;
 }
 
@@ -171,13 +172,20 @@ export class SpineRenderer {
 			this.renderer.drawSkeleton(skeleton, true);
 			this.renderer.end();
 		};
-		let { skeleton, state, animationName = skeleton.data.animations[0].name, fps, endPosition = Infinity } = options;
+		let { skeleton, state, animationName = skeleton.data.animations[0].name, fps, viewsize, endPosition = Infinity } = options;
 
 		state.setAnimation(0, animationName, false);
 
 		const viewport = calculateAnimationViewport(skeleton.data.findAnimation(animationName)!, skeleton, fps);
-		this.canvas.width = Math.round(viewport.width);
-		this.canvas.height = Math.round(viewport.height);
+		if (viewsize === undefined) {
+			this.canvas.width = Math.round(viewport.width);
+			this.canvas.height = Math.round(viewport.height);
+		}
+		else {
+			this.canvas.width = viewsize.width;
+			this.canvas.height = viewsize.height;
+		}
+
 		if (this.canvas.width % 2 !== 0) this.canvas.width += 1;
 		if (this.canvas.height % 2 !== 0) this.canvas.height += 1;
 

Diff for: src/utils.ts

@@ -89,3 +89,8 @@ export function defer<T = void>(): Deferred<T> {
     })
     return { resolve, reject, promise };
 }
+
+export interface Viewsize {
+	width: number;
+	height: number;
+}