From d1c09687e81becb8929c4a19d6293e637e40b106 Mon Sep 17 00:00:00 2001
From: Harald Csaszar <harald.csaszar@pixelcloudgames.com>
Date: Thu, 7 Mar 2024 15:24:42 +0100
Subject: [PATCH] [csharp] Port of commit 98c5be6. Use delta for physics limit,
 apply limit to scale.

---
 spine-csharp/src/PhysicsConstraint.cs | 21 ++++++++++++++-------
 spine-csharp/src/SkeletonBinary.cs    |  2 +-
 spine-csharp/src/SkeletonJson.cs      |  2 +-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/spine-csharp/src/PhysicsConstraint.cs b/spine-csharp/src/PhysicsConstraint.cs
index 109e79ba3..277c3da3a 100644
--- a/spine-csharp/src/PhysicsConstraint.cs
+++ b/spine-csharp/src/PhysicsConstraint.cs
@@ -147,7 +147,8 @@ namespace Spine {
 				Reset();
 				goto case Physics.Update; // Fall through.
 			case Physics.Update:
-				remaining += Math.Max(skeleton.time - lastTime, 0);
+				float delta = Math.Max(skeleton.time - lastTime, 0);
+				remaining += delta;
 				lastTime = skeleton.time;
 
 				float bx = bone.worldX, by = bone.worldY;
@@ -156,7 +157,7 @@ namespace Spine {
 					ux = bx;
 					uy = by;
 				} else {
-					float a = this.remaining, i = inertia, q = data.limit, t = data.step, f = skeleton.data.referenceScale;
+					float a = this.remaining, i = inertia, q = data.limit * delta, t = data.step, f = skeleton.data.referenceScale;
 					if (x || y) {
 						if (x) {
 							float u = (ux - bx) * i;
@@ -190,12 +191,18 @@ namespace Spine {
 					}
 					if (rotateOrShearX || scaleX) {
 						float ca = (float)Math.Atan2(bone.c, bone.a), c, s, mr = 0;
+						float dx = cx - bone.worldX, dy = cy - bone.worldY;
+						if (dx > q)
+							dx = q;
+						else if (dx < -q)
+							dx = -q;
+						if (dy > q)
+							dy = q;
+						else if (dy < -q)
+							dy = -q;
 						if (rotateOrShearX) {
 							mr = (data.rotate + data.shearX) * mix;
-							float dx = cx - bone.worldX, dy = cy - bone.worldY;
-							float r = (float)Math.Atan2((dy > q ? q : dy < -q ? -q : dy) + ty, (dx > q ? q : dx < -q ? -q : dx) + tx) - ca
-								- rotateOffset * mr;
-
+							float r = (float)Math.Atan2(dy + ty, dx + tx) - ca - rotateOffset * mr;
 							rotateOffset += (r - (float)Math.Ceiling(r * MathUtils.InvPI2 - 0.5f) * MathUtils.PI2) * i;
 							r = rotateOffset * mr + ca;
 							c = (float)Math.Cos(r);
@@ -208,7 +215,7 @@ namespace Spine {
 							c = (float)Math.Cos(ca);
 							s = (float)Math.Sin(ca);
 							float r = l * bone.WorldScaleX;
-							if (r > 0) scaleOffset += ((cx - bone.worldX) * c + (cy - bone.worldY) * s) * i / r;
+							if (r > 0) scaleOffset += (dx * c + dy * s) * i / r;
 						}
 						a = this.remaining;
 						if (a >= t) {
diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs
index 3a9b2b83b..abad06357 100644
--- a/spine-csharp/src/SkeletonBinary.cs
+++ b/spine-csharp/src/SkeletonBinary.cs
@@ -321,7 +321,7 @@ namespace Spine {
 				if ((flags & 8) != 0) data.rotate = input.ReadFloat();
 				if ((flags & 16) != 0) data.scaleX = input.ReadFloat();
 				if ((flags & 32) != 0) data.shearX = input.ReadFloat();
-				data.limit = ((flags & 64) != 0 ? input.ReadFloat() : 500) * scale;
+				data.limit = ((flags & 64) != 0 ? input.ReadFloat() : 5000) * scale;
 				data.step = 1f / input.ReadUByte();
 				data.inertia = input.ReadFloat();
 				data.strength = input.ReadFloat();
diff --git a/spine-csharp/src/SkeletonJson.cs b/spine-csharp/src/SkeletonJson.cs
index 0da0f2121..a8e850e3d 100644
--- a/spine-csharp/src/SkeletonJson.cs
+++ b/spine-csharp/src/SkeletonJson.cs
@@ -303,7 +303,7 @@ namespace Spine {
 					data.rotate = GetFloat(constraintMap, "rotate", 0);
 					data.scaleX = GetFloat(constraintMap, "scaleX", 0);
 					data.shearX = GetFloat(constraintMap, "shearX", 0);
-					data.limit = GetFloat(constraintMap, "limit", 500) * scale;
+					data.limit = GetFloat(constraintMap, "limit", 5000) * scale;
 					data.step = 1f / GetInt(constraintMap, "fps", 60);
 					data.inertia = GetFloat(constraintMap, "inertia", 1);
 					data.strength = GetFloat(constraintMap, "strength", 100);