瀏覽代碼

Merge branch '3.8' into 3.9-beta

badlogic 6 年之前
父節點
當前提交
246af2e3e0

+ 1 - 1
spine-ts/README.md

@@ -26,7 +26,7 @@ spine-ts works with data exported from Spine 3.9.xx.
 
 
 spine-ts WebGL & players backends supports all Spine features.
 spine-ts WebGL & players backends supports all Spine features.
 
 
-spine-ts Canvas does not support color tinting, mesh attachments and clipping. Only the alpha channel from tint colors is applied. Experimental support for mesh attachments can be enabled by setting `spine.canvas.SkeletonRenderer.useTriangleRendering` to true. Note that this method is slow and may lead to artifacts on some browsers.
+spine-ts Canvas does not support white space stripped texture atlases, color tinting, mesh attachments and clipping. Only the alpha channel from tint colors is applied. Experimental support for mesh attachments can be enabled by setting `spine.canvas.SkeletonRenderer.useTriangleRendering` to true. Note that this method is slow and may lead to artifacts on some browsers.
 
 
 spine-ts THREE.JS does not support two color tinting & blend modes. The THREE.JS backend provides `SkeletonMesh.zOffset` to avoid z-fighting. Adjust to your near/far plane settings.
 spine-ts THREE.JS does not support two color tinting & blend modes. The THREE.JS backend provides `SkeletonMesh.zOffset` to avoid z-fighting. Adjust to your near/far plane settings.
 
 

+ 0 - 1
spine-ts/build/spine-all.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-all.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 0 - 1
spine-ts/build/spine-canvas.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-canvas.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 0 - 1
spine-ts/build/spine-core.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-core.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 0 - 1
spine-ts/build/spine-player.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-player.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-player.js.map


+ 0 - 1
spine-ts/build/spine-threejs.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-threejs.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 0 - 1
spine-ts/build/spine-webgl.d.ts

@@ -283,7 +283,6 @@ declare module spine {
 		_animationsChanged(): void;
 		_animationsChanged(): void;
 		computeHold(entry: TrackEntry): void;
 		computeHold(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
 		computeNotLast(entry: TrackEntry): void;
-		hasTimeline(entry: TrackEntry, id: number): boolean;
 		getCurrent(trackIndex: number): TrackEntry;
 		getCurrent(trackIndex: number): TrackEntry;
 		addListener(listener: AnimationStateListener2): void;
 		addListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;
 		removeListener(listener: AnimationStateListener2): void;

+ 0 - 7
spine-ts/build/spine-webgl.js

@@ -1922,13 +1922,6 @@ var spine;
 				}
 				}
 			}
 			}
 		};
 		};
-		AnimationState.prototype.hasTimeline = function (entry, id) {
-			var timelines = entry.animation.timelines;
-			for (var i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id)
-					return true;
-			return false;
-		};
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 		AnimationState.prototype.getCurrent = function (trackIndex) {
 			if (trackIndex >= this.tracks.length)
 			if (trackIndex >= this.tracks.length)
 				return null;
 				return null;

文件差異過大導致無法顯示
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 0 - 7
spine-ts/core/src/AnimationState.ts

@@ -663,13 +663,6 @@ module spine {
 			}
 			}
 		}
 		}
 
 
-		hasTimeline (entry: TrackEntry, id: number) : boolean {
-			let timelines = entry.animation.timelines;
-			for (let i = 0, n = timelines.length; i < n; i++)
-				if (timelines[i].getPropertyId() == id) return true;
-			return false;
-		}
-
 		getCurrent (trackIndex: number) {
 		getCurrent (trackIndex: number) {
 			if (trackIndex >= this.tracks.length) return null;
 			if (trackIndex >= this.tracks.length) return null;
 			return this.tracks[trackIndex];
 			return this.tracks[trackIndex];

部分文件因文件數量過多而無法顯示