Jelajahi Sumber

Merge branch '4.1' into 4.2-beta

Harald Csaszar 1 tahun lalu
induk
melakukan
7aeb4c3a27

+ 1 - 1
spine-flutter/README.md

@@ -1,6 +1,6 @@
 # spine-flutter
 
-The spine-godot runtime provides functionality to load, manipulate and render [Spine](https://esotericsoftware.com) skeletal animation data using [Flutter](https://flutter.dev/). spine-flutter is based on [spine-cpp](../spine-cpp) and supports desktop and mobile Flutter deployment targets. spine-flutter does not support Flutter's web deployment target.
+The spine-flutter runtime provides functionality to load, manipulate and render [Spine](https://esotericsoftware.com) skeletal animation data using [Flutter](https://flutter.dev/). spine-flutter is based on [spine-cpp](../spine-cpp) and supports desktop and mobile Flutter deployment targets. spine-flutter does not support Flutter's web deployment target.
 
 # See the [spine-flutter documentation](https://esotericsoftware.com/spine-flutter) for in-depth information.
 

+ 1 - 0
spine-ts/spine-pixi/src/SlotMesh.ts

@@ -99,6 +99,7 @@ export class SlotMesh extends Mesh implements ISlotMesh {
 		SlotMesh.auxColor[3] = finalVertices[5];
 
 		this.tint = SlotMesh.auxColor;
+		this.alpha = SlotMesh.auxColor[3];
 		this.blendMode = SpineTexture.toPixiBlending(slotBlendMode);
 
 		if (this.geometry.indexBuffer.data.length !== finalIndices.length) {

+ 6 - 5
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs

@@ -779,11 +779,12 @@ namespace Spine.Unity.AttachmentTools {
 			float v2 = uvRect.yMin;
 
 			if (referenceRegion.degrees == 270) {
-				// at a 270 degree region, u2/v2 deltas are swapped, and delta-v is negative.
-				float du = u2 - u;
-				float dv = v - v2;
-				u2 = u + dv;
-				v2 = v - du;
+				// at a 270 degree region, u2/v2 deltas and atlas width/height are swapped, and delta-v is negative.
+				float du = uvRect.width; // u2 - u;
+				float dv = uvRect.height; // v - v2;
+				float atlasAspectRatio = page.width / page.height;
+				u2 = u + (dv / atlasAspectRatio);
+				v2 = v - (du * atlasAspectRatio);
 			}
 
 			return new AtlasRegion {

+ 1 - 1
spine-unity/Assets/Spine/package.json

@@ -2,7 +2,7 @@
 	"name": "com.esotericsoftware.spine.spine-unity",
 	"displayName": "spine-unity Runtime",
 	"description": "This plugin provides the spine-unity runtime core.",
-	"version": "4.2.40",
+	"version": "4.2.41",
 	"unity": "2018.3",
 	"author": {
 		"name": "Esoteric Software",