Просмотр исходного кода

[ts] Fixes #2139, incorrect null check.

Mario Zechner 3 лет назад
Родитель
Сommit
8973253dc7
1 измененных файлов с 2 добавлено и 2 удалено
  1. 2 2
      spine-ts/spine-webgl/src/ShapeRenderer.ts

+ 2 - 2
spine-ts/spine-webgl/src/ShapeRenderer.ts

@@ -184,7 +184,7 @@ export class ShapeRenderer implements Disposable {
 	polygon (polygonVertices: ArrayLike<number>, offset: number, count: number, color?: Color) {
 	polygon (polygonVertices: ArrayLike<number>, offset: number, count: number, color?: Color) {
 		if (count < 3) throw new Error("Polygon must contain at least 3 vertices");
 		if (count < 3) throw new Error("Polygon must contain at least 3 vertices");
 		this.check(ShapeType.Line, count * 2);
 		this.check(ShapeType.Line, count * 2);
-		if (color) color = this.color;
+		if (!color) color = this.color;
 		let vertices = this.mesh.getVertices();
 		let vertices = this.mesh.getVertices();
 		let idx = this.vertexIndex;
 		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) {
 	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);
 		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
 		// Algorithm from: http://www.antigrain.com/research/bezier_interpolation/index.html#PAGE_BEZIER_INTERPOLATION
 		let subdiv_step = 1 / segments;
 		let subdiv_step = 1 / segments;