mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch '3.7-beta' of https://github.com/esotericsoftware/spine-runtimes into 3.7-beta
This commit is contained in:
commit
705d959dd8
Binary file not shown.
@ -132,7 +132,8 @@ package spine.animation {
|
|||||||
|
|
||||||
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
||||||
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
queue.end(from);
|
queue.end(from);
|
||||||
|
|||||||
@ -312,7 +312,8 @@ int /*boolean*/ _spAnimationState_updateMixingFrom (spAnimationState* self, spTr
|
|||||||
|
|
||||||
/* Require mixTime > 0 to ensure the mixing from entry was applied at least once. */
|
/* Require mixTime > 0 to ensure the mixing from entry was applied at least once. */
|
||||||
if (to->mixTime > 0 && (to->mixTime >= to->mixDuration || to->timeScale == 0)) {
|
if (to->mixTime > 0 && (to->mixTime >= to->mixDuration || to->timeScale == 0)) {
|
||||||
if (from->totalAlpha == 0) {
|
/* Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame). */
|
||||||
|
if (from->totalAlpha == 0 || to->mixDuration == 0) {
|
||||||
to->mixingFrom = from->mixingFrom;
|
to->mixingFrom = from->mixingFrom;
|
||||||
to->interruptAlpha = from->interruptAlpha;
|
to->interruptAlpha = from->interruptAlpha;
|
||||||
_spEventQueue_end(internal->queue, from);
|
_spEventQueue_end(internal->queue, from);
|
||||||
|
|||||||
@ -346,7 +346,8 @@ function AnimationState:updateMixingFrom (to, delta)
|
|||||||
|
|
||||||
-- Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
-- Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
||||||
if (to.mixTime > 0 and (to.mixTime >= to.mixDuration or to.timeScale == 0)) then
|
if (to.mixTime > 0 and (to.mixTime >= to.mixDuration or to.timeScale == 0)) then
|
||||||
if (from.totalAlpha == 0) then
|
-- Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
||||||
|
if (from.totalAlpha == 0 or to.mixDuration == 0) then
|
||||||
to.mixingFrom = from.mixingFrom
|
to.mixingFrom = from.mixingFrom
|
||||||
to.interruptAlpha = from.interruptAlpha
|
to.interruptAlpha = from.interruptAlpha
|
||||||
self.queue:_end(from)
|
self.queue:_end(from)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
4
spine-ts/build/spine-all.d.ts
vendored
4
spine-ts/build/spine-all.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
spine-ts/build/spine-canvas.d.ts
vendored
4
spine-ts/build/spine-canvas.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
spine-ts/build/spine-core.d.ts
vendored
4
spine-ts/build/spine-core.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
spine-ts/build/spine-threejs.d.ts
vendored
4
spine-ts/build/spine-threejs.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
spine-ts/build/spine-webgl.d.ts
vendored
4
spine-ts/build/spine-webgl.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
4
spine-ts/build/spine-widget.d.ts
vendored
4
spine-ts/build/spine-widget.d.ts
vendored
@ -585,6 +585,9 @@ declare module spine {
|
|||||||
ChainScale = 2,
|
ChainScale = 2,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
interface Math {
|
||||||
|
fround(n: number): number;
|
||||||
|
}
|
||||||
declare module spine {
|
declare module spine {
|
||||||
class SharedAssetManager implements Disposable {
|
class SharedAssetManager implements Disposable {
|
||||||
private pathPrefix;
|
private pathPrefix;
|
||||||
@ -987,6 +990,7 @@ declare module spine {
|
|||||||
static newFloatArray(size: number): ArrayLike<number>;
|
static newFloatArray(size: number): ArrayLike<number>;
|
||||||
static newShortArray(size: number): ArrayLike<number>;
|
static newShortArray(size: number): ArrayLike<number>;
|
||||||
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
static toFloatArray(array: Array<number>): number[] | Float32Array;
|
||||||
|
static toSinglePrecision(value: number): number;
|
||||||
}
|
}
|
||||||
class DebugUtils {
|
class DebugUtils {
|
||||||
static logBones(skeleton: Skeleton): void;
|
static logBones(skeleton: Skeleton): void;
|
||||||
|
|||||||
@ -1216,7 +1216,7 @@ var spine;
|
|||||||
return true;
|
return true;
|
||||||
var finished = this.updateMixingFrom(from, delta);
|
var finished = this.updateMixingFrom(from, delta);
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
@ -2974,6 +2974,15 @@ var spine;
|
|||||||
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
RotateMode[RotateMode["ChainScale"] = 2] = "ChainScale";
|
||||||
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
})(RotateMode = spine.RotateMode || (spine.RotateMode = {}));
|
||||||
})(spine || (spine = {}));
|
})(spine || (spine = {}));
|
||||||
|
(function () {
|
||||||
|
if (!Math.fround) {
|
||||||
|
Math.fround = (function (array) {
|
||||||
|
return function (x) {
|
||||||
|
return array[0] = x, array[0];
|
||||||
|
};
|
||||||
|
})(new Float32Array(1));
|
||||||
|
}
|
||||||
|
})();
|
||||||
var spine;
|
var spine;
|
||||||
(function (spine) {
|
(function (spine) {
|
||||||
var Assets = (function () {
|
var Assets = (function () {
|
||||||
@ -4745,7 +4754,7 @@ var spine;
|
|||||||
var eventData = skeletonData.findEvent(eventMap.name);
|
var eventData = skeletonData.findEvent(eventMap.name);
|
||||||
if (eventData == null)
|
if (eventData == null)
|
||||||
throw new Error("Event not found: " + eventMap.name);
|
throw new Error("Event not found: " + eventMap.name);
|
||||||
var event_5 = new spine.Event(eventMap.time, eventData);
|
var event_5 = new spine.Event(spine.Utils.toSinglePrecision(eventMap.time), eventData);
|
||||||
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
event_5.intValue = this.getValue(eventMap, "int", eventData.intValue);
|
||||||
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
event_5.floatValue = this.getValue(eventMap, "float", eventData.floatValue);
|
||||||
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
event_5.stringValue = this.getValue(eventMap, "string", eventData.stringValue);
|
||||||
@ -5879,6 +5888,9 @@ var spine;
|
|||||||
Utils.toFloatArray = function (array) {
|
Utils.toFloatArray = function (array) {
|
||||||
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
return Utils.SUPPORTS_TYPED_ARRAYS ? new Float32Array(array) : array;
|
||||||
};
|
};
|
||||||
|
Utils.toSinglePrecision = function (value) {
|
||||||
|
return Utils.SUPPORTS_TYPED_ARRAYS ? Math.fround(value) : value;
|
||||||
|
};
|
||||||
return Utils;
|
return Utils;
|
||||||
}());
|
}());
|
||||||
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
Utils.SUPPORTS_TYPED_ARRAYS = typeof (Float32Array) !== "undefined";
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -116,7 +116,8 @@ module spine {
|
|||||||
|
|
||||||
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
|
||||||
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
|
||||||
if (from.totalAlpha == 0) {
|
// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
|
||||||
|
if (from.totalAlpha == 0 || to.mixDuration == 0) {
|
||||||
to.mixingFrom = from.mixingFrom;
|
to.mixingFrom = from.mixingFrom;
|
||||||
to.interruptAlpha = from.interruptAlpha;
|
to.interruptAlpha = from.interruptAlpha;
|
||||||
this.queue.end(from);
|
this.queue.end(from);
|
||||||
|
|||||||
@ -170,7 +170,7 @@ namespace Spine.Unity.Editor {
|
|||||||
#if NO_PREFAB_MESH
|
#if NO_PREFAB_MESH
|
||||||
if (isInspectingPrefab) {
|
if (isInspectingPrefab) {
|
||||||
MeshFilter meshFilter = component.GetComponent<MeshFilter>();
|
MeshFilter meshFilter = component.GetComponent<MeshFilter>();
|
||||||
if (meshFilter != null)
|
if (meshFilter != null && meshFilter.sharedMesh != null)
|
||||||
meshFilter.sharedMesh = null;
|
meshFilter.sharedMesh = null;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@ -211,7 +211,7 @@ namespace Spine.Unity.Editor {
|
|||||||
#if NO_PREFAB_MESH
|
#if NO_PREFAB_MESH
|
||||||
if (isInspectingPrefab) {
|
if (isInspectingPrefab) {
|
||||||
MeshFilter meshFilter = component.GetComponent<MeshFilter>();
|
MeshFilter meshFilter = component.GetComponent<MeshFilter>();
|
||||||
if (meshFilter != null)
|
if (meshFilter != null && meshFilter.sharedMesh != null)
|
||||||
meshFilter.sharedMesh = null;
|
meshFilter.sharedMesh = null;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -726,16 +726,16 @@ namespace Spine.Unity.Modules.AttachmentTools {
|
|||||||
|
|
||||||
/// <summary>Adds an attachment to the skin for the specified slot index and name. If the name already exists for the slot, the previous value is replaced.</summary>
|
/// <summary>Adds an attachment to the skin for the specified slot index and name. If the name already exists for the slot, the previous value is replaced.</summary>
|
||||||
public static void SetAttachment (this Skin skin, string slotName, string keyName, Attachment attachment, Skeleton skeleton) {
|
public static void SetAttachment (this Skin skin, string slotName, string keyName, Attachment attachment, Skeleton skeleton) {
|
||||||
int slotIndex = skeleton.FindSlotIndex(slotName);
|
|
||||||
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
||||||
|
int slotIndex = skeleton.FindSlotIndex(slotName);
|
||||||
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
||||||
skin.AddAttachment(slotIndex, keyName, attachment);
|
skin.AddAttachment(slotIndex, keyName, attachment);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>Gets an attachment from the skin for the specified slot index and name.</summary>
|
/// <summary>Gets an attachment from the skin for the specified slot index and name.</summary>
|
||||||
public static Attachment GetAttachment (this Skin skin, string slotName, string keyName, Skeleton skeleton) {
|
public static Attachment GetAttachment (this Skin skin, string slotName, string keyName, Skeleton skeleton) {
|
||||||
int slotIndex = skeleton.FindSlotIndex(slotName);
|
|
||||||
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
||||||
|
int slotIndex = skeleton.FindSlotIndex(slotName);
|
||||||
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
||||||
return skin.GetAttachment(slotIndex, keyName);
|
return skin.GetAttachment(slotIndex, keyName);
|
||||||
}
|
}
|
||||||
@ -747,8 +747,8 @@ namespace Spine.Unity.Modules.AttachmentTools {
|
|||||||
|
|
||||||
/// <summary>Removes the attachment. Returns true if the element is successfully found and removed; otherwise, false.</summary>
|
/// <summary>Removes the attachment. Returns true if the element is successfully found and removed; otherwise, false.</summary>
|
||||||
public static bool RemoveAttachment (this Skin skin, string slotName, string keyName, Skeleton skeleton) {
|
public static bool RemoveAttachment (this Skin skin, string slotName, string keyName, Skeleton skeleton) {
|
||||||
int slotIndex = skeleton.FindSlotIndex(slotName);
|
|
||||||
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
if (skeleton == null) throw new System.ArgumentNullException("skeleton", "skeleton cannot be null.");
|
||||||
|
int slotIndex = skeleton.FindSlotIndex(slotName);
|
||||||
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
if (slotIndex == -1) throw new System.ArgumentException(string.Format("Slot '{0}' does not exist in skeleton.", slotName), "slotName");
|
||||||
return skin.RemoveAttachment(slotIndex, keyName);
|
return skin.RemoveAttachment(slotIndex, keyName);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -72,6 +72,14 @@ namespace Spine.Unity.Modules {
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Runtime Instantiation
|
#region Runtime Instantiation
|
||||||
|
/// <summary>Adds a SkeletonRenderSeparator and child SkeletonPartsRenderer GameObjects to a given SkeletonRenderer.</summary>
|
||||||
|
/// <returns>The to skeleton renderer.</returns>
|
||||||
|
/// <param name="skeletonRenderer">The target SkeletonRenderer or SkeletonAnimation.</param>
|
||||||
|
/// <param name="sortingLayerID">Sorting layer to be used for the parts renderers.</param>
|
||||||
|
/// <param name="extraPartsRenderers">Number of additional SkeletonPartsRenderers on top of the ones determined by counting the number of separator slots.</param>
|
||||||
|
/// <param name="sortingOrderIncrement">The integer to increment the sorting order per SkeletonPartsRenderer to separate them.</param>
|
||||||
|
/// <param name="baseSortingOrder">The sorting order value of the first SkeletonPartsRenderer.</param>
|
||||||
|
/// <param name="addMinimumPartsRenderers">If set to <c>true</c>, a minimum number of SkeletonPartsRenderer GameObjects (determined by separatorSlots.Count + 1) will be added.</param>
|
||||||
public static SkeletonRenderSeparator AddToSkeletonRenderer (SkeletonRenderer skeletonRenderer, int sortingLayerID = 0, int extraPartsRenderers = 0, int sortingOrderIncrement = DefaultSortingOrderIncrement, int baseSortingOrder = 0, bool addMinimumPartsRenderers = true) {
|
public static SkeletonRenderSeparator AddToSkeletonRenderer (SkeletonRenderer skeletonRenderer, int sortingLayerID = 0, int extraPartsRenderers = 0, int sortingOrderIncrement = DefaultSortingOrderIncrement, int baseSortingOrder = 0, bool addMinimumPartsRenderers = true) {
|
||||||
if (skeletonRenderer == null) {
|
if (skeletonRenderer == null) {
|
||||||
Debug.Log("Tried to add SkeletonRenderSeparator to a null SkeletonRenderer reference.");
|
Debug.Log("Tried to add SkeletonRenderSeparator to a null SkeletonRenderer reference.");
|
||||||
@ -90,15 +98,34 @@ namespace Spine.Unity.Modules {
|
|||||||
var componentRenderers = srs.partsRenderers;
|
var componentRenderers = srs.partsRenderers;
|
||||||
|
|
||||||
for (int i = 0; i < count; i++) {
|
for (int i = 0; i < count; i++) {
|
||||||
var smr = SkeletonPartsRenderer.NewPartsRendererGameObject(skeletonRendererTransform, i.ToString());
|
var spr = SkeletonPartsRenderer.NewPartsRendererGameObject(skeletonRendererTransform, i.ToString());
|
||||||
var mr = smr.MeshRenderer;
|
var mr = spr.MeshRenderer;
|
||||||
mr.sortingLayerID = sortingLayerID;
|
mr.sortingLayerID = sortingLayerID;
|
||||||
mr.sortingOrder = baseSortingOrder + (i * sortingOrderIncrement);
|
mr.sortingOrder = baseSortingOrder + (i * sortingOrderIncrement);
|
||||||
componentRenderers.Add(smr);
|
componentRenderers.Add(spr);
|
||||||
}
|
}
|
||||||
|
|
||||||
return srs;
|
return srs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>Add a child SkeletonPartsRenderer GameObject to this SkeletonRenderSeparator.</summary>
|
||||||
|
public void AddPartsRenderer (int sortingOrderIncrement = DefaultSortingOrderIncrement) {
|
||||||
|
int sortingLayerID = 0;
|
||||||
|
int sortingOrder = 0;
|
||||||
|
if (partsRenderers.Count > 0) {
|
||||||
|
var previous = partsRenderers[partsRenderers.Count - 1];
|
||||||
|
var previousMeshRenderer = previous.MeshRenderer;
|
||||||
|
sortingLayerID = previousMeshRenderer.sortingLayerID;
|
||||||
|
sortingOrder = previousMeshRenderer.sortingOrder + sortingOrderIncrement;
|
||||||
|
}
|
||||||
|
|
||||||
|
var spr = SkeletonPartsRenderer.NewPartsRendererGameObject(skeletonRenderer.transform, partsRenderers.Count.ToString());
|
||||||
|
partsRenderers.Add(spr);
|
||||||
|
|
||||||
|
var mr = spr.MeshRenderer;
|
||||||
|
mr.sortingLayerID = sortingLayerID;
|
||||||
|
mr.sortingOrder = sortingOrder;
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
void OnEnable () {
|
void OnEnable () {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user