From ed82092fe5eb9426c6c4313ea3934807a3f0285b Mon Sep 17 00:00:00 2001 From: Vlad Borysenko Date: Tue, 27 Jul 2021 11:13:32 +0300 Subject: [PATCH] fix NBSP issues --- packages/runtime-3.7/src/core/Animation.ts | 2 +- packages/runtime-3.7/src/core/Skeleton.ts | 2 +- packages/runtime-3.8/src/core/Animation.ts | 2 +- packages/runtime-3.8/src/core/AnimationState.ts | 2 +- packages/runtime-3.8/src/core/Skeleton.ts | 2 +- packages/runtime-4.0/src/core/Animation.ts | 4 ++-- packages/runtime-4.0/src/core/AnimationState.ts | 2 +- packages/runtime-4.0/src/core/Skeleton.ts | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/runtime-3.7/src/core/Animation.ts b/packages/runtime-3.7/src/core/Animation.ts index 463d5103..a88a9953 100644 --- a/packages/runtime-3.7/src/core/Animation.ts +++ b/packages/runtime-3.7/src/core/Animation.ts @@ -832,7 +832,7 @@ export class DeformTimeline extends CurveTimeline { } else { Utils.arrayCopy(lastVertices, 0, vertices, 0, vertexCount); } - } else { + } else { switch (blend) { case MixBlend.setup: { let vertexAttachment = slotAttachment as VertexAttachment; diff --git a/packages/runtime-3.7/src/core/Skeleton.ts b/packages/runtime-3.7/src/core/Skeleton.ts index e55dd2a9..400cf478 100644 --- a/packages/runtime-3.7/src/core/Skeleton.ts +++ b/packages/runtime-3.7/src/core/Skeleton.ts @@ -465,7 +465,7 @@ export class Skeleton implements ISkeleton { verticesLength = 8; vertices = Utils.setArraySize(temp, verticesLength, 0); (attachment).computeWorldVertices(slot.bone, vertices, 0, 2); - } else if (attachment instanceof MeshAttachment) { + } else if (attachment instanceof MeshAttachment) { let mesh = (attachment); verticesLength = mesh.worldVerticesLength; vertices = Utils.setArraySize(temp, verticesLength, 0); diff --git a/packages/runtime-3.8/src/core/Animation.ts b/packages/runtime-3.8/src/core/Animation.ts index 8d17d529..3bc49c3a 100644 --- a/packages/runtime-3.8/src/core/Animation.ts +++ b/packages/runtime-3.8/src/core/Animation.ts @@ -946,7 +946,7 @@ export class DeformTimeline extends CurveTimeline { } else { Utils.arrayCopy(lastVertices, 0, deform, 0, vertexCount); } - } else { + } else { switch (blend) { case MixBlend.setup: { let vertexAttachment = slotAttachment as VertexAttachment; diff --git a/packages/runtime-3.8/src/core/AnimationState.ts b/packages/runtime-3.8/src/core/AnimationState.ts index f01feaa4..c76b43e7 100644 --- a/packages/runtime-3.8/src/core/AnimationState.ts +++ b/packages/runtime-3.8/src/core/AnimationState.ts @@ -768,7 +768,7 @@ export class AnimationState implements IAnimationState { else if (to == null || timeline instanceof AttachmentTimeline || timeline instanceof DrawOrderTimeline || timeline instanceof EventTimeline || !to.animation.hasTimeline(id)) { timelineMode[i] = AnimationState.FIRST; - } else { + } else { for (let next = to.mixingTo; next != null; next = next.mixingTo) { if (next.animation.hasTimeline(id)) continue; if (entry.mixDuration > 0) { diff --git a/packages/runtime-3.8/src/core/Skeleton.ts b/packages/runtime-3.8/src/core/Skeleton.ts index 4f81f60a..91935393 100644 --- a/packages/runtime-3.8/src/core/Skeleton.ts +++ b/packages/runtime-3.8/src/core/Skeleton.ts @@ -496,7 +496,7 @@ export class Skeleton implements ISkeleton { verticesLength = 8; vertices = Utils.setArraySize(temp, verticesLength, 0); (attachment).computeWorldVertices(slot.bone, vertices, 0, 2); - } else if (attachment instanceof MeshAttachment) { + } else if (attachment instanceof MeshAttachment) { let mesh = (attachment); verticesLength = mesh.worldVerticesLength; vertices = Utils.setArraySize(temp, verticesLength, 0); diff --git a/packages/runtime-4.0/src/core/Animation.ts b/packages/runtime-4.0/src/core/Animation.ts index 65b0a257..174ca2e8 100644 --- a/packages/runtime-4.0/src/core/Animation.ts +++ b/packages/runtime-4.0/src/core/Animation.ts @@ -1110,7 +1110,7 @@ export class RGBTimeline extends CurveTimeline implements SlotTimeline { color.r = r; color.g = g; color.b = b; - } else { + } else { if (blend == MixBlend.setup) { let setup = slot.data.color; color.r = setup.r; @@ -1592,7 +1592,7 @@ export class DeformTimeline extends CurveTimeline implements SlotTimeline { } } else Utils.arrayCopy(lastVertices, 0, deform, 0, vertexCount); - } else { + } else { switch (blend) { case MixBlend.setup: { let vertexAttachment = slotAttachment as VertexAttachment; diff --git a/packages/runtime-4.0/src/core/AnimationState.ts b/packages/runtime-4.0/src/core/AnimationState.ts index 9e49b283..f4ccc15a 100644 --- a/packages/runtime-4.0/src/core/AnimationState.ts +++ b/packages/runtime-4.0/src/core/AnimationState.ts @@ -706,7 +706,7 @@ export class AnimationState implements IAnimationState { else if (!to || timeline instanceof AttachmentTimeline || timeline instanceof DrawOrderTimeline || timeline instanceof EventTimeline || !to.animation.hasTimeline(ids)) { timelineMode[i] = FIRST; - } else { + } else { for (let next = to.mixingTo; next; next = next.mixingTo) { if (next.animation.hasTimeline(ids)) continue; if (entry.mixDuration > 0) { diff --git a/packages/runtime-4.0/src/core/Skeleton.ts b/packages/runtime-4.0/src/core/Skeleton.ts index 52a5a3f7..f5640c92 100644 --- a/packages/runtime-4.0/src/core/Skeleton.ts +++ b/packages/runtime-4.0/src/core/Skeleton.ts @@ -595,7 +595,7 @@ export class Skeleton implements ISkeleton { verticesLength = 8; vertices = Utils.setArraySize(temp, verticesLength, 0); (attachment).computeWorldVertices(slot.bone, vertices, 0, 2); - } else if (attachment instanceof MeshAttachment) { + } else if (attachment instanceof MeshAttachment) { let mesh = (attachment); verticesLength = mesh.worldVerticesLength; vertices = Utils.setArraySize(temp, verticesLength, 0);