UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Closes #677, closes #678. IKConstraintData.mix wasn't parsed properly in SkeletonJson. Widget has to apply skin before calculating setup pose bounds

Browse Source
This commit is contained in:
badlogic 2016-08-22 13:14:58 +02:00
parent 0423af5d48
commit 55795ac3e0
22 changed files with 4440 additions and 451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spine-ts/build/spine-all.d.ts vendored
View File

@ -756,6 +756,9 @@ declare module spine {
static newFloatArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): Float32Array | number[];
}
class DebugUtils {
static logBones(skeleton: Skeleton): void;
}
class Pool<T> {
private items;
private instantiator;

18
spine-ts/build/spine-all.js
View File

@ -2950,7 +2950,7 @@ var spine;
if (boneData == null)
throw new Error("Slot bone not found: " + boneName);
var data = new spine.SlotData(skeletonData.slots.length, slotName, boneData);
var color = slotMap.color ? slotMap.color : null;
var color = this.getValue(slotMap, "color", null);
if (color != null)
data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -2974,7 +2974,7 @@ var spine;
if (data.target == null)
throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}
}
@ -4078,6 +4078,18 @@ var spine;
return Utils;
}());
spine.Utils = Utils;
var DebugUtils = (function () {
function DebugUtils() {
}
DebugUtils.logBones = function (skeleton) {
for (var i = 0; i < skeleton.bones.length; i++) {
var bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
};
return DebugUtils;
}());
spine.DebugUtils = DebugUtils;
var Pool = (function () {
function Pool(instantiator) {
this.items = new Array(16);
@ -5747,6 +5759,7 @@ var spine;
var skeletonData = skeletonJson.readSkeletonData(assetManager.get(config.json));
var skeleton = this.skeleton = new spine.Skeleton(skeletonData);
var bounds = this.bounds;
skeleton.setSkinByName(config.skin);
skeleton.setToSetupPose();
skeleton.updateWorldTransform();
skeleton.getBounds(bounds.offset, bounds.size);
@ -5754,7 +5767,6 @@ var spine;
skeleton.x = config.x;
skeleton.y = config.y;
}
skeleton.setSkinByName(config.skin);
var animationState = this.state = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
animationState.setAnimation(0, config.animation, true);
if (config.success)

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

151
spine-ts/build/spine-core.d.ts vendored
View File

@ -1,90 +1,3 @@
declare module spine {
class AssetManager implements Disposable {
private textureLoader;
private assets;
private errors;
private toLoad;
private loaded;
constructor(textureLoader: (image: HTMLImageElement) => any);
loadText(path: string, success?: (path: string, text: string) => void, error?: (path: string, error: string) => void): void;
loadTexture(path: string, success?: (path: string, image: HTMLImageElement) => void, error?: (path: string, error: string) => void): void;
get(path: string): any;
remove(path: string): void;
removeAll(): void;
isLoadingComplete(): boolean;
getToLoad(): number;
getLoaded(): number;
dispose(): void;
hasErrors(): boolean;
getErrors(): Map<string>;
}
}
declare module spine.canvas {
class AssetManager extends spine.AssetManager {
constructor();
}
}
declare module spine {
abstract class Texture {
protected _image: HTMLImageElement;
constructor(image: HTMLImageElement);
getImage(): HTMLImageElement;
abstract setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
abstract setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
abstract dispose(): void;
static filterFromString(text: string): TextureFilter;
static wrapFromString(text: string): TextureWrap;
}
enum TextureFilter {
Nearest = 9728,
Linear = 9729,
MipMap = 9987,
MipMapNearestNearest = 9984,
MipMapLinearNearest = 9985,
MipMapNearestLinear = 9986,
MipMapLinearLinear = 9987,
}
enum TextureWrap {
MirroredRepeat = 33648,
ClampToEdge = 33071,
Repeat = 10497,
}
class TextureRegion {
renderObject: any;
u: number;
v: number;
u2: number;
v2: number;
width: number;
height: number;
rotate: boolean;
offsetX: number;
offsetY: number;
originalWidth: number;
originalHeight: number;
}
}
declare module spine.canvas {
class CanvasTexture extends Texture {
constructor(image: HTMLImageElement);
setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
dispose(): void;
}
}
declare module spine.canvas {
class SkeletonRenderer {
static QUAD_TRIANGLES: number[];
private ctx;
triangleRendering: boolean;
debugRendering: boolean;
constructor(context: CanvasRenderingContext2D);
draw(skeleton: Skeleton): void;
private drawImages(skeleton);
private drawTriangles(skeleton);
private drawTriangle(img, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2);
}
}
declare module spine {
class Animation {
name: string;
@ -321,6 +234,27 @@ declare module spine {
getMix(from: Animation, to: Animation): number;
}
}
declare module spine {
class AssetManager implements Disposable {
private textureLoader;
private assets;
private errors;
private toLoad;
private loaded;
constructor(textureLoader: (image: HTMLImageElement) => any);
loadText(path: string, success?: (path: string, text: string) => void, error?: (path: string, error: string) => void): void;
loadTexture(path: string, success?: (path: string, image: HTMLImageElement) => void, error?: (path: string, error: string) => void): void;
get(path: string): any;
remove(path: string): void;
removeAll(): void;
isLoadingComplete(): boolean;
getToLoad(): number;
getLoaded(): number;
dispose(): void;
hasErrors(): boolean;
getErrors(): Map<string>;
}
}
declare module spine {
enum BlendMode {
Normal = 0,
@ -639,6 +573,46 @@ declare module spine {
constructor(index: number, name: string, boneData: BoneData);
}
}
declare module spine {
abstract class Texture {
protected _image: HTMLImageElement;
constructor(image: HTMLImageElement);
getImage(): HTMLImageElement;
abstract setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
abstract setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
abstract dispose(): void;
static filterFromString(text: string): TextureFilter;
static wrapFromString(text: string): TextureWrap;
}
enum TextureFilter {
Nearest = 9728,
Linear = 9729,
MipMap = 9987,
MipMapNearestNearest = 9984,
MipMapLinearNearest = 9985,
MipMapNearestLinear = 9986,
MipMapLinearLinear = 9987,
}
enum TextureWrap {
MirroredRepeat = 33648,
ClampToEdge = 33071,
Repeat = 10497,
}
class TextureRegion {
renderObject: any;
u: number;
v: number;
u2: number;
v2: number;
width: number;
height: number;
rotate: boolean;
offsetX: number;
offsetY: number;
originalWidth: number;
originalHeight: number;
}
}
declare module spine {
class TextureAtlas implements Disposable {
pages: TextureAtlasPage[];
@ -756,6 +730,9 @@ declare module spine {
static newFloatArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): Float32Array | number[];
}
class DebugUtils {
static logBones(skeleton: Skeleton): void;
}
class Pool<T> {
private items;
private instantiator;

518
spine-ts/build/spine-core.js
View File

@ -1,348 +1,9 @@
var spine;
(function (spine) {
var AssetManager = (function () {
function AssetManager(textureLoader) {
this.assets = {};
this.errors = {};
this.toLoad = 0;
this.loaded = 0;
this.textureLoader = textureLoader;
}
AssetManager.prototype.loadText = function (path, success, error) {
var _this = this;
if (success === void 0) { success = null; }
if (error === void 0) { error = null; }
this.toLoad++;
var request = new XMLHttpRequest();
request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) {
if (success)
success(path, request.responseText);
_this.assets[path] = request.responseText;
}
else {
if (error)
error(path, "Couldn't load text " + path + ": status " + request.status + ", " + request.responseText);
_this.errors[path] = "Couldn't load text " + path + ": status " + request.status + ", " + request.responseText;
}
_this.toLoad--;
_this.loaded++;
}
};
request.open("GET", path, true);
request.send();
};
AssetManager.prototype.loadTexture = function (path, success, error) {
var _this = this;
if (success === void 0) { success = null; }
if (error === void 0) { error = null; }
this.toLoad++;
var img = new Image();
img.src = path;
img.onload = function (ev) {
if (success)
success(path, img);
var texture = _this.textureLoader(img);
_this.assets[path] = texture;
_this.toLoad--;
_this.loaded++;
};
img.onerror = function (ev) {
if (error)
error(path, "Couldn't load image " + path);
_this.errors[path] = "Couldn't load image " + path;
_this.toLoad--;
_this.loaded++;
};
};
AssetManager.prototype.get = function (path) {
return this.assets[path];
};
AssetManager.prototype.remove = function (path) {
var asset = this.assets[path];
if (asset.dispose)
asset.dispose();
this.assets[path] = null;
};
AssetManager.prototype.removeAll = function () {
for (var key in this.assets) {
var asset = this.assets[key];
if (asset.dispose)
asset.dispose();
}
this.assets = {};
};
AssetManager.prototype.isLoadingComplete = function () {
return this.toLoad == 0;
};
AssetManager.prototype.getToLoad = function () {
return this.toLoad;
};
AssetManager.prototype.getLoaded = function () {
return this.loaded;
};
AssetManager.prototype.dispose = function () {
this.removeAll();
};
AssetManager.prototype.hasErrors = function () {
return Object.keys(this.errors).length > 0;
};
AssetManager.prototype.getErrors = function () {
return this.errors;
};
return AssetManager;
}());
spine.AssetManager = AssetManager;
})(spine || (spine = {}));
var __extends = (this && this.__extends) || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var spine;
(function (spine) {
var canvas;
(function (canvas) {
var AssetManager = (function (_super) {
__extends(AssetManager, _super);
function AssetManager() {
_super.call(this, function (image) { return new spine.canvas.CanvasTexture(image); });
}
return AssetManager;
}(spine.AssetManager));
canvas.AssetManager = AssetManager;
})(canvas = spine.canvas || (spine.canvas = {}));
})(spine || (spine = {}));
var spine;
(function (spine) {
var Texture = (function () {
function Texture(image) {
this._image = image;
}
Texture.prototype.getImage = function () {
return this._image;
};
Texture.filterFromString = function (text) {
switch (text.toLowerCase()) {
case "nearest": return TextureFilter.Nearest;
case "linear": return TextureFilter.Linear;
case "mipmap": return TextureFilter.MipMap;
case "mipmapnearestnearest": return TextureFilter.MipMapNearestNearest;
case "mipmaplinearnearest": return TextureFilter.MipMapLinearNearest;
case "mipmapnearestlinear": return TextureFilter.MipMapNearestLinear;
case "mipmaplinearlinear": return TextureFilter.MipMapLinearLinear;
default: throw new Error("Unknown texture filter " + text);
}
};
Texture.wrapFromString = function (text) {
switch (text.toLowerCase()) {
case "mirroredtepeat": return TextureWrap.MirroredRepeat;
case "clamptoedge": return TextureWrap.ClampToEdge;
case "repeat": return TextureWrap.Repeat;
default: throw new Error("Unknown texture wrap " + text);
}
};
return Texture;
}());
spine.Texture = Texture;
(function (TextureFilter) {
TextureFilter[TextureFilter["Nearest"] = 9728] = "Nearest";
TextureFilter[TextureFilter["Linear"] = 9729] = "Linear";
TextureFilter[TextureFilter["MipMap"] = 9987] = "MipMap";
TextureFilter[TextureFilter["MipMapNearestNearest"] = 9984] = "MipMapNearestNearest";
TextureFilter[TextureFilter["MipMapLinearNearest"] = 9985] = "MipMapLinearNearest";
TextureFilter[TextureFilter["MipMapNearestLinear"] = 9986] = "MipMapNearestLinear";
TextureFilter[TextureFilter["MipMapLinearLinear"] = 9987] = "MipMapLinearLinear";
})(spine.TextureFilter || (spine.TextureFilter = {}));
var TextureFilter = spine.TextureFilter;
(function (TextureWrap) {
TextureWrap[TextureWrap["MirroredRepeat"] = 33648] = "MirroredRepeat";
TextureWrap[TextureWrap["ClampToEdge"] = 33071] = "ClampToEdge";
TextureWrap[TextureWrap["Repeat"] = 10497] = "Repeat";
})(spine.TextureWrap || (spine.TextureWrap = {}));
var TextureWrap = spine.TextureWrap;
var TextureRegion = (function () {
function TextureRegion() {
this.u = 0;
this.v = 0;
this.u2 = 0;
this.v2 = 0;
this.width = 0;
this.height = 0;
this.rotate = false;
this.offsetX = 0;
this.offsetY = 0;
this.originalWidth = 0;
this.originalHeight = 0;
}
return TextureRegion;
}());
spine.TextureRegion = TextureRegion;
})(spine || (spine = {}));
var spine;
(function (spine) {
var canvas;
(function (canvas) {
var CanvasTexture = (function (_super) {
__extends(CanvasTexture, _super);
function CanvasTexture(image) {
_super.call(this, image);
}
CanvasTexture.prototype.setFilters = function (minFilter, magFilter) { };
CanvasTexture.prototype.setWraps = function (uWrap, vWrap) { };
CanvasTexture.prototype.dispose = function () { };
return CanvasTexture;
}(spine.Texture));
canvas.CanvasTexture = CanvasTexture;
})(canvas = spine.canvas || (spine.canvas = {}));
})(spine || (spine = {}));
var spine;
(function (spine) {
var canvas;
(function (canvas) {
var SkeletonRenderer = (function () {
function SkeletonRenderer(context) {
this.triangleRendering = false;
this.debugRendering = false;
this.ctx = context;
}
SkeletonRenderer.prototype.draw = function (skeleton) {
if (this.triangleRendering)
this.drawTriangles(skeleton);
else
this.drawImages(skeleton);
};
SkeletonRenderer.prototype.drawImages = function (skeleton) {
var ctx = this.ctx;
var drawOrder = skeleton.drawOrder;
if (this.debugRendering)
ctx.strokeStyle = "green";
for (var i = 0, n = drawOrder.length; i < n; i++) {
var slot = drawOrder[i];
var attachment = slot.getAttachment();
var region = null;
var image = null;
var vertices = null;
if (attachment instanceof spine.RegionAttachment) {
var regionAttachment = attachment;
vertices = regionAttachment.updateWorldVertices(slot, false);
region = regionAttachment.region;
image = (region).texture.getImage();
}
else
continue;
var att = attachment;
var bone = slot.bone;
var x = vertices[0];
var y = vertices[1];
var rotation = (bone.getWorldRotationX() - att.rotation) * Math.PI / 180;
var xx = vertices[24] - vertices[0];
var xy = vertices[25] - vertices[1];
var yx = vertices[8] - vertices[0];
var yy = vertices[9] - vertices[1];
var w = Math.sqrt(xx * xx + xy * xy), h = -Math.sqrt(yx * yx + yy * yy);
ctx.translate(x, y);
ctx.rotate(rotation);
if (region.rotate) {
ctx.rotate(Math.PI / 2);
ctx.drawImage(image, region.x, region.y, region.height, region.width, 0, 0, h, -w);
ctx.rotate(-Math.PI / 2);
}
else {
ctx.drawImage(image, region.x, region.y, region.width, region.height, 0, 0, w, h);
}
if (this.debugRendering)
ctx.strokeRect(0, 0, w, h);
ctx.rotate(-rotation);
ctx.translate(-x, -y);
}
};
SkeletonRenderer.prototype.drawTriangles = function (skeleton) {
var blendMode = null;
var vertices = null;
var triangles = null;
var drawOrder = skeleton.drawOrder;
for (var i = 0, n = drawOrder.length; i < n; i++) {
var slot = drawOrder[i];
var attachment = slot.getAttachment();
var texture = null;
var region = null;
if (attachment instanceof spine.RegionAttachment) {
var regionAttachment = attachment;
vertices = regionAttachment.updateWorldVertices(slot, false);
triangles = SkeletonRenderer.QUAD_TRIANGLES;
region = regionAttachment.region;
texture = region.texture.getImage();
}
else if (attachment instanceof spine.MeshAttachment) {
var mesh = attachment;
vertices = mesh.updateWorldVertices(slot, false);
triangles = mesh.triangles;
texture = mesh.region.renderObject.texture.getImage();
}
else
continue;
if (texture != null) {
var slotBlendMode = slot.data.blendMode;
if (slotBlendMode != blendMode) {
blendMode = slotBlendMode;
}
var ctx = this.ctx;
for (var j = 0; j < triangles.length; j += 3) {
var t1 = triangles[j] * 8, t2 = triangles[j + 1] * 8, t3 = triangles[j + 2] * 8;
var x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];
var x1 = vertices[t2], y1 = vertices[t2 + 1], u1 = vertices[t2 + 6], v1 = vertices[t2 + 7];
var x2 = vertices[t3], y2 = vertices[t3 + 1], u2 = vertices[t3 + 6], v2 = vertices[t3 + 7];
this.drawTriangle(texture, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2);
if (this.debugRendering) {
ctx.strokeStyle = "green";
ctx.beginPath();
ctx.moveTo(x0, y0);
ctx.lineTo(x1, y1);
ctx.lineTo(x2, y2);
ctx.lineTo(x0, y0);
ctx.stroke();
}
}
}
}
};
SkeletonRenderer.prototype.drawTriangle = function (img, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2) {
var ctx = this.ctx;
u0 *= img.width;
v0 *= img.height;
u1 *= img.width;
v1 *= img.height;
u2 *= img.width;
v2 *= img.height;
ctx.beginPath();
ctx.moveTo(x0, y0);
ctx.lineTo(x1, y1);
ctx.lineTo(x2, y2);
ctx.closePath();
x1 -= x0;
y1 -= y0;
x2 -= x0;
y2 -= y0;
u1 -= u0;
v1 -= v0;
u2 -= u0;
v2 -= v0;
var det = 1 / (u1 * v2 - u2 * v1), a = (v2 * x1 - v1 * x2) * det, b = (v2 * y1 - v1 * y2) * det, c = (u1 * x2 - u2 * x1) * det, d = (u1 * y2 - u2 * y1) * det, e = x0 - a * u0 - c * v0, f = y0 - b * u0 - d * v0;
ctx.save();
ctx.transform(a, b, c, d, e, f);
ctx.clip();
ctx.drawImage(img, 0, 0);
ctx.restore();
};
SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
return SkeletonRenderer;
}());
canvas.SkeletonRenderer = SkeletonRenderer;
})(canvas = spine.canvas || (spine.canvas = {}));
})(spine || (spine = {}));
var spine;
(function (spine) {
var Animation = (function () {
function Animation(name, timelines, duration) {
@ -1326,6 +987,103 @@ var spine;
spine.AnimationStateData = AnimationStateData;
})(spine || (spine = {}));
var spine;
(function (spine) {
var AssetManager = (function () {
function AssetManager(textureLoader) {
this.assets = {};
this.errors = {};
this.toLoad = 0;
this.loaded = 0;
this.textureLoader = textureLoader;
}
AssetManager.prototype.loadText = function (path, success, error) {
var _this = this;
if (success === void 0) { success = null; }
if (error === void 0) { error = null; }
this.toLoad++;
var request = new XMLHttpRequest();
request.onreadystatechange = function () {
if (request.readyState == XMLHttpRequest.DONE) {
if (request.status >= 200 && request.status < 300) {
if (success)
success(path, request.responseText);
_this.assets[path] = request.responseText;
}
else {
if (error)
error(path, "Couldn't load text " + path + ": status " + request.status + ", " + request.responseText);
_this.errors[path] = "Couldn't load text " + path + ": status " + request.status + ", " + request.responseText;
}
_this.toLoad--;
_this.loaded++;
}
};
request.open("GET", path, true);
request.send();
};
AssetManager.prototype.loadTexture = function (path, success, error) {
var _this = this;
if (success === void 0) { success = null; }
if (error === void 0) { error = null; }
this.toLoad++;
var img = new Image();
img.src = path;
img.onload = function (ev) {
if (success)
success(path, img);
var texture = _this.textureLoader(img);
_this.assets[path] = texture;
_this.toLoad--;
_this.loaded++;
};
img.onerror = function (ev) {
if (error)
error(path, "Couldn't load image " + path);
_this.errors[path] = "Couldn't load image " + path;
_this.toLoad--;
_this.loaded++;
};
};
AssetManager.prototype.get = function (path) {
return this.assets[path];
};
AssetManager.prototype.remove = function (path) {
var asset = this.assets[path];
if (asset.dispose)
asset.dispose();
this.assets[path] = null;
};
AssetManager.prototype.removeAll = function () {
for (var key in this.assets) {
var asset = this.assets[key];
if (asset.dispose)
asset.dispose();
}
this.assets = {};
};
AssetManager.prototype.isLoadingComplete = function () {
return this.toLoad == 0;
};
AssetManager.prototype.getToLoad = function () {
return this.toLoad;
};
AssetManager.prototype.getLoaded = function () {
return this.loaded;
};
AssetManager.prototype.dispose = function () {
this.removeAll();
};
AssetManager.prototype.hasErrors = function () {
return Object.keys(this.errors).length > 0;
};
AssetManager.prototype.getErrors = function () {
return this.errors;
};
return AssetManager;
}());
spine.AssetManager = AssetManager;
})(spine || (spine = {}));
var spine;
(function (spine) {
(function (BlendMode) {
BlendMode[BlendMode["Normal"] = 0] = "Normal";
@ -2950,7 +2708,7 @@ var spine;
if (boneData == null)
throw new Error("Slot bone not found: " + boneName);
var data = new spine.SlotData(skeletonData.slots.length, slotName, boneData);
var color = slotMap.color ? slotMap.color : null;
var color = this.getValue(slotMap, "color", null);
if (color != null)
data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -2974,7 +2732,7 @@ var spine;
if (data.target == null)
throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}
}
@ -3645,6 +3403,72 @@ var spine;
spine.SlotData = SlotData;
})(spine || (spine = {}));
var spine;
(function (spine) {
var Texture = (function () {
function Texture(image) {
this._image = image;
}
Texture.prototype.getImage = function () {
return this._image;
};
Texture.filterFromString = function (text) {
switch (text.toLowerCase()) {
case "nearest": return TextureFilter.Nearest;
case "linear": return TextureFilter.Linear;
case "mipmap": return TextureFilter.MipMap;
case "mipmapnearestnearest": return TextureFilter.MipMapNearestNearest;
case "mipmaplinearnearest": return TextureFilter.MipMapLinearNearest;
case "mipmapnearestlinear": return TextureFilter.MipMapNearestLinear;
case "mipmaplinearlinear": return TextureFilter.MipMapLinearLinear;
default: throw new Error("Unknown texture filter " + text);
}
};
Texture.wrapFromString = function (text) {
switch (text.toLowerCase()) {
case "mirroredtepeat": return TextureWrap.MirroredRepeat;
case "clamptoedge": return TextureWrap.ClampToEdge;
case "repeat": return TextureWrap.Repeat;
default: throw new Error("Unknown texture wrap " + text);
}
};
return Texture;
}());
spine.Texture = Texture;
(function (TextureFilter) {
TextureFilter[TextureFilter["Nearest"] = 9728] = "Nearest";
TextureFilter[TextureFilter["Linear"] = 9729] = "Linear";
TextureFilter[TextureFilter["MipMap"] = 9987] = "MipMap";
TextureFilter[TextureFilter["MipMapNearestNearest"] = 9984] = "MipMapNearestNearest";
TextureFilter[TextureFilter["MipMapLinearNearest"] = 9985] = "MipMapLinearNearest";
TextureFilter[TextureFilter["MipMapNearestLinear"] = 9986] = "MipMapNearestLinear";
TextureFilter[TextureFilter["MipMapLinearLinear"] = 9987] = "MipMapLinearLinear";
})(spine.TextureFilter || (spine.TextureFilter = {}));
var TextureFilter = spine.TextureFilter;
(function (TextureWrap) {
TextureWrap[TextureWrap["MirroredRepeat"] = 33648] = "MirroredRepeat";
TextureWrap[TextureWrap["ClampToEdge"] = 33071] = "ClampToEdge";
TextureWrap[TextureWrap["Repeat"] = 10497] = "Repeat";
})(spine.TextureWrap || (spine.TextureWrap = {}));
var TextureWrap = spine.TextureWrap;
var TextureRegion = (function () {
function TextureRegion() {
this.u = 0;
this.v = 0;
this.u2 = 0;
this.v2 = 0;
this.width = 0;
this.height = 0;
this.rotate = false;
this.offsetX = 0;
this.offsetY = 0;
this.originalWidth = 0;
this.originalHeight = 0;
}
return TextureRegion;
}());
spine.TextureRegion = TextureRegion;
})(spine || (spine = {}));
var spine;
(function (spine) {
var TextureAtlas = (function () {
function TextureAtlas(atlasText, textureLoader) {
@ -4078,6 +3902,18 @@ var spine;
return Utils;
}());
spine.Utils = Utils;
var DebugUtils = (function () {
function DebugUtils() {
}
DebugUtils.logBones = function (skeleton) {
for (var i = 0; i < skeleton.bones.length; i++) {
var bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
};
return DebugUtils;
}());
spine.DebugUtils = DebugUtils;
var Pool = (function () {
function Pool(instantiator) {
this.items = new Array(16);

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-threejs.d.ts vendored
View File

@ -730,6 +730,9 @@ declare module spine {
static newFloatArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): Float32Array | number[];
}
class DebugUtils {
static logBones(skeleton: Skeleton): void;
}
class Pool<T> {
private items;
private instantiator;

16
spine-ts/build/spine-threejs.js
View File

@ -2708,7 +2708,7 @@ var spine;
if (boneData == null)
throw new Error("Slot bone not found: " + boneName);
var data = new spine.SlotData(skeletonData.slots.length, slotName, boneData);
var color = slotMap.color ? slotMap.color : null;
var color = this.getValue(slotMap, "color", null);
if (color != null)
data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -2732,7 +2732,7 @@ var spine;
if (data.target == null)
throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}
}
@ -3902,6 +3902,18 @@ var spine;
return Utils;
}());
spine.Utils = Utils;
var DebugUtils = (function () {
function DebugUtils() {
}
DebugUtils.logBones = function (skeleton) {
for (var i = 0; i < skeleton.bones.length; i++) {
var bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
};
return DebugUtils;
}());
spine.DebugUtils = DebugUtils;
var Pool = (function () {
function Pool(instantiator) {
this.items = new Array(16);

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-webgl.d.ts vendored
View File

@ -730,6 +730,9 @@ declare module spine {
static newFloatArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): Float32Array | number[];
}
class DebugUtils {
static logBones(skeleton: Skeleton): void;
}
class Pool<T> {
private items;
private instantiator;

16
spine-ts/build/spine-webgl.js
View File

@ -2708,7 +2708,7 @@ var spine;
if (boneData == null)
throw new Error("Slot bone not found: " + boneName);
var data = new spine.SlotData(skeletonData.slots.length, slotName, boneData);
var color = slotMap.color ? slotMap.color : null;
var color = this.getValue(slotMap, "color", null);
if (color != null)
data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -2732,7 +2732,7 @@ var spine;
if (data.target == null)
throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}
}
@ -3902,6 +3902,18 @@ var spine;
return Utils;
}());
spine.Utils = Utils;
var DebugUtils = (function () {
function DebugUtils() {
}
DebugUtils.logBones = function (skeleton) {
for (var i = 0; i < skeleton.bones.length; i++) {
var bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
};
return DebugUtils;
}());
spine.DebugUtils = DebugUtils;
var Pool = (function () {
function Pool(instantiator) {
this.items = new Array(16);

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

3
spine-ts/build/spine-widget.d.ts vendored
View File

@ -730,6 +730,9 @@ declare module spine {
static newFloatArray(size: number): ArrayLike<number>;
static toFloatArray(array: Array<number>): Float32Array | number[];
}
class DebugUtils {
static logBones(skeleton: Skeleton): void;
}
class Pool<T> {
private items;
private instantiator;

18
spine-ts/build/spine-widget.js
View File

@ -2708,7 +2708,7 @@ var spine;
if (boneData == null)
throw new Error("Slot bone not found: " + boneName);
var data = new spine.SlotData(skeletonData.slots.length, slotName, boneData);
var color = slotMap.color ? slotMap.color : null;
var color = this.getValue(slotMap, "color", null);
if (color != null)
data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -2732,7 +2732,7 @@ var spine;
if (data.target == null)
throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}
}
@ -3902,6 +3902,18 @@ var spine;
return Utils;
}());
spine.Utils = Utils;
var DebugUtils = (function () {
function DebugUtils() {
}
DebugUtils.logBones = function (skeleton) {
for (var i = 0; i < skeleton.bones.length; i++) {
var bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
};
return DebugUtils;
}());
spine.DebugUtils = DebugUtils;
var Pool = (function () {
function Pool(instantiator) {
this.items = new Array(16);
@ -5326,6 +5338,7 @@ var spine;
var skeletonData = skeletonJson.readSkeletonData(assetManager.get(config.json));
var skeleton = this.skeleton = new spine.Skeleton(skeletonData);
var bounds = this.bounds;
skeleton.setSkinByName(config.skin);
skeleton.setToSetupPose();
skeleton.updateWorldTransform();
skeleton.getBounds(bounds.offset, bounds.size);
@ -5333,7 +5346,6 @@ var spine;
skeleton.x = config.x;
skeleton.y = config.y;
}
skeleton.setSkinByName(config.skin);
var animationState = this.state = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
animationState.setAnimation(0, config.animation, true);
if (config.success)

2
spine-ts/build/spine-widget.js.map
View File

File diff suppressed because one or more lines are too long

4
spine-ts/core/src/SkeletonJson.ts
View File

@ -91,7 +91,7 @@ module spine {
if (boneData == null) throw new Error("Slot bone not found: " + boneName);
let data = new SlotData(skeletonData.slots.length, slotName, boneData);
let color: string = slotMap.color ? slotMap.color : null;
let color: string = this.getValue(slotMap, "color", null);
if (color != null) data.color.setFromString(color);
data.attachmentName = this.getValue(slotMap, "attachment", null);
@ -118,7 +118,7 @@ module spine {
if (data.target == null) throw new Error("IK target bone not found: " + targetName);
data.bendDirection = this.getValue(constraintMap, "bendPositive", true) ? 1 : -1;
data.mix = constraintMap.mix ? constraintMap.mix : 1;
data.mix = this.getValue(constraintMap, "mix", 1);
skeletonData.ikConstraints.push(data);
}

9
spine-ts/core/src/Utils.ts
View File

@ -160,6 +160,15 @@ module spine {
}
}
export class DebugUtils {
static logBones(skeleton: Skeleton) {
for (let i = 0; i < skeleton.bones.length; i++) {
let bone = skeleton.bones[i];
console.log(bone.data.name + ", " + bone.a + ", " + bone.b + ", " + bone.c + ", " + bone.d + ", " + bone.worldX + ", " + bone.worldY);
}
}
}
export class Pool<T> {
private items = new Array<T>(16);
private instantiator: () => T;

146
spine-ts/webgl/example/assets/hero-mesh.atlas Normal file
View File

@ -0,0 +1,146 @@
hero-mesh.png
size: 512,512
format: RGBA8888
filter: Linear,Linear
repeat: none
body
rotate: false
xy: 2, 78
size: 97, 95
orig: 97, 95
offset: 0, 0
index: -1
cape
rotate: false
xy: 2, 175
size: 146, 159
orig: 146, 159
offset: 0, 0
index: -1
eyes
rotate: false
xy: 176, 350
size: 82, 31
orig: 82, 31
offset: 0, 0
index: -1
fingers
rotate: false
xy: 102, 43
size: 31, 33
orig: 31, 33
offset: 0, 0
index: -1
foot1
rotate: false
xy: 315, 340
size: 50, 42
orig: 50, 42
offset: 0, 0
index: -1
foot2
rotate: false
xy: 260, 343
size: 53, 38
orig: 53, 38
offset: 0, 0
index: -1
forearm1
rotate: false
xy: 367, 389
size: 41, 49
orig: 41, 49
offset: 0, 0
index: -1
forearm2
rotate: false
xy: 410, 412
size: 31, 32
orig: 31, 32
offset: 0, 0
index: -1
hand1
rotate: false
xy: 367, 339
size: 37, 48
orig: 37, 48
offset: 0, 0
index: -1
hand2
rotate: false
xy: 101, 78
size: 31, 37
orig: 31, 37
offset: 0, 0
index: -1
head
rotate: false
xy: 2, 336
size: 172, 173
orig: 172, 173
offset: 0, 0
index: -1
mantles
rotate: false
xy: 176, 383
size: 136, 55
orig: 136, 55
offset: 0, 0
index: -1
mouth
rotate: false
xy: 176, 335
size: 61, 13
orig: 61, 13
offset: 0, 0
index: -1
shin1
rotate: false
xy: 456, 452
size: 53, 57
orig: 53, 57
offset: 0, 0
index: -1
shin2
rotate: false
xy: 314, 384
size: 51, 54
orig: 51, 54
offset: 0, 0
index: -1
sword
rotate: false
xy: 176, 440
size: 216, 69
orig: 216, 69
offset: 0, 0
index: -1
thigh1
rotate: false
xy: 394, 446
size: 60, 63
orig: 60, 63
offset: 0, 0
index: -1
thigh2
rotate: false
xy: 2, 12
size: 57, 64
orig: 57, 64
offset: 0, 0
index: -1
upperarm1
rotate: false
xy: 101, 117
size: 50, 56
orig: 50, 56
offset: 0, 0
index: -1
upperarm2
rotate: false
xy: 61, 17
size: 39, 59
orig: 39, 59
offset: 0, 0
index: -1

3958
spine-ts/webgl/example/assets/hero-mesh.json Normal file
View File

File diff suppressed because it is too large Load Diff

BIN
spine-ts/webgl/example/assets/hero-mesh.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 125 KiB

11
spine-ts/webgl/example/index.html
View File

@ -27,7 +27,7 @@ var mvp = new spine.webgl.Matrix4();
var assetManager;
var skeletonRenderer;
var skeletons = {};
var activeSkeleton = "spineboy";
var activeSkeleton = "bunny";
function init () {
// Setup canvas and WebGL context. We pass alpha: false to canvas.getContext() so we don't use premultiplied alpha when
@ -62,6 +62,9 @@ function init () {
assetManager.loadText("assets/vine.json");
assetManager.loadText("assets/vine.atlas");
assetManager.loadTexture("assets/vine.png");
assetManager.loadText("assets/hero-mesh.json");
assetManager.loadText("assets/hero-mesh.atlas");
assetManager.loadTexture("assets/hero-mesh.png");
requestAnimationFrame(load);
}
@ -73,6 +76,7 @@ function load () {
skeletons["tank"] = loadSkeleton("tank", "drive", false);
skeletons["goblins"] = loadSkeleton("goblins-mesh", "walk", true, "goblin");
skeletons["vine"] = loadSkeleton("vine", "animation", false);
skeletons["hero-mesh"] = loadSkeleton("hero-mesh", "Headturn", false);
setupUI();
requestAnimationFrame(render);
} else {
@ -98,8 +102,8 @@ function loadSkeleton (name, initialAnimation, premultipliedAlpha, skin) {
// Set the scale to apply during parsing, parse the file, and create a new skeleton.
var skeletonData = skeletonJson.readSkeletonData(assetManager.get("assets/" + name + ".json"));
var skeleton = new spine.Skeleton(skeletonData);
var bounds = calculateBounds(skeleton);
skeleton.setSkinByName(skin);
var bounds = calculateBounds(skeleton);
// Create an AnimationState, and set the initial animation in looping mode.
var animationState = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
@ -159,8 +163,7 @@ function setupUI () {
var skeleton = skeletons[activeSkeleton].skeleton;
var animationName = $("#animationList option:selected").text();
skeleton.setToSetupPose();
state.setAnimation(0, animationName, true);
scaleAndCenter(skeleton);
state.setAnimation(0, animationName, true);
})
}

4
spine-ts/widget/src/Widget.ts
View File

@ -127,14 +127,14 @@ module spine {
var skeletonData = skeletonJson.readSkeletonData(assetManager.get(config.json) as string);
var skeleton = this.skeleton = new spine.Skeleton(skeletonData);
var bounds = this.bounds;
skeleton.setSkinByName(config.skin);
skeleton.setToSetupPose();
skeleton.updateWorldTransform();
skeleton.getBounds(bounds.offset, bounds.size);
if (!config.fitToCanvas) {
skeleton.x = config.x;
skeleton.y = config.y;
}
skeleton.setSkinByName(config.skin);
}
var animationState = this.state = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
animationState.setAnimation(0, config.animation, true);