From 8973253dc758b3ff419b975719b27c6baf491541 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Fri, 19 Aug 2022 17:40:54 +0200 Subject: [PATCH] [ts] Fixes #2139, incorrect null check. --- spine-ts/spine-webgl/src/ShapeRenderer.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spine-ts/spine-webgl/src/ShapeRenderer.ts b/spine-ts/spine-webgl/src/ShapeRenderer.ts index 646d8a9aa..a9494ff16 100644 --- a/spine-ts/spine-webgl/src/ShapeRenderer.ts +++ b/spine-ts/spine-webgl/src/ShapeRenderer.ts @@ -184,7 +184,7 @@ export class ShapeRenderer implements Disposable { polygon (polygonVertices: ArrayLike, offset: number, count: number, color?: Color) { if (count < 3) throw new Error("Polygon must contain at least 3 vertices"); this.check(ShapeType.Line, count * 2); - if (color) color = this.color; + if (!color) color = this.color; let vertices = this.mesh.getVertices(); let idx = this.vertexIndex; @@ -258,7 +258,7 @@ export class ShapeRenderer implements Disposable { curve (x1: number, y1: number, cx1: number, cy1: number, cx2: number, cy2: number, x2: number, y2: number, segments: number, color?: Color) { this.check(ShapeType.Line, segments * 2 + 2); - if (color) color = this.color; + if (!color) color = this.color; // Algorithm from: http://www.antigrain.com/research/bezier_interpolation/index.html#PAGE_BEZIER_INTERPOLATION let subdiv_step = 1 / segments;