Merge branch '3.8-beta' into skin-bones

CHANGELOG.md

@@ -36,6 +36,7 @@
 
 * **Breaking changes**
   * **Removed PoseSkeleton() and PoseWithAnimation()** extension methods to prevent issues where animations are not mixed out. Problem was that these methods did not set AnimationState, leaving incorrect state at e.g. attachments enabled at slots when starting subsequent animations. As a replacement you can use `AnimationState.ClearTrack(0);` followed by `var entry = AnimationState.SetAnimation(0, animation, loop); entry.TrackTime = time` to achieve similar behaviour.
+  * **The `Shadow alpha cutoff` shader parameter is now respecting slot-color alpha** values at all Spine shaders. A fragment's texture color alpha is multiplied with slot-color alpha before the result is tested against the `Shadow alpha cutoff` threshold.
 
 * **Additions**
   * **Spine Preferences stored in Assets/Editor/SpineSettings.asset** Now Spine uses the new `SettingsProvider` API, storing settings in a SpineSettings.asset file which can be shared with team members. Your old preferences are automatically migrated to the new system.

spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -247,7 +247,10 @@ package spine.animation {
 					var alpha : Number = 0;
 					switch (timelineMode[i] & (NOT_LAST - 1)) {
 					case SUBSEQUENT:						
-						if (!attachments && timeline is AttachmentTimeline) continue;
+						if (!attachments && timeline is AttachmentTimeline) {
+							if ((timelineMode[i] & NOT_LAST) == NOT_LAST) continue;
+							blend = MixBlend.setup;
+						}
 						if (!drawOrder && timeline is DrawOrderTimeline) continue;
 						timelineBlend = blend;
 						alpha = alphaMix;

spine-c/spine-c/src/spine/AnimationState.c

@@ -468,7 +468,10 @@ float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* t
 
 			switch (timelineMode->items[i] & (NOT_LAST - 1)) {
 				case SUBSEQUENT:
-					if (!attachments && timeline->type == SP_TIMELINE_ATTACHMENT) continue;
+					if (!attachments && timeline->type == SP_TIMELINE_ATTACHMENT) {
+						if ((timelineMode->items[i] & NOT_LAST) == NOT_LAST) continue;
+						blend = SP_MIX_BLEND_SETUP;
+					}
 					if (!drawOrder && timeline->type == SP_TIMELINE_DRAWORDER) continue;
 					timelineBlend = blend;
 					alpha = alphaMix;

spine-cpp/spine-cpp/src/spine/AnimationState.cpp

@@ -814,7 +814,10 @@ float AnimationState::applyMixingFrom(TrackEntry *to, Skeleton &skeleton, MixBle
 			float alpha;
 			switch (timelineMode[i] & (NotLast - 1)) {
 				case Subsequent:
-					if (!attachments && (timeline->getRTTI().isExactly(AttachmentTimeline::rtti))) continue;
+					if (!attachments && (timeline->getRTTI().isExactly(AttachmentTimeline::rtti))) {
+						if ((timelineMode[i] & NotLast) == NotLast) continue;
+						blend = MixBlend_Setup;
+					}
 					if (!drawOrder && (timeline->getRTTI().isExactly(DrawOrderTimeline::rtti))) continue;
 					timelineBlend = blend;
 					alpha = alphaMix;

spine-csharp/src/AnimationState.cs

@@ -299,7 +299,10 @@ namespace Spine {
 					float alpha;
 					switch (timelineMode[i] & AnimationState.NotLast - 1) {
 						case AnimationState.Subsequent:
-							if (!attachments && timeline is AttachmentTimeline) continue;
+							if (!attachments && timeline is AttachmentTimeline) {
+								if ((timelineMode[i] & AnimationState.NotLast) == AnimationState.NotLast) continue;
+								blend = MixBlend.Setup;
+							}
 							if (!drawOrder && timeline is DrawOrderTimeline) continue;
 							timelineBlend = blend;
 							alpha = alphaMix;

spine-csharp/src/Atlas.cs

@@ -33,6 +33,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Reflection;
 
@@ -123,8 +124,8 @@ namespace Spine {
 					page.name = line;
 
 					if (ReadTuple(reader, tuple) == 2) { // size is only optional for an atlas packed with an old TexturePacker.
-						page.width = int.Parse(tuple[0]);
+						page.width = int.Parse(tuple[0], CultureInfo.InvariantCulture);
-						page.height = int.Parse(tuple[1]);
+						page.height = int.Parse(tuple[1], CultureInfo.InvariantCulture);
 						ReadTuple(reader, tuple);
 					}
 					page.format = (Format)Enum.Parse(typeof(Format), tuple[0], false);
@@ -162,12 +163,12 @@ namespace Spine {
 					region.rotate = region.degrees == 90;
 
 					ReadTuple(reader, tuple);
-					int x = int.Parse(tuple[0]);
+					int x = int.Parse(tuple[0], CultureInfo.InvariantCulture);
-					int y = int.Parse(tuple[1]);
+					int y = int.Parse(tuple[1], CultureInfo.InvariantCulture);
 
 					ReadTuple(reader, tuple);
-					int width = int.Parse(tuple[0]);
+					int width = int.Parse(tuple[0], CultureInfo.InvariantCulture);
-					int height = int.Parse(tuple[1]);
+					int height = int.Parse(tuple[1], CultureInfo.InvariantCulture);
 
 					region.u = x / (float)page.width;
 					region.v = y / (float)page.height;
@@ -184,25 +185,29 @@ namespace Spine {
 					region.height = Math.Abs(height);
 
 					if (ReadTuple(reader, tuple) == 4) { // split is optional
-						region.splits = new [] {int.Parse(tuple[0]), int.Parse(tuple[1]),
+						region.splits = new [] {int.Parse(tuple[0], CultureInfo.InvariantCulture),
-								int.Parse(tuple[2]), int.Parse(tuple[3])};
+												int.Parse(tuple[1], CultureInfo.InvariantCulture),
+												int.Parse(tuple[2], CultureInfo.InvariantCulture),
+												int.Parse(tuple[3], CultureInfo.InvariantCulture)};
 
 						if (ReadTuple(reader, tuple) == 4) { // pad is optional, but only present with splits
-							region.pads = new [] {int.Parse(tuple[0]), int.Parse(tuple[1]),
+							region.pads = new [] {int.Parse(tuple[0], CultureInfo.InvariantCulture),
-									int.Parse(tuple[2]), int.Parse(tuple[3])};
+												int.Parse(tuple[1], CultureInfo.InvariantCulture),
+												int.Parse(tuple[2], CultureInfo.InvariantCulture),
+												int.Parse(tuple[3], CultureInfo.InvariantCulture)};
 
 							ReadTuple(reader, tuple);
 						}
 					}
 
-					region.originalWidth = int.Parse(tuple[0]);
+					region.originalWidth = int.Parse(tuple[0], CultureInfo.InvariantCulture);
-					region.originalHeight = int.Parse(tuple[1]);
+					region.originalHeight = int.Parse(tuple[1], CultureInfo.InvariantCulture);
 
 					ReadTuple(reader, tuple);
-					region.offsetX = int.Parse(tuple[0]);
+					region.offsetX = int.Parse(tuple[0], CultureInfo.InvariantCulture);
-					region.offsetY = int.Parse(tuple[1]);
+					region.offsetY = int.Parse(tuple[1], CultureInfo.InvariantCulture);
 
-					region.index = int.Parse(ReadValue(reader));
+					region.index = int.Parse(ReadValue(reader), CultureInfo.InvariantCulture);
 
 					regions.Add(region);
 				}

spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -293,7 +293,10 @@ public class AnimationState {
 				float alpha;
 				switch (timelineMode[i] & NOT_LAST - 1) {
 				case SUBSEQUENT:
-					if (!attachments && timeline instanceof AttachmentTimeline) continue;
+					if (!attachments && timeline instanceof AttachmentTimeline) {
+						if ((timelineMode[i] & NOT_LAST) == NOT_LAST) continue;
+						blend = MixBlend.setup;
+					}
 					if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 					timelineBlend = blend;
 					alpha = alphaMix;

spine-lua/Animation.lua

@@ -826,8 +826,8 @@ function Animation.DeformTimeline.new (frameCount)
 		if not slotAttachment:applyDeform(self.attachment) then return end
 
 		local frames = self.frames
-		local verticesArray = slot.attachmentVertices
+		local deformArray = slot.deform
-    if #(verticesArray) == 0 then blend = MixBlend.setup end
+    if #(deformArray) == 0 then blend = MixBlend.setup end
 
 		local frameVertices = self.frameVertices
 		local vertexCount = #(frameVertices[0])
@@ -835,27 +835,27 @@ function Animation.DeformTimeline.new (frameCount)
 		if time < frames[0] then
 			local vertexAttachment = slotAttachment;
 			if blend == MixBlend.setup then
-        slot.attachmentVertices = {}
+        slot.deform = {}
         return;
 			elseif blend == MixBlend.first then
         if (alpha == 1) then
-          slot.attachmentVertices = {}
+          slot.deform = {}
           return;
         end
 
-        local vertices = utils.setArraySize(verticesArray, vertexCount)
+        local deform = utils.setArraySize(deformArray, vertexCount)
         if (vertexAttachment.bones == nil) then
           local setupVertices = vertexAttachment.vertices
           local i = 1
           while i <= vertexCount do
-            vertices[i] = vertices[i] + (setupVertices[i] - vertices[i]) * alpha
+            deform[i] = deform[i] + (setupVertices[i] - deform[i]) * alpha
             i = i + 1
           end
         else
           alpha = 1 - alpha
           local i = 1
           while i <= vertexCount do
-            vertices[i] = vertices[i] * alpha
+            deform[i] = deform[i] * alpha
             i = i + 1
           end
         end
@@ -863,7 +863,7 @@ function Animation.DeformTimeline.new (frameCount)
 			return
 		end
 
-    local vertices = utils.setArraySize(verticesArray, vertexCount)
+    local deform = utils.setArraySize(deformArray, vertexCount)
 		if time >= frames[zlen(frames) - 1] then -- Time is after last frame.
 			local lastVertices = frameVertices[zlen(frames) - 1]
 			if alpha == 1 then
@@ -874,21 +874,21 @@ function Animation.DeformTimeline.new (frameCount)
 						local setupVertices = vertexAttachment.vertices
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + lastVertices[i] - setupVertices[i]
+							deform[i] = deform[i] + lastVertices[i] - setupVertices[i]
 							i = i + 1
 						end
 					else
 						-- Weighted deform offsets, with alpha.
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + lastVertices[i]
+							deform[i] = deform[i] + lastVertices[i]
 							i = i + 1
 						end
 					end
 				else
 					local i = 1
 					while i <= vertexCount do
-						vertices[i] = lastVertices[i]
+						deform[i] = lastVertices[i]
 						i = i + 1
 					end
 				end
@@ -901,21 +901,21 @@ function Animation.DeformTimeline.new (frameCount)
 						local i = 1
 						while i <= vertexCount do
 							local setup = setupVertices[i]
-							vertices[i] = setup + (lastVertices[i] - setup) * alpha
+							deform[i] = setup + (lastVertices[i] - setup) * alpha
 							i = i + 1
 						end
 					else
 						-- Weighted deform offsets, with alpha.
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = lastVertices[i] * alpha
+							deform[i] = lastVertices[i] * alpha
 							i = i + 1
 						end
 					end
 				elseif blend == MixBlend.first or blend == MixBlend.replace then
 					local i = 1
 					while i <= vertexCount do
-						vertices[i] = vertices[i] + (lastVertices[i] - vertices[i]) * alpha
+						deform[i] = deform[i] + (lastVertices[i] - deform[i]) * alpha
 						i = i + 1
 					end
 					local vertexAttachment = slotAttachment
@@ -923,14 +923,14 @@ function Animation.DeformTimeline.new (frameCount)
 						local setupVertices = vertexAttachment.vertices
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + (lastVertices[i] - setupVertices[i]) * alpha
+							deform[i] = deform[i] + (lastVertices[i] - setupVertices[i]) * alpha
 							i = i + 1
 						end
 					else
 						-- Weighted deform offsets, with alpha.
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + lastVertices[i] * alpha
+							deform[i] = deform[i] + lastVertices[i] * alpha
 							i = i + 1
 						end
 					end
@@ -940,14 +940,14 @@ function Animation.DeformTimeline.new (frameCount)
 						local setupVertices = vertexAttachment.vertices
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + (lastVertices[i] - setupVertices[i]) * alpha
+							deform[i] = deform[i] + (lastVertices[i] - setupVertices[i]) * alpha
 							i = i + 1
 						end
 					else
 						-- Weighted deform offsets, with alpha.
 						local i = 1
 						while i <= vertexCount do
-							vertices[i] = vertices[i] + lastVertices[i] * alpha
+							deform[i] = deform[i] + lastVertices[i] * alpha
 							i = i + 1
 						end
 					end
@@ -972,7 +972,7 @@ function Animation.DeformTimeline.new (frameCount)
 					local i = 1
 					while i <= vertexCount do
 						local prev = prevVertices[i]
-						vertices[i] = vertices[i] + prev + (nextVertices[i] - prev) * precent - setupVertices[i]
+						deform[i] = deform[i] + prev + (nextVertices[i] - prev) * precent - setupVertices[i]
 						i = i + 1
 					end
 				else
@@ -980,7 +980,7 @@ function Animation.DeformTimeline.new (frameCount)
 					local i = 1
 					while i <= vertexCount do
 						local prev = prevVertices[i]
-						vertices[i] = vertices[i] + prev + (nextVertices[i] - prev) * percent
+						deform[i] = deform[i] + prev + (nextVertices[i] - prev) * percent
 						i = i + 1
 					end
 				end
@@ -988,7 +988,7 @@ function Animation.DeformTimeline.new (frameCount)
 				local i = 1
 				while i <= vertexCount do
 					local prev = prevVertices[i]
-					vertices[i] = prev + (nextVertices[i] - prev) * percent
+					deform[i] = prev + (nextVertices[i] - prev) * percent
 					i = i + 1
 				end
 			end
@@ -1002,7 +1002,7 @@ function Animation.DeformTimeline.new (frameCount)
 					while i <= vertexCount do
 						local prev = prevVertices[i]
 						local setup = setupVertices[i]
-						vertices[i] = setup + (prev + (nextVertices[i] - prev) * percent - setup) * alpha
+						deform[i] = setup + (prev + (nextVertices[i] - prev) * percent - setup) * alpha
 						i = i + 1
 					end
 				else
@@ -1010,7 +1010,7 @@ function Animation.DeformTimeline.new (frameCount)
 					local i = 1
 					while i <= vertexCount do
 						local prev = prevVertices[i]
-						vertices[i] = (prev + (nextVertices[i] - prev) * percent) * alpha
+						deform[i] = (prev + (nextVertices[i] - prev) * percent) * alpha
 						i = i + 1
 					end
 				end
@@ -1018,7 +1018,7 @@ function Animation.DeformTimeline.new (frameCount)
 				local i = 1
 				while i <= vertexCount do
 					local prev = prevVertices[i]
-					vertices[i] = vertices[i] + (prev + (nextVertices[i] - prev) * percent - vertices[i]) * alpha
+					deform[i] = deform[i] + (prev + (nextVertices[i] - prev) * percent - deform[i]) * alpha
 					i = i + 1
 				end
 			elseif blend == MixBlend.add then
@@ -1028,7 +1028,7 @@ function Animation.DeformTimeline.new (frameCount)
 					local i = 1
 					while i <= vertexCount do
 						local prev = prevVertices[i]
-						vertices[i] = vertices[i] + (prev + (nextVertices[i] - prev) * percent - setupVertices[i]) * alpha
+						deform[i] = deform[i] + (prev + (nextVertices[i] - prev) * percent - setupVertices[i]) * alpha
 						i = i + 1
 					end
 				else
@@ -1036,7 +1036,7 @@ function Animation.DeformTimeline.new (frameCount)
 					local i = 1
 					while i <= vertexCount do
 						local prev = prevVertices[i]
-						vertices[i] = vertices[i] + (prev + (nextVertices[i] - prev) * percent) * alpha
+						deform[i] = deform[i] + (prev + (nextVertices[i] - prev) * percent) * alpha
 						i = i + 1
 					end
 				end
@@ -1179,7 +1179,7 @@ function Animation.IkConstraintTimeline.new (frameCount)
 	local MIX = 1
 	local BEND_DIRECTION = 2
 	local COMPRESS = 3
-	local STRETCH = 1
+	local STRETCH = 4
 
 	local self = Animation.CurveTimeline.new(frameCount)
 	self.frames = utils.newNumberArrayZero(frameCount * ENTRIES) -- time, mix, bendDirection, compress, stretch, ...

spine-lua/AnimationState.lua

@@ -41,6 +41,9 @@ local math_signum = utils.signum
 local math_floor = math.floor
 local math_ceil = math.ceil
 local math_mod = utils.mod
+local testBit = utils.testBit
+local setBit = utils.setBit
+local clearBit = utils.clearBit
 
 local function zlen(array)
 	return #array + 1
@@ -50,7 +53,8 @@ local EMPTY_ANIMATION = Animation.new("<empty>", {}, 0)
 local SUBSEQUENT = 0
 local FIRST = 1
 local HOLD = 2
-local HOLD_MIX = 3;
+local HOLD_MIX = 3
+local NOT_LAST = 4
 
 local EventType = {
 	start = 0,
@@ -357,7 +361,7 @@ function AnimationState:apply (skeleton)
 
 				for ii,timeline in ipairs(timelines) do
 					local timelineBlend = MixBlend.setup
-					if timelineMode[ii] == SUBSEQUENT then timelineBlend = blend end
+					if clearBit(timelineMode[ii], NOT_LAST) == SUBSEQUENT then timelineBlend = blend end
 
 					if timeline.type == Animation.TimelineType.rotate then
 						self:applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii * 2,
@@ -421,15 +425,21 @@ function AnimationState:applyMixingFrom (to, skeleton, blend)
       local direction = MixDirection.out;
 			local timelineBlend = MixBlend.setup
 			local alpha = 0
-			if timelineMode[i] == SUBSEQUENT then
+			if clearBit(timelineMode[i], NOT_LAST) == SUBSEQUENT then
-				if not attachments and timeline.type == Animation.TimelineType.attachment then skipSubsequent = true end
+				if not attachments and timeline.type == Animation.TimelineType.attachment then
+					if testBit(timelineMode[i], NOT_LAST) then 
+						skipSubsequent = true
+					else
+						blend = MixBlend.setup
+					end
+				end
 				if not drawOrder and timeline.type == Animation.TimelineType.drawOrder then skipSubsequent = true end
 				timelineBlend = blend
 				alpha = alphaMix
-			elseif timelineMode[i] == FIRST then
+			elseif clearBit(timelineMode[i], NOT_LAST) == FIRST then
 				timelineBlend = MixBlend.setup
 				alpha = alphaMix
-			elseif timelineMode[i] == HOLD then
+			elseif clearBit(timelineMode[i], NOT_LAST) == HOLD then
 				timelineBlend = MixBlend.setup
 				alpha = alphaHold
 			else
@@ -445,7 +455,7 @@ function AnimationState:applyMixingFrom (to, skeleton, blend)
 				else
           if timelineBlend == MixBlend.setup then
             if timeline.type == Animation.TimelineType.attachment then
-              if attachments then direction = MixDirection._in end
+              if attachments or testBit(timelineMode[i], NOT_LAST) then direction = MixDirection._in end
             elseif timeline.type == Animation.TimelineType.drawOrder then
               if drawOrder then direction = MixDirection._in end
             end
@@ -803,7 +813,10 @@ function AnimationState:_animationsChanged ()
 
 	self.propertyIDs = {}
 
+	local highestIndex = -1
 	for i, entry in pairs(self.tracks) do
+		if i > highestIndex then highestIndex = i end
+
 		if entry then
 			while entry.mixingFrom do
 				entry = entry.mixingFrom
@@ -811,15 +824,45 @@ function AnimationState:_animationsChanged ()
 
 			repeat
 				if (entry.mixingTo == nil or entry.mixBlend ~= MixBlend.add) then
-					self:setTimelineModes(entry)
+					self:computeHold(entry)
 				end
 				entry = entry.mixingTo
 			until (entry == nil)
 		end
 	end
+
+	self.propertyIDs = {}
+	for i = highestIndex, 0, -1 do
+		entry = self.tracks[i]
+		while entry do
+			self:computeNotLast(entry)
+			entry = entry.mixingFrom
+		end
+	end
 end
 
-function AnimationState:setTimelineModes(entry)
+function AnimationState:computeNotLast(entry)
+	local timelines = entry.animation.timelines
+	local timelinesCount = #entry.animation.timelines
+	local timelineMode = entry.timelineMode
+	local propertyIDs = self.propertyIDs
+ 
+	local i = 1
+	while i <= timelinesCount do
+		local timeline = timelines[i]
+		if (timeline.type == Animation.TimelineType.attachment) then
+			local slotIndex = timeline.slotIndex
+			if not (propertyIDs[slotIndex] == nil) then
+				timelineMode[i] = setBit(timelineMode[i], NOT_LAST)
+			else
+				propertyIDs[slotIndex] = true
+			end
+		end
+		i = i + 1
+	end
+end
+
+function AnimationState:computeHold(entry)
 	local to = entry.mixingTo
 	local timelines = entry.animation.timelines
 	local timelinesCount = #entry.animation.timelines
@@ -847,7 +890,11 @@ function AnimationState:setTimelineModes(entry)
 			timelineMode[i] = SUBSEQUENT
 		else
 			propertyIDs[id] = id
-			if to == nil or not self:hasTimeline(to, id) then
+			local timeline = timelines[i]
+			if to == nil or timeline.type == Animation.TimelineType.attachment 
+				or timeline.type == Animation.TimelineType.drawOrder 
+				or timeline.type == Animation.TimelineType.event 
+				or not self:hasTimeline(to, id) then
 				timelineMode[i] = FIRST
 			else
 				local next = to.mixingTo

spine-lua/MeshAttachment.lua

@@ -79,7 +79,7 @@ x,y=slot.bone.skeleton.x,slot.bone.skeleton.y
 		local m00, m01, m10, m11 = bone.m00, bone.m01, bone.m10, bone.m11
 		local vertices = self.vertices
 		local verticesCount = #vertices
-		if slot.attachmentVertices and #slot.attachmentVertices == verticesCount then vertices = slot.attachmentVertices end
+		if slot.deform and #slot.deform == verticesCount then vertices = slot.deform end
 		for i = 1, verticesCount, 2 do
 			local vx = vertices[i]
 			local vy = vertices[i + 1]

spine-lua/Slot.lua

@@ -45,7 +45,7 @@ function Slot.new (data, bone)
 		darkColor = nil,
 		attachment = nil,
 		attachmentTime = 0,
-		attachmentVertices = {}
+		deform = {}
 	}	
 
 	setmetatable(self, Slot)
@@ -61,7 +61,7 @@ function Slot:setAttachment (attachment)
 	if self.attachment == attachment then return end
 	self.attachment = attachment
 	self.attachmentTime = self.bone.skeleton.time
-	self.attachmentVertices = {}
+	self.deform = {}
 end
 
 function Slot:setAttachmentTime (time)

spine-lua/attachments/VertexAttachment.lua

@@ -60,7 +60,7 @@ end
 function VertexAttachment:computeWorldVertices (slot, start, count, worldVertices, offset, stride)
 	count = offset + (count / 2) * stride
 	local skeleton = slot.bone.skeleton
-	local deformArray = slot.attachmentVertices
+	local deformArray = slot.deform
 	local vertices = self.vertices
 	local bones = self.bones
 	if not bones then

spine-lua/utils.lua

@@ -166,4 +166,22 @@ function utils.randomTriangularWith(min, max, mode)
 	return max - math_sqrt((1 - u) * d * (max - mode))
 end
 
+function utils.testBit(value, bit)
+  return value % (2 * bit) >= bit
+end
+
+function utils.setBit(value, bit)
+  if value % (2 * bit) >= bit then
+    return value
+  end
+  return value + bit
+end
+
+function utils.clearBit(value, bit)
+  if value % (2 * bit) >= bit then
+    return value - bit
+  end
+  return value
+end
+
 return utils

spine-ts/build/spine-all.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;
@@ -10075,11 +10078,11 @@ var spine;
 				this.indicesLength += indicesLength;
 			};
 			MeshBatcher.prototype.end = function () {
-				this.vertexBuffer.needsUpdate = true;
+				this.vertexBuffer.needsUpdate = this.verticesLength > 0;
 				this.vertexBuffer.updateRange.offset = 0;
 				this.vertexBuffer.updateRange.count = this.verticesLength;
 				var geo = this.geometry;
-				geo.getIndex().needsUpdate = true;
+				geo.getIndex().needsUpdate = this.indicesLength > 0;
 				geo.getIndex().updateRange.offset = 0;
 				geo.getIndex().updateRange.count = this.indicesLength;
 				geo.drawRange.start = 0;

spine-ts/build/spine-canvas.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;

spine-ts/build/spine-core.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;

spine-ts/build/spine-player.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;

spine-ts/build/spine-threejs.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;
@@ -7205,11 +7208,11 @@ var spine;
 				this.indicesLength += indicesLength;
 			};
 			MeshBatcher.prototype.end = function () {
-				this.vertexBuffer.needsUpdate = true;
+				this.vertexBuffer.needsUpdate = this.verticesLength > 0;
 				this.vertexBuffer.updateRange.offset = 0;
 				this.vertexBuffer.updateRange.count = this.verticesLength;
 				var geo = this.geometry;
-				geo.getIndex().needsUpdate = true;
+				geo.getIndex().needsUpdate = this.indicesLength > 0;
 				geo.getIndex().updateRange.offset = 0;
 				geo.getIndex().updateRange.count = this.indicesLength;
 				geo.drawRange.start = 0;

spine-ts/build/spine-webgl.js

@@ -1475,8 +1475,11 @@ var spine;
 					var alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 						case AnimationState.SUBSEQUENT:
-							if (!attachments && timeline instanceof spine.AttachmentTimeline)
+							if (!attachments && timeline instanceof spine.AttachmentTimeline) {
-								continue;
+								if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST)
+									continue;
+								blend = spine.MixBlend.setup;
+							}
 							if (!drawOrder && timeline instanceof spine.DrawOrderTimeline)
 								continue;
 							timelineBlend = blend;

spine-ts/core/src/AnimationState.ts

@@ -230,7 +230,10 @@ module spine {
 					let alpha = 0;
 					switch (timelineMode[i] & (AnimationState.NOT_LAST - 1)) {
 					case AnimationState.SUBSEQUENT:
-						if (!attachments && timeline instanceof AttachmentTimeline) continue;
+						if (!attachments && timeline instanceof AttachmentTimeline) {
+							if ((timelineMode[i] & AnimationState.NOT_LAST) == AnimationState.NOT_LAST) continue;
+							blend = MixBlend.setup;
+						}
 						if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
 						timelineBlend = blend;
 						alpha = alphaMix;

spine-ts/threejs/src/MeshBatcher.ts

@@ -98,11 +98,11 @@ module spine.threejs {
 		}
 
 		end () {
-			this.vertexBuffer.needsUpdate = true;
+			this.vertexBuffer.needsUpdate = this.verticesLength > 0;
 			this.vertexBuffer.updateRange.offset = 0;
 			this.vertexBuffer.updateRange.count = this.verticesLength;
 			let geo = (<THREE.BufferGeometry>this.geometry);
-			geo.getIndex().needsUpdate = true;
+			geo.getIndex().needsUpdate = this.indicesLength > 0;
 			geo.getIndex().updateRange.offset = 0;
 			geo.getIndex().updateRange.count = this.indicesLength;
 			geo.drawRange.start = 0;

spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs

@@ -28,6 +28,7 @@
  *****************************************************************************/
 
 #pragma warning disable 0219
+#pragma warning disable 0618 // for 3.7 branch only. Avoids "PreferenceItem' is obsolete: '[PreferenceItem] is deprecated. Use [SettingsProvider] instead."
 
 // Original contribution by: Mitch Thompson
 
@@ -60,6 +61,7 @@ using System.IO;
 using System.Text;
 using System.Linq;
 using System.Reflection;
+using System.Globalization;
 
 namespace Spine.Unity.Editor {
 	using EventType = UnityEngine.EventType;
@@ -1254,10 +1256,10 @@ namespace Spine.Unity.Editor {
 						string[] versionSplit = rawVersion.Split('.');
 						bool match = false;
 						foreach (var version in compatibleVersions) {
-							bool primaryMatch = version[0] == int.Parse(versionSplit[0]);
+							bool primaryMatch = version[0] == int.Parse(versionSplit[0], CultureInfo.InvariantCulture);
-							bool secondaryMatch = version[1] == int.Parse(versionSplit[1]);
+							bool secondaryMatch = version[1] == int.Parse(versionSplit[1], CultureInfo.InvariantCulture);
 
-							// if (isFixVersionRequired) secondaryMatch &= version[2] <= int.Parse(jsonVersionSplit[2]);
+							// if (isFixVersionRequired) secondaryMatch &= version[2] <= int.Parse(jsonVersionSplit[2], CultureInfo.InvariantCulture);
 
 							if (primaryMatch && secondaryMatch) {
 								match = true;

spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Spine-Skeleton-Fill.shader

@@ -91,19 +91,20 @@ Shader "Spine/Skeleton Fill" {
 
 			struct VertexOutput { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
-			VertexOutput vert (appdata_base v) {
+			VertexOutput vert (appdata_base v, float4 vertexColor : COLOR) {
 				VertexOutput o;
-				o.uv = v.texcoord;
+				o.uvAndAlpha = v.texcoord;
+				o.uvAndAlpha.a = vertexColor.a;
 				TRANSFER_SHADOW_CASTER(o)
 				return o;
 			}
 
 			float4 frag (VertexOutput i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Spine-Skeleton-Tint.shader

@@ -94,19 +94,20 @@ Shader "Spine/Skeleton Tint" {
 
 			struct VertexOutput { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
-			VertexOutput vert (appdata_base v) {
+			VertexOutput vert (appdata_base v, float4 vertexColor : COLOR) {
 				VertexOutput o;
-				o.uv = v.texcoord;
+				o.uvAndAlpha = v.texcoord;
+				o.uvAndAlpha.a = vertexColor.a;
 				TRANSFER_SHADOW_CASTER(o)
 				return o;
 			}
 
 			float4 frag (VertexOutput i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Spine-Special-Skeleton-Grayscale.shader

@@ -91,19 +91,20 @@ Shader "Spine/Special/Skeleton Grayscale" {
 
 			struct VertexOutput { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
-			VertexOutput vert (appdata_base v) {
+			VertexOutput vert (appdata_base v, float4 vertexColor : COLOR) {
 				VertexOutput o;
-				o.uv = v.texcoord;
+				o.uvAndAlpha = v.texcoord;
+				o.uvAndAlpha.a = vertexColor.a;
 				TRANSFER_SHADOW_CASTER(o)
 				return o;
 			}
 
 			float4 frag (VertexOutput i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/CGIncludes/SpriteShadows.cginc

@@ -16,18 +16,20 @@ struct vertexInput
 struct vertexOutput
 { 
 	V2F_SHADOW_CASTER;
-	float2 texcoord : TEXCOORD1;
+	float4 texcoordAndAlpha : TEXCOORD1;
 };
 
 ////////////////////////////////////////
 // Vertex program
 //
 
-vertexOutput vert(vertexInput v)
+vertexOutput vert(vertexInput v, float4 vertexColor : COLOR)
 {
 	vertexOutput o;
 	TRANSFER_SHADOW_CASTER(o)
-	o.texcoord = calculateTextureCoord(v.texcoord);
+	o.texcoordAndAlpha.xy = calculateTextureCoord(v.texcoord);
+	o.texcoordAndAlpha.z = 0;
+	o.texcoordAndAlpha.a = vertexColor.a;
 	return o;
 }
 
@@ -40,8 +42,8 @@ uniform fixed _ShadowAlphaCutoff;
 
 fixed4 frag(vertexOutput IN) : COLOR 
 {
-	fixed4 texureColor = calculateTexturePixel(IN.texcoord);
+	fixed4 texureColor = calculateTexturePixel(IN.texcoordAndAlpha.xy);
-	clip(texureColor.a - _ShadowAlphaCutoff);
+	clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff);
 	
 	SHADOW_CASTER_FRAGMENT(IN)
 }

spine-unity/Assets/Spine/Runtime/spine-unity/Modules/Shaders/Sprite/SpriteShadows.cginc

@@ -16,7 +16,7 @@ struct vertexInput
 struct vertexOutput
 { 
 	V2F_SHADOW_CASTER;
-	float4 texcoord : TEXCOORD1;
+	float4 texcoordAndAlpha : TEXCOORD1;
 };
 
 ////////////////////////////////////////
@@ -26,11 +26,13 @@ struct vertexOutput
 uniform sampler2D _MainTex;
 uniform fixed4 _MainTex_ST;
 
-vertexOutput vert(vertexInput v)
+vertexOutput vert(vertexInput v, float4 vertexColor : COLOR)
 {
 	vertexOutput o;
 	TRANSFER_SHADOW_CASTER(o)
-	o.texcoord = float4(TRANSFORM_TEX(v.texcoord, _MainTex), 0, 0);
+	o.texcoordAndAlpha.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
+	o.texcoordAndAlpha.z = 0;
+	o.texcoordAndAlpha.a = vertexColor.a;
 	return o;
 }
 
@@ -43,8 +45,8 @@ uniform fixed _ShadowAlphaCutoff;
 
 fixed4 frag(vertexOutput IN) : COLOR 
 {
-	fixed4 texureColor = tex2D(_MainTex, IN.texcoord.xy);
+	fixed4 texureColor = tex2D(_MainTex, IN.texcoordAndAlpha.xy);
-	clip(texureColor.a - _ShadowAlphaCutoff);
+	clip(texureColor.a * IN.texcoordAndAlpha.a - _ShadowAlphaCutoff);
 	
 	SHADOW_CASTER_FRAGMENT(IN)
 }

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Additive.shader

@@ -88,15 +88,17 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" {
 			#include "UnityCG.cginc"
 			struct v2f { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
 			uniform float4 _MainTex_ST;
 
-			v2f vert (appdata_base v) {
+			v2f vert (appdata_base v, float4 vertexColor : COLOR) {
 				v2f o;
 				TRANSFER_SHADOW_CASTER(o)
-				o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.z = 0;
+				o.uvAndAlpha.a = vertexColor.a;
 				return o;
 			}
 
@@ -104,8 +106,8 @@ Shader "Spine/Blend Modes/Skeleton PMA Additive" {
 			uniform fixed _Cutoff;
 
 			float4 frag (v2f i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Multiply.shader

@@ -88,15 +88,17 @@ Shader "Spine/Blend Modes/Skeleton PMA Multiply" {
 			#include "UnityCG.cginc"
 			struct v2f { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
 			uniform float4 _MainTex_ST;
 
-			v2f vert (appdata_base v) {
+			v2f vert (appdata_base v, float4 vertexColor : COLOR) {
 				v2f o;
 				TRANSFER_SHADOW_CASTER(o)
-				o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.z = 0;
+				o.uvAndAlpha.a = vertexColor.a;
 				return o;
 			}
 
@@ -104,8 +106,8 @@ Shader "Spine/Blend Modes/Skeleton PMA Multiply" {
 			uniform fixed _Cutoff;
 
 			float4 frag (v2f i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/BlendModes/Spine-Skeleton-PMA-Screen.shader

@@ -88,15 +88,17 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" {
 			#include "UnityCG.cginc"
 			struct v2f { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
 			uniform float4 _MainTex_ST;
 
-			v2f vert (appdata_base v) {
+			v2f vert (appdata_base v, float4 vertexColor : COLOR) {
 				v2f o;
 				TRANSFER_SHADOW_CASTER(o)
-				o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.z = 0;
+				o.uvAndAlpha.a = vertexColor.a;
 				return o;
 			}
 
@@ -104,8 +106,8 @@ Shader "Spine/Blend Modes/Skeleton PMA Screen" {
 			uniform fixed _Cutoff;
 
 			float4 frag (v2f i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton-TintBlack.shader

@@ -100,19 +100,20 @@ Shader "Spine/Skeleton Tint Black" {
 
 			struct v2f { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
-			v2f vert (appdata_base v) {
+			v2f vert (appdata_base v, float4 vertexColor : COLOR) {
 				v2f o;
 				TRANSFER_SHADOW_CASTER(o)
-				o.uv = v.texcoord;
+				o.uvAndAlpha = v.texcoord;
+				o.uvAndAlpha.a = vertexColor.a;
 				return o;
 			}
 
 			float4 frag (v2f i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-Skeleton.shader

@@ -84,19 +84,20 @@ Shader "Spine/Skeleton" {
 
 			struct VertexOutput { 
 				V2F_SHADOW_CASTER;
-				float2 uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
-			VertexOutput vert (appdata_base v) {
+			VertexOutput vert (appdata_base v, float4 vertexColor : COLOR) {
 				VertexOutput o;
-				o.uv = v.texcoord;
+				o.uvAndAlpha = v.texcoord;
+				o.uvAndAlpha.a = vertexColor.a;
 				TRANSFER_SHADOW_CASTER(o)
 				return o;
 			}
 
 			float4 frag (VertexOutput i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG

spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Spine-SkeletonLit.shader

@@ -179,15 +179,17 @@ Shader "Spine/Skeleton Lit" {
 			#include "UnityCG.cginc"
 			struct v2f { 
 				V2F_SHADOW_CASTER;
-				float2  uv : TEXCOORD1;
+				float4 uvAndAlpha : TEXCOORD1;
 			};
 
 			uniform float4 _MainTex_ST;
 
-			v2f vert (appdata_base v) {
+			v2f vert (appdata_base v, float4 vertexColor : COLOR) {
 				v2f o;
 				TRANSFER_SHADOW_CASTER(o)
-				o.uv = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.xy = TRANSFORM_TEX(v.texcoord, _MainTex);
+				o.uvAndAlpha.z = 0;
+				o.uvAndAlpha.a = vertexColor.a;
 				return o;
 			}
 
@@ -195,8 +197,8 @@ Shader "Spine/Skeleton Lit" {
 			uniform fixed _Cutoff;
 
 			float4 frag (v2f i) : COLOR {
-				fixed4 texcol = tex2D(_MainTex, i.uv);
+				fixed4 texcol = tex2D(_MainTex, i.uvAndAlpha.xy);
-				clip(texcol.a - _Cutoff);
+				clip(texcol.a * i.uvAndAlpha.a - _Cutoff);
 				SHADOW_CASTER_FRAGMENT(i)
 			}
 			ENDCG