UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Formatting.

Browse Source
This commit is contained in:
Mario Zechner 2021-09-18 23:14:07 +02:00
parent 52b9d236a1
commit 02e334942b
3 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
spine-ts/spine-core/src/AssetManagerBase.ts
View File

@ -40,36 +40,36 @@ export class AssetManagerBase implements Disposable {
private toLoad = 0; private toLoad = 0;
private loaded = 0; private loaded = 0;
constructor(textureLoader: (image: HTMLImageElement | ImageBitmap) => Texture, pathPrefix: string = "", downloader: Downloader = null) { constructor (textureLoader: (image: HTMLImageElement | ImageBitmap) => Texture, pathPrefix: string = "", downloader: Downloader = null) {
this.textureLoader = textureLoader; this.textureLoader = textureLoader;
this.pathPrefix = pathPrefix; this.pathPrefix = pathPrefix;
this.downloader = downloader || new Downloader(); this.downloader = downloader || new Downloader();
} }
private start(path: string): string { private start (path: string): string {
this.toLoad++; this.toLoad++;
return this.pathPrefix + path; return this.pathPrefix + path;
} }
private success(callback: (path: string, data: any) => void, path: string, asset: any) { private success (callback: (path: string, data: any) => void, path: string, asset: any) {
this.toLoad--; this.toLoad--;
this.loaded++; this.loaded++;
this.assets[path] = asset; this.assets[path] = asset;
if (callback) callback(path, asset); if (callback) callback(path, asset);
} }
private error(callback: (path: string, message: string) => void, path: string, message: string) { private error (callback: (path: string, message: string) => void, path: string, message: string) {
this.toLoad--; this.toLoad--;
this.loaded++; this.loaded++;
this.errors[path] = message; this.errors[path] = message;
if (callback) callback(path, message); if (callback) callback(path, message);
} }
setRawDataURI(path: string, data: string) { setRawDataURI (path: string, data: string) {
this.downloader.rawDataUris[this.pathPrefix + path] = data; this.downloader.rawDataUris[this.pathPrefix + path] = data;
} }
loadBinary(path: string, loadBinary (path: string,
success: (path: string, binary: Uint8Array) => void = null, success: (path: string, binary: Uint8Array) => void = null,
error: (path: string, message: string) => void = null) { error: (path: string, message: string) => void = null) {
path = this.start(path); path = this.start(path);
@ -81,7 +81,7 @@ export class AssetManagerBase implements Disposable {
}); });
} }
loadText(path: string, loadText (path: string,
success: (path: string, text: string) => void = null, success: (path: string, text: string) => void = null,
error: (path: string, message: string) => void = null) { error: (path: string, message: string) => void = null) {
path = this.start(path); path = this.start(path);
@ -93,7 +93,7 @@ export class AssetManagerBase implements Disposable {
}); });
} }
loadJson(path: string, loadJson (path: string,
success: (path: string, object: object) => void = null, success: (path: string, object: object) => void = null,
error: (path: string, message: string) => void = null) { error: (path: string, message: string) => void = null) {
path = this.start(path); path = this.start(path);
@ -105,7 +105,7 @@ export class AssetManagerBase implements Disposable {
}); });
} }
loadTexture(path: string, loadTexture (path: string,
success: (path: string, texture: Texture) => void = null, success: (path: string, texture: Texture) => void = null,
error: (path: string, message: string) => void = null) { error: (path: string, message: string) => void = null) {
path = this.start(path); path = this.start(path);
@ -136,7 +136,7 @@ export class AssetManagerBase implements Disposable {
} }
} }
loadTextureAtlas(path: string, loadTextureAtlas (path: string,
success: (path: string, atlas: TextureAtlas) => void = null, success: (path: string, atlas: TextureAtlas) => void = null,
error: (path: string, message: string) => void = null error: (path: string, message: string) => void = null
) { ) {
@ -170,11 +170,11 @@ export class AssetManagerBase implements Disposable {
}); });
} }
get(path: string) { get (path: string) {
return this.assets[this.pathPrefix + path]; return this.assets[this.pathPrefix + path];
} }
require(path: string) { require (path: string) {
path = this.pathPrefix + path; path = this.pathPrefix + path;
let asset = this.assets[path]; let asset = this.assets[path];
if (asset) return asset; if (asset) return asset;
@ -182,7 +182,7 @@ export class AssetManagerBase implements Disposable {
throw Error("Asset not found: " + path + (error ? "\n" + error : "")); throw Error("Asset not found: " + path + (error ? "\n" + error : ""));
} }
remove(path: string) { remove (path: string) {
path = this.pathPrefix + path; path = this.pathPrefix + path;
let asset = this.assets[path]; let asset = this.assets[path];
if ((<any>asset).dispose) (<any>asset).dispose(); if ((<any>asset).dispose) (<any>asset).dispose();
@ -190,7 +190,7 @@ export class AssetManagerBase implements Disposable {
return asset; return asset;
} }
removeAll() { removeAll () {
for (let key in this.assets) { for (let key in this.assets) {
let asset = this.assets[key]; let asset = this.assets[key];
if ((<any>asset).dispose) (<any>asset).dispose(); if ((<any>asset).dispose) (<any>asset).dispose();
@ -198,27 +198,27 @@ export class AssetManagerBase implements Disposable {
this.assets = {}; this.assets = {};
} }
isLoadingComplete(): boolean { isLoadingComplete (): boolean {
return this.toLoad == 0; return this.toLoad == 0;
} }
getToLoad(): number { getToLoad (): number {
return this.toLoad; return this.toLoad;
} }
getLoaded(): number { getLoaded (): number {
return this.loaded; return this.loaded;
} }
dispose() { dispose () {
this.removeAll(); this.removeAll();
} }
hasErrors() { hasErrors () {
return Object.keys(this.errors).length > 0; return Object.keys(this.errors).length > 0;
} }
getErrors() { getErrors () {
return this.errors; return this.errors;
} }
} }
@ -227,7 +227,7 @@ export class Downloader {
private callbacks: StringMap<Array<Function>> = {}; private callbacks: StringMap<Array<Function>> = {};
rawDataUris: StringMap<string> = {}; rawDataUris: StringMap<string> = {};
dataUriToString(dataUri: string) { dataUriToString (dataUri: string) {
if (!dataUri.startsWith("data:")) { if (!dataUri.startsWith("data:")) {
throw new Error("Not a data URI."); throw new Error("Not a data URI.");
} }
@ -241,7 +241,7 @@ export class Downloader {
} }
} }
base64ToUint8Array(base64: string) { base64ToUint8Array (base64: string) {
var binary_string = window.atob(base64); var binary_string = window.atob(base64);
var len = binary_string.length; var len = binary_string.length;
var bytes = new Uint8Array(len); var bytes = new Uint8Array(len);
@ -251,7 +251,7 @@ export class Downloader {
return bytes; return bytes;
} }
dataUriToUint8Array(dataUri: string) { dataUriToUint8Array (dataUri: string) {
if (!dataUri.startsWith("data:")) { if (!dataUri.startsWith("data:")) {
throw new Error("Not a data URI."); throw new Error("Not a data URI.");
} }
@ -262,7 +262,7 @@ export class Downloader {
return this.base64ToUint8Array(dataUri.substr(base64Idx)); return this.base64ToUint8Array(dataUri.substr(base64Idx));
} }
downloadText(url: string, success: (data: string) => void, error: (status: number, responseText: string) => void) { downloadText (url: string, success: (data: string) => void, error: (status: number, responseText: string) => void) {
if (this.start(url, success, error)) return; if (this.start(url, success, error)) return;
if (this.rawDataUris[url]) { if (this.rawDataUris[url]) {
try { try {
@ -284,13 +284,13 @@ export class Downloader {
request.send(); request.send();
} }
downloadJson(url: string, success: (data: object) => void, error: (status: number, responseText: string) => void) { downloadJson (url: string, success: (data: object) => void, error: (status: number, responseText: string) => void) {
this.downloadText(url, (data: string): void => { this.downloadText(url, (data: string): void => {
success(JSON.parse(data)); success(JSON.parse(data));
}, error); }, error);
} }
downloadBinary(url: string, success: (data: Uint8Array) => void, error: (status: number, responseText: string) => void) { downloadBinary (url: string, success: (data: Uint8Array) => void, error: (status: number, responseText: string) => void) {
if (this.start(url, success, error)) return; if (this.start(url, success, error)) return;
if (this.rawDataUris[url]) { if (this.rawDataUris[url]) {
try { try {
@ -317,7 +317,7 @@ export class Downloader {
request.send(); request.send();
} }
private start(url: string, success: any, error: any) { private start (url: string, success: any, error: any) {
let callbacks = this.callbacks[url]; let callbacks = this.callbacks[url];
try { try {
if (callbacks) return true; if (callbacks) return true;
@ -327,7 +327,7 @@ export class Downloader {
} }
} }
private finish(url: string, status: number, data: any) { private finish (url: string, status: number, data: any) {
let callbacks = this.callbacks[url]; let callbacks = this.callbacks[url];
delete this.callbacks[url]; delete this.callbacks[url];
let args = status == 200 ? [data] : [status, data]; let args = status == 200 ? [data] : [status, data];

128
spine-ts/spine-webgl/src/CameraController.ts
View File

@ -31,69 +31,69 @@ import { Input, Vector3 } from "src";
import { OrthoCamera } from "./Camera"; import { OrthoCamera } from "./Camera";
export class CameraController { export class CameraController {
constructor (public canvas: HTMLElement, public camera: OrthoCamera) { constructor (public canvas: HTMLElement, public camera: OrthoCamera) {
let cameraX = 0, cameraY = 0, cameraZoom = 0; let cameraX = 0, cameraY = 0, cameraZoom = 0;
let mouseX = 0, mouseY = 0; let mouseX = 0, mouseY = 0;
let lastX = 0, lastY = 0; let lastX = 0, lastY = 0;
let initialZoom = 0; let initialZoom = 0;
new Input(canvas).addListener({ new Input(canvas).addListener({
down: (x: number, y: number) => { down: (x: number, y: number) => {
console.log(`Down ${x.toFixed(0)} ${y.toFixed(0)}`); console.log(`Down ${x.toFixed(0)} ${y.toFixed(0)}`);
cameraX = camera.position.x; cameraX = camera.position.x;
cameraY = camera.position.y; cameraY = camera.position.y;
mouseX = lastX = x; mouseX = lastX = x;
mouseY = lastY = y; mouseY = lastY = y;
initialZoom = camera.zoom; initialZoom = camera.zoom;
}, },
dragged: (x: number, y: number) => { dragged: (x: number, y: number) => {
console.log(`Dragged ${x.toFixed(0)} ${y.toFixed(0)}`); console.log(`Dragged ${x.toFixed(0)} ${y.toFixed(0)}`);
let deltaX = x - mouseX; let deltaX = x - mouseX;
let deltaY = y - mouseY; let deltaY = y - mouseY;
let originWorld = camera.screenToWorld(new Vector3(0, 0), canvas.clientWidth, canvas.clientHeight); let originWorld = camera.screenToWorld(new Vector3(0, 0), canvas.clientWidth, canvas.clientHeight);
let deltaWorld = camera.screenToWorld(new Vector3(deltaX, deltaY), canvas.clientWidth, canvas.clientHeight).sub(originWorld); let deltaWorld = camera.screenToWorld(new Vector3(deltaX, deltaY), canvas.clientWidth, canvas.clientHeight).sub(originWorld);
camera.position.set(cameraX - deltaWorld.x, cameraY - deltaWorld.y, 0); camera.position.set(cameraX - deltaWorld.x, cameraY - deltaWorld.y, 0);
camera.update(); camera.update();
lastX = x; lastX = x;
lastY = y; lastY = y;
}, },
wheel: (delta: number) => { wheel: (delta: number) => {
let zoomAmount = delta / 200 * camera.zoom; let zoomAmount = delta / 200 * camera.zoom;
let newZoom = camera.zoom + zoomAmount; let newZoom = camera.zoom + zoomAmount;
if (newZoom > 0) { if (newZoom > 0) {
let x = 0, y = 0; let x = 0, y = 0;
if (delta < 0) { if (delta < 0) {
x = lastX; y = lastY; x = lastX; y = lastY;
} else { } else {
let viewCenter = new Vector3(canvas.clientWidth / 2 + 15, canvas.clientHeight / 2); let viewCenter = new Vector3(canvas.clientWidth / 2 + 15, canvas.clientHeight / 2);
let mouseToCenterX = lastX - viewCenter.x; let mouseToCenterX = lastX - viewCenter.x;
let mouseToCenterY = canvas.clientHeight - 1 - lastY - viewCenter.y; let mouseToCenterY = canvas.clientHeight - 1 - lastY - viewCenter.y;
x = viewCenter.x - mouseToCenterX; x = viewCenter.x - mouseToCenterX;
y = canvas.clientHeight - 1 - viewCenter.y + mouseToCenterY; y = canvas.clientHeight - 1 - viewCenter.y + mouseToCenterY;
} }
let oldDistance = camera.screenToWorld(new Vector3(x, y), canvas.clientWidth, canvas.clientHeight); let oldDistance = camera.screenToWorld(new Vector3(x, y), canvas.clientWidth, canvas.clientHeight);
camera.zoom = newZoom; camera.zoom = newZoom;
camera.update(); camera.update();
let newDistance = camera.screenToWorld(new Vector3(x, y), canvas.clientWidth, canvas.clientHeight); let newDistance = camera.screenToWorld(new Vector3(x, y), canvas.clientWidth, canvas.clientHeight);
camera.position.add(oldDistance.sub(newDistance)); camera.position.add(oldDistance.sub(newDistance));
camera.update(); camera.update();
} }
}, },
zoom: (initialDistance, distance) => { zoom: (initialDistance, distance) => {
let newZoom = initialDistance / distance; let newZoom = initialDistance / distance;
console.log(`${newZoom}, ${initialDistance}, ${distance}`); console.log(`${newZoom}, ${initialDistance}, ${distance}`);
camera.zoom = initialZoom * newZoom; camera.zoom = initialZoom * newZoom;
console.log(`zoom ${newZoom}`); console.log(`zoom ${newZoom}`);
}, },
up: (x: number, y: number) => { up: (x: number, y: number) => {
console.log(`Up ${x.toFixed(0)} ${y.toFixed(0)}`); console.log(`Up ${x.toFixed(0)} ${y.toFixed(0)}`);
lastX = x; lastX = x;
lastY = y; lastY = y;
}, },
moved: (x: number, y: number) => { moved: (x: number, y: number) => {
lastX = x; lastX = x;
lastY = y; lastY = y;
}, },
}); });
} }
} }

6
spine-ts/spine-webgl/src/Input.ts
View File

@ -44,7 +44,7 @@ export class Input {
this.setupCallbacks(element); this.setupCallbacks(element);
} }
private setupCallbacks(element: HTMLElement) { private setupCallbacks (element: HTMLElement) {
let mouseDown = (ev: UIEvent) => { let mouseDown = (ev: UIEvent) => {
if (ev instanceof MouseEvent) { if (ev instanceof MouseEvent) {
let rect = element.getBoundingClientRect(); let rect = element.getBoundingClientRect();
@ -196,11 +196,11 @@ export class Input {
element.addEventListener("touchcancel", touchEnd); element.addEventListener("touchcancel", touchEnd);
} }
addListener(listener: InputListener) { addListener (listener: InputListener) {
this.listeners.push(listener); this.listeners.push(listener);
} }
removeListener(listener: InputListener) { removeListener (listener: InputListener) {
let idx = this.listeners.indexOf(listener); let idx = this.listeners.indexOf(listener);
if (idx > -1) { if (idx > -1) {
this.listeners.splice(idx, 1); this.listeners.splice(idx, 1);