UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-11 17:48:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source 
# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
This commit is contained in:
Mario Zechner 2022-08-19 17:42:34 +02:00
commit 57c60dc303
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-ts/spine-webgl/src/ShapeRenderer.ts
View File

@ -184,7 +184,7 @@ export class ShapeRenderer implements Disposable {
polygon (polygonVertices: ArrayLike<number>, 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;