UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-23 02:06:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2024-01-10 17:16:26 +01:00
commit 7aeb4c3a27
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-flutter/README.md
View File

@ -1,6 +1,6 @@
# spine-flutter # 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. # See the [spine-flutter documentation](https://esotericsoftware.com/spine-flutter) for in-depth information.

1
spine-ts/spine-pixi/src/SlotMesh.ts
View File

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

11
spine-unity/Assets/Spine/Runtime/spine-unity/Utility/AtlasUtilities.cs
View File

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

2
spine-unity/Assets/Spine/package.json
View File

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