From 61d9f729d6404d3e25ec26f139bff9152675f097 Mon Sep 17 00:00:00 2001 From: pharan Date: Tue, 26 Sep 2017 21:39:05 +0800 Subject: [PATCH] [csharp] New labeled goto convention. For https://github.com/EsotericSoftware/spine-runtimes/issues/1002 --- spine-csharp/src/AnimationState.cs | 4 ++-- spine-csharp/src/IkConstraint.cs | 4 ++-- spine-csharp/src/Skeleton.cs | 8 ++++---- spine-csharp/src/Triangulator.cs | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spine-csharp/src/AnimationState.cs b/spine-csharp/src/AnimationState.cs index 772ecc08b..f992efe0c 100644 --- a/spine-csharp/src/AnimationState.cs +++ b/spine-csharp/src/AnimationState.cs @@ -712,14 +712,14 @@ namespace Spine { if (entry.mixDuration > 0) { timelineDataItems[i] = AnimationState.DipMix; timelineDipMixItems[i] = entry; - goto outer; // continue outer; + goto continue_outer; // continue outer; } break; } } timelineDataItems[i] = AnimationState.Dip; } - outer: {} + continue_outer: {} } return lastEntry; } diff --git a/spine-csharp/src/IkConstraint.cs b/spine-csharp/src/IkConstraint.cs index 900b84870..9d188a69e 100644 --- a/spine-csharp/src/IkConstraint.cs +++ b/spine-csharp/src/IkConstraint.cs @@ -176,7 +176,7 @@ namespace Spine { y = (float)Math.Sqrt(dd - r * r) * bendDir; a1 = ta - (float)Math.Atan2(y, r); a2 = (float)Math.Atan2(y / psy, (r - l1) / psx); - goto outer; // break outer; + goto break_outer; // break outer; } } float minAngle = MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0; @@ -208,7 +208,7 @@ namespace Spine { a2 = maxAngle * bendDir; } } - outer: + break_outer: float os = (float)Math.Atan2(cy, cx) * s2; float rotation = parent.arotation; a1 = (a1 - os) * MathUtils.RadDeg + os1 - rotation; diff --git a/spine-csharp/src/Skeleton.cs b/spine-csharp/src/Skeleton.cs index a244544a2..ed4897ae6 100644 --- a/spine-csharp/src/Skeleton.cs +++ b/spine-csharp/src/Skeleton.cs @@ -135,24 +135,24 @@ namespace Spine { IkConstraint constraint = ikConstraints.Items[ii]; if (constraint.data.order == i) { SortIkConstraint(constraint); - goto outer; //continue outer; + goto continue_outer; //continue outer; } } for (int ii = 0; ii < transformCount; ii++) { TransformConstraint constraint = transformConstraints.Items[ii]; if (constraint.data.order == i) { SortTransformConstraint(constraint); - goto outer; //continue outer; + goto continue_outer; //continue outer; } } for (int ii = 0; ii < pathCount; ii++) { PathConstraint constraint = pathConstraints.Items[ii]; if (constraint.data.order == i) { SortPathConstraint(constraint); - goto outer; //continue outer; + goto continue_outer; //continue outer; } } - outer: {} + continue_outer: {} } for (int i = 0, n = bones.Count; i < n; i++) diff --git a/spine-csharp/src/Triangulator.cs b/spine-csharp/src/Triangulator.cs index dd1768b52..c4bdb0418 100644 --- a/spine-csharp/src/Triangulator.cs +++ b/spine-csharp/src/Triangulator.cs @@ -78,13 +78,13 @@ namespace Spine { float vx = vertices[v], vy = vertices[v + 1]; if (PositiveArea(p3x, p3y, p1x, p1y, vx, vy)) { if (PositiveArea(p1x, p1y, p2x, p2y, vx, vy)) { - if (PositiveArea(p2x, p2y, p3x, p3y, vx, vy)) goto outer; // break outer; + if (PositiveArea(p2x, p2y, p3x, p3y, vx, vy)) goto break_outer; // break outer; } } } break; } - outer: + break_outer: if (next == 0) { do {