From 237f1fd9683632c155ed2bb62cd9aaf73c666761 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Thu, 13 Dec 2018 09:29:24 +0100 Subject: [PATCH] [csharp] Removed unnecessary porting differences. --- spine-csharp/src/IkConstraint.cs | 1 - spine-csharp/src/PathConstraint.cs | 11 ++++------- spine-csharp/src/Skeleton.cs | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spine-csharp/src/IkConstraint.cs b/spine-csharp/src/IkConstraint.cs index 9b70a6a96..0bc276210 100644 --- a/spine-csharp/src/IkConstraint.cs +++ b/spine-csharp/src/IkConstraint.cs @@ -152,7 +152,6 @@ namespace Spine { child.UpdateWorldTransform (); return; } - //float px = parent.x, py = parent.y, psx = parent.scaleX, psy = parent.scaleY, csx = child.scaleX; if (!parent.appliedValid) parent.UpdateAppliedTransform(); if (!child.appliedValid) child.UpdateAppliedTransform(); float px = parent.ax, py = parent.ay, psx = parent.ascaleX, sx = psx, psy = parent.ascaleY, csx = child.ascaleX; diff --git a/spine-csharp/src/PathConstraint.cs b/spine-csharp/src/PathConstraint.cs index 4187b5802..a558d6080 100644 --- a/spine-csharp/src/PathConstraint.cs +++ b/spine-csharp/src/PathConstraint.cs @@ -81,8 +81,7 @@ namespace Spine { if (!translate && !rotate) return; PathConstraintData data = this.data; - SpacingMode spacingMode = data.spacingMode; - bool percentSpacing = spacingMode == SpacingMode.Percent; + bool percentSpacing = data.spacingMode == SpacingMode.Percent; RotateMode rotateMode = data.rotateMode; bool tangents = rotateMode == RotateMode.Tangent, scale = rotateMode == RotateMode.ChainScale; int boneCount = this.bones.Count, spacesCount = tangents ? boneCount : boneCount + 1; @@ -158,9 +157,8 @@ namespace Spine { float length = bone.data.length; boneX += (length * (cos * a - sin * c) - dx) * rotateMix; boneY += (length * (sin * a + cos * c) - dy) * rotateMix; - } else { + } else r += offsetRotation; - } if (r > MathUtils.PI) r -= MathUtils.PI2; else if (r < -MathUtils.PI) // @@ -186,11 +184,10 @@ namespace Spine { bool closed = path.Closed; int verticesLength = path.WorldVerticesLength, curveCount = verticesLength / 6, prevCurve = NONE; - float pathLength; if (!path.ConstantSpeed) { float[] lengths = path.Lengths; curveCount -= closed ? 1 : 2; - pathLength = lengths[curveCount]; + float pathLength = lengths[curveCount]; if (percentPosition) position *= pathLength; if (percentSpacing) { for (int i = 0; i < spacesCount; i++) @@ -265,7 +262,7 @@ namespace Spine { // Curve lengths. float[] curves = this.curves.Resize(curveCount).Items; - pathLength = 0; + float pathLength = 0; float x1 = world[0], y1 = world[1], cx1 = 0, cy1 = 0, cx2 = 0, cy2 = 0, x2 = 0, y2 = 0; float tmpx, tmpy, dddfx, dddfy, ddfx, ddfy, dfx, dfy; for (int i = 0, w = 2; i < curveCount; i++, w += 6) { diff --git a/spine-csharp/src/Skeleton.cs b/spine-csharp/src/Skeleton.cs index 81e6b4a6c..70f776c39 100644 --- a/spine-csharp/src/Skeleton.cs +++ b/spine-csharp/src/Skeleton.cs @@ -133,7 +133,7 @@ namespace Spine { var ikConstraints = this.ikConstraints; var transformConstraints = this.transformConstraints; var pathConstraints = this.pathConstraints; - int ikCount = IkConstraints.Count, transformCount = transformConstraints.Count, pathCount = pathConstraints.Count; + int ikCount = ikConstraints.Count, transformCount = transformConstraints.Count, pathCount = pathConstraints.Count; int constraintCount = ikCount + transformCount + pathCount; //outer: for (int i = 0; i < constraintCount; i++) {