Merge branch '3.6' into 3.7-beta

EsotericSoftware · Dec 14, 2017 · e8fa57e · e8fa57e
2 parents 12162b7 + 33cd0a6
commit e8fa57e
Show file tree

Hide file tree

Showing 16 changed files with 669 additions and 655 deletions.
diff --git a/spine-c/spine-c/src/spine/AnimationState.c b/spine-c/spine-c/src/spine/AnimationState.c
@@ -180,7 +180,7 @@ void _spEventQueue_drain (_spEventQueue* self) {
 	self->drainDisabled = 0;
 }
 
-// These two functions are needed in the UE4 runtime, see #1037
+/* These two functions are needed in the UE4 runtime, see #1037 */
 void _spAnimationState_enableQueue(spAnimationState* self) {
 	_spAnimationState* internal = SUB_CAST(_spAnimationState, self);
 	internal->queue->drainDisabled = 0;

diff --git a/spine-c/spine-c/src/spine/SkeletonJson.c b/spine-c/spine-c/src/spine/SkeletonJson.c
@@ -732,7 +732,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
 			data->target = spSkeletonData_findBone(skeletonData, targetName);
 			if (!data->target) {
 				spSkeletonData_dispose(skeletonData);
-				_spSkeletonJson_setError(self, root, "Target bone not found: ", boneMap->name);
+				_spSkeletonJson_setError(self, root, "Target bone not found: ", targetName);
 				return 0;
 			}
 
@@ -771,7 +771,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
 			data->target = spSkeletonData_findBone(skeletonData, name);
 			if (!data->target) {
 				spSkeletonData_dispose(skeletonData);
-				_spSkeletonJson_setError(self, root, "Target bone not found: ", boneMap->name);
+				_spSkeletonJson_setError(self, root, "Target bone not found: ", name);
 				return 0;
 			}
 
@@ -822,7 +822,7 @@ spSkeletonData* spSkeletonJson_readSkeletonData (spSkeletonJson* self, const cha
 			data->target = spSkeletonData_findSlot(skeletonData, name);
 			if (!data->target) {
 				spSkeletonData_dispose(skeletonData);
-				_spSkeletonJson_setError(self, root, "Target slot not found: ", boneMap->name);
+				_spSkeletonJson_setError(self, root, "Target slot not found: ", name);
 				return 0;
 			}
 

diff --git a/spine-cocos2dx/src/spine/SkeletonAnimation.h b/spine-cocos2dx/src/spine/SkeletonAnimation.h
@@ -61,7 +61,7 @@ class SkeletonAnimation: public SkeletonRenderer {
 		return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlas, scale);
 	}
 	// Use createWithJsonFile instead
-	CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
+	CC_DEPRECATED_ATTRIBUTE static SkeletonAnimation* createWithFile (const std::string& skeletonJsonFile, const std::string& atlasFile, float scale = 1)
 	{
 		return SkeletonAnimation::createWithJsonFile(skeletonJsonFile, atlasFile, scale);
 	}

diff --git a/spine-csharp/src/AnimationState.cs b/spine-csharp/src/AnimationState.cs
@@ -69,7 +69,7 @@ public AnimationState (AnimationStateData data) {
 				trackEntryPool
 			);
 		}
-			
+
 		/// <summary>
 		/// Increments the track entry times, setting queued animations as current if needed</summary>
 		/// <param name="delta">delta time</param>
@@ -259,17 +259,12 @@ private float ApplyMixingFrom (TrackEntry to, Skeleton skeleton, MixPose current
 					break;
 				case Dip:
 					pose = MixPose.Setup;
-					alpha = mix == 1 ? 0 : alphaDip;
+					alpha = alphaDip;
 					break;
 				default:
 					pose = MixPose.Setup;
-					if (mix == 1) {
-						alpha = 0;
-					} else {
-						alpha = alphaDip;
-						var dipMix = timelineDipMix[i];
-						alpha *= Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
-					}
+					TrackEntry dipMix = timelineDipMix[i];
+					alpha = alphaDip * Math.Max(0, 1 - dipMix.mixTime / dipMix.mixDuration);
 					break;
 				}
 				from.totalAlpha += alpha;

diff --git a/spine-ts/build/spine-all.d.ts b/spine-ts/build/spine-all.d.ts
@@ -1483,8 +1483,8 @@ declare module spine.webgl {
 		private shapes;
 		private shapesShader;
 		private activeRenderer;
-		private skeletonRenderer;
-		private skeletonDebugRenderer;
+		skeletonRenderer: SkeletonRenderer;
+		skeletonDebugRenderer: SkeletonDebugRenderer;
 		private QUAD;
 		private QUAD_TRIANGLES;
 		private WHITE;

diff --git a/spine-ts/build/spine-webgl.d.ts b/spine-ts/build/spine-webgl.d.ts
@@ -1454,8 +1454,8 @@ declare module spine.webgl {
 		private shapes;
 		private shapesShader;
 		private activeRenderer;
-		private skeletonRenderer;
-		private skeletonDebugRenderer;
+		skeletonRenderer: SkeletonRenderer;
+		skeletonDebugRenderer: SkeletonDebugRenderer;
 		private QUAD;
 		private QUAD_TRIANGLES;
 		private WHITE;

diff --git a/spine-ts/build/spine-widget.d.ts b/spine-ts/build/spine-widget.d.ts
@@ -1454,8 +1454,8 @@ declare module spine.webgl {
 		private shapes;
 		private shapesShader;
 		private activeRenderer;
-		private skeletonRenderer;
-		private skeletonDebugRenderer;
+		skeletonRenderer: SkeletonRenderer;
+		skeletonDebugRenderer: SkeletonDebugRenderer;
 		private QUAD;
 		private QUAD_TRIANGLES;
 		private WHITE;

diff --git a/spine-ts/webgl/src/SceneRenderer.ts b/spine-ts/webgl/src/SceneRenderer.ts
@@ -39,8 +39,8 @@ module spine.webgl {
 		private shapes: ShapeRenderer;
 		private shapesShader: Shader;
 		private activeRenderer: PolygonBatcher | ShapeRenderer | SkeletonDebugRenderer = null;
-		private skeletonRenderer: SkeletonRenderer;
-		private skeletonDebugRenderer: SkeletonDebugRenderer;
+		skeletonRenderer: SkeletonRenderer;
+		skeletonDebugRenderer: SkeletonDebugRenderer;
 		private QUAD = [
 			0, 0, 1, 1, 1, 1, 0, 0,
 			0, 0, 1, 1, 1, 1, 0, 0,