Skip to content

Commit

Permalink
Merge pull request #398 from konan21/bugfix/nbsp-issue
Browse files Browse the repository at this point in the history
fix NBSP issues
  • Loading branch information
ivanpopelyshev authored Jul 27, 2021
2 parents 53e216d + ed82092 commit 6a6118c
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion packages/runtime-3.7/src/core/Animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-3.7/src/core/Skeleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ export class Skeleton implements ISkeleton<Bone, Slot> {
verticesLength = 8;
vertices = Utils.setArraySize(temp, verticesLength, 0);
(<RegionAttachment>attachment).computeWorldVertices(slot.bone, vertices, 0, 2);
} else if (attachment instanceof MeshAttachment) {
} else if (attachment instanceof MeshAttachment) {
let mesh = (<MeshAttachment>attachment);
verticesLength = mesh.worldVerticesLength;
vertices = Utils.setArraySize(temp, verticesLength, 0);
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-3.8/src/core/Animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-3.8/src/core/AnimationState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-3.8/src/core/Skeleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ export class Skeleton implements ISkeleton<Bone, Slot> {
verticesLength = 8;
vertices = Utils.setArraySize(temp, verticesLength, 0);
(<RegionAttachment>attachment).computeWorldVertices(slot.bone, vertices, 0, 2);
} else if (attachment instanceof MeshAttachment) {
} else if (attachment instanceof MeshAttachment) {
let mesh = (<MeshAttachment>attachment);
verticesLength = mesh.worldVerticesLength;
vertices = Utils.setArraySize(temp, verticesLength, 0);
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime-4.0/src/core/Animation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-4.0/src/core/AnimationState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-4.0/src/core/Skeleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ export class Skeleton implements ISkeleton<Bone, Slot> {
verticesLength = 8;
vertices = Utils.setArraySize(temp, verticesLength, 0);
(<RegionAttachment>attachment).computeWorldVertices(slot.bone, vertices, 0, 2);
} else if (attachment instanceof MeshAttachment) {
} else if (attachment instanceof MeshAttachment) {
let mesh = (<MeshAttachment>attachment);
verticesLength = mesh.worldVerticesLength;
vertices = Utils.setArraySize(temp, verticesLength, 0);
Expand Down

0 comments on commit 6a6118c

Please sign in to comment.