From 5ee7d93fced4b4d98a4a6335c7f5a45ca14cef64 Mon Sep 17 00:00:00 2001 From: Ivan Popelyshev Date: Fri, 8 Mar 2019 17:44:15 +0300 Subject: [PATCH] Remove "spine." everywhere (#1297) --- spine-ts/core/src/AssetManager.ts | 6 +++--- spine-ts/core/src/IkConstraint.ts | 2 +- spine-ts/core/src/SkeletonClipping.ts | 10 +++++----- spine-ts/core/src/Texture.ts | 6 +++--- spine-ts/core/src/attachments/ClippingAttachment.ts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/spine-ts/core/src/AssetManager.ts b/spine-ts/core/src/AssetManager.ts index 536de0bdd..f861323df 100644 --- a/spine-ts/core/src/AssetManager.ts +++ b/spine-ts/core/src/AssetManager.ts @@ -150,12 +150,12 @@ module spine { var pagesLoaded: any = { count: 0 }; var atlasPages = new Array(); try { - let atlas = new spine.TextureAtlas(atlasData, (path: string) => { + let atlas = new TextureAtlas(atlasData, (path: string) => { atlasPages.push(parent + "/" + path); let image = document.createElement("img") as HTMLImageElement; image.width = 16; image.height = 16; - return new spine.FakeTexture(image); + return new FakeTexture(image); }); } catch (e) { let ex = e as Error; @@ -174,7 +174,7 @@ module spine { if (pagesLoaded.count == atlasPages.length) { if (!pageLoadError) { try { - let atlas = new spine.TextureAtlas(atlasData, (path: string) => { + let atlas = new TextureAtlas(atlasData, (path: string) => { return this.get(parent + "/" + path); }); this.assets[path] = atlas; diff --git a/spine-ts/core/src/IkConstraint.ts b/spine-ts/core/src/IkConstraint.ts index 3f75fb34b..b2bcf204a 100644 --- a/spine-ts/core/src/IkConstraint.ts +++ b/spine-ts/core/src/IkConstraint.ts @@ -185,7 +185,7 @@ module spine { break outer; } } - let minAngle = spine.MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0; + let minAngle = MathUtils.PI, minX = l1 - a, minDist = minX * minX, minY = 0; let maxAngle = 0, maxX = l1 + a, maxDist = maxX * maxX, maxY = 0; c = -a * l1 / (aa - bb); if (c >= -1 && c <= 1) { diff --git a/spine-ts/core/src/SkeletonClipping.ts b/spine-ts/core/src/SkeletonClipping.ts index 968051e5f..bc18b6fde 100644 --- a/spine-ts/core/src/SkeletonClipping.ts +++ b/spine-ts/core/src/SkeletonClipping.ts @@ -45,7 +45,7 @@ module spine { this.clipAttachment = clip; let n = clip.worldVerticesLength; - let vertices = spine.Utils.setArraySize(this.clippingPolygon, n); + let vertices = Utils.setArraySize(this.clippingPolygon, n); clip.computeWorldVertices(slot, 0, n, vertices, 0, 2); let clippingPolygon = this.clippingPolygon; SkeletonClipping.makeClockwise(clippingPolygon); @@ -113,7 +113,7 @@ module spine { let clipOutputCount = clipOutputLength >> 1; let clipOutputItems = this.clipOutput; - let clippedVerticesItems = spine.Utils.setArraySize(clippedVertices, s + clipOutputCount * vertexSize); + let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + clipOutputCount * vertexSize); for (let ii = 0; ii < clipOutputLength; ii += 2) { let x = clipOutputItems[ii], y = clipOutputItems[ii + 1]; clippedVerticesItems[s] = x; @@ -138,7 +138,7 @@ module spine { } s = clippedTriangles.length; - let clippedTrianglesItems = spine.Utils.setArraySize(clippedTriangles, s + 3 * (clipOutputCount - 2)); + let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3 * (clipOutputCount - 2)); clipOutputCount--; for (let ii = 1; ii < clipOutputCount; ii++) { clippedTrianglesItems[s] = index; @@ -149,7 +149,7 @@ module spine { index += clipOutputCount + 1; } else { - let clippedVerticesItems = spine.Utils.setArraySize(clippedVertices, s + 3 * vertexSize); + let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + 3 * vertexSize); clippedVerticesItems[s] = x1; clippedVerticesItems[s + 1] = y1; clippedVerticesItems[s + 2] = light.r; @@ -213,7 +213,7 @@ module spine { } s = clippedTriangles.length; - let clippedTrianglesItems = spine.Utils.setArraySize(clippedTriangles, s + 3); + let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3); clippedTrianglesItems[s] = index; clippedTrianglesItems[s + 1] = (index + 1); clippedTrianglesItems[s + 2] = (index + 2); diff --git a/spine-ts/core/src/Texture.ts b/spine-ts/core/src/Texture.ts index abef51e3e..983da271f 100644 --- a/spine-ts/core/src/Texture.ts +++ b/spine-ts/core/src/Texture.ts @@ -93,9 +93,9 @@ module spine { originalWidth = 0; originalHeight = 0; } - export class FakeTexture extends spine.Texture { - setFilters(minFilter: spine.TextureFilter, magFilter: spine.TextureFilter) { } - setWraps(uWrap: spine.TextureWrap, vWrap: spine.TextureWrap) { } + export class FakeTexture extends Texture { + setFilters(minFilter: TextureFilter, magFilter: TextureFilter) { } + setWraps(uWrap: TextureWrap, vWrap: TextureWrap) { } dispose() { } } } diff --git a/spine-ts/core/src/attachments/ClippingAttachment.ts b/spine-ts/core/src/attachments/ClippingAttachment.ts index e5588691f..0c5516e75 100644 --- a/spine-ts/core/src/attachments/ClippingAttachment.ts +++ b/spine-ts/core/src/attachments/ClippingAttachment.ts @@ -33,7 +33,7 @@ module spine { endSlot: SlotData; // Nonessential. - color = new spine.Color(0.2275, 0.2275, 0.8078, 1); // ce3a3aff + color = new Color(0.2275, 0.2275, 0.8078, 1); // ce3a3aff constructor (name: string) { super(name);