瀏覽代碼

[c] Ported IKConstraint simplification, see #907

badlogic 8 年之前
父節點
當前提交
4a3e12c75f
共有 1 個文件被更改,包括 2 次插入14 次删除
  1. 2 14
      spine-c/spine-c/src/spine/IkConstraint.c

+ 2 - 14
spine-c/spine-c/src/spine/IkConstraint.c

@@ -150,8 +150,8 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
 		float aa = a * a, bb = b * b, ll = l1 * l1, dd = tx * tx + ty * ty, ta = ATAN2(ty, tx);
 		float c0 = bb * ll + aa * dd - aa * bb, c1 = -2 * bb * l1, c2 = bb - aa;
 		float d = c1 * c1 - 4 * c2 * c0;
-		float minAngle = 0, minDist = FLT_MAX, minX = 0, minY = 0;
-		float maxAngle = 0, maxDist = 0, maxX = 0, maxY = 0;
+		float minAngle = PI, minX = l1 - a, minDist = minX * minX, minY = 0;
+		float maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0;
 		float x = l1 + a, dist = x * x, angle, y;
 		if (d >= 0) {
 			float q = SQRT(d), r0, r1;
@@ -166,18 +166,6 @@ void spIkConstraint_apply2 (spBone* parent, spBone* child, float targetX, float
 				goto outer;
 			}
 		}
-		if (dist > maxDist) {
-			maxAngle = 0;
-			maxDist = dist;
-			maxX = x;
-		}
-		x = l1 - a;
-		dist = x * x;
-		if (dist < minDist) {
-			minAngle = PI;
-			minDist = dist;
-			minX = x;
-		}
 		angle = ACOS(-a * l1 / (aa - bb));
 		x = a * COS(angle) + l1;
 		y = b * SIN(angle);