Fixes to instances and expressions.

Author: davidetan

spine-ts/spine-construct3/src/c3runtime/expressions.ts

@@ -106,8 +106,8 @@ C3.Plugins.EsotericSoftware_SpineConstruct3.Exps =
 		if (field === "balance") return this.triggeredEventData?.balance ?? 0;
 		if (field === "volume") return this.triggeredEventData?.volume ?? 0;
 		if (field === "audiopath") return this.triggeredEventData?.data.audioPath ?? "";
-		if (field === "event") return this.triggeredEventData?.data.name ?? 0;
-		if (field === "animation") return this.triggeredEventData?.animation ?? 0;
+		if (field === "event") return this.triggeredEventData?.data.name ?? "";
+		if (field === "animation") return this.triggeredEventData?.animation ?? "";
 		if (field === "track") return this.triggeredEventData?.track ?? -1;
 		return "";
 	},

spine-ts/spine-construct3/src/c3runtime/instance.ts

@@ -661,7 +661,7 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
 			return;
 		}
 
-		track.alpha = spine.MathUtils.clamp(0, 1, alpha);
+		track.alpha = spine.MathUtils.clamp(alpha, 0, 1);
 	}
 
 
@@ -910,6 +910,8 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
 	private updateBoneFollowers (matrix: C3Matrix) {
 		if (this.boneFollowers.size === 0) return;
 
+		const staleFollowers: { uid: number, boneName: string }[] = [];
+
 		for (const [boneName, followers] of this.boneFollowers) {
 			const bone = this.skeleton?.findBone(boneName);
 			if (!bone) continue;
@@ -933,7 +935,7 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
 			for (const follower of followers) {
 				const instance = this.runtime.getInstanceByUid(follower.uid) as IWorldInstance;
 				if (!instance) {
-					this.detachInstanceFromBoneByUid(follower.uid, boneName);
+					staleFollowers.push({ uid: follower.uid, boneName });
 					continue;
 				}
 
@@ -957,6 +959,8 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
 				);
 			}
 		}
+
+		for (const { uid, boneName } of staleFollowers) this.detachInstanceFromBoneByUid(uid, boneName);
 	}
 
 	private updateBonesOverride () {
@@ -1184,7 +1188,7 @@ class SpineC3Instance extends globalThis.ISDKWorldInstanceBase {
 	public mirror (isMirrored: boolean) {
 		if (isMirrored !== this.isMirrored) {
 			this.isMirrored = isMirrored;
-			this.width = -this.width
+			this.width = -this.width;
 
 			for (const [, followers] of this.boneFollowers) {
 				for (const follower of followers) {

spine-ts/spine-construct3/src/instance.ts

@@ -269,7 +269,7 @@ class SpineC3PluginInstance extends SDK.IWorldInstanceBase {
 
 			if (errorsString) {
 				const webglText = this.getErrorTextC3(iRenderer, this.layoutView);
-				webglText.SetSize(_inst.GetWidth(), _inst.GetHeight(), this.debugZoomFactor(iDrawParams));
+				webglText.SetSize(_inst.GetWidth(), _inst.GetHeight(), iDrawParams.GetLayoutView().GetZoomFactor());
 				webglText.SetText(errorsString);
 
 				const texture = webglText.GetTexture();
@@ -283,19 +283,6 @@ class SpineC3PluginInstance extends SDK.IWorldInstanceBase {
 		}
 	}
 
-	private debugZoomFactor (iDrawParams: SDK.Gfx.IDrawParams) {
-		const layoutView = iDrawParams.GetLayoutView();
-		let count = 1000;
-		let zoom = -1;
-		while (zoom === -1 && count-- > 0) {
-			try {
-				zoom = layoutView.GetZoomFactor();
-			} catch (error) {
-				console.log("error ZOOM: ", error);
-			}
-		}
-		return zoom === -1 ? 1 : zoom;
-	}
 
 	private setAnimation () {
 		const propValue = this._inst.GetPropertyValue(PLUGIN_CLASS.PROP_ANIMATION) as string;