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

[unity] Fixed incorrectly repacked MeshAttachment regions when rotated 270 degrees. Closes #2181.

Browse Source
This commit is contained in:
Harald Csaszar 2022-11-03 16:08:08 +01:00
parent 4e5fed4251
commit bb851ee489
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -505,14 +505,14 @@ namespace Spine.Unity.AttachmentTools {
newSkin.Constraints.AddRange(o.Constraints); newSkin.Constraints.AddRange(o.Constraints);
inoutAttachments.Clear(); inoutAttachments.Clear();
foreach (var entry in o.Attachments) { foreach (var entry in skinAttachments) {
inoutAttachments.Add(entry.Attachment); inoutAttachments.Add(entry.Attachment);
} }
GetRepackedAttachments(inoutAttachments, inoutAttachments, materialPropertySource, out outputMaterial, out outputTexture, GetRepackedAttachments(inoutAttachments, inoutAttachments, materialPropertySource, out outputMaterial, out outputTexture,
maxAtlasSize, padding, textureFormat, mipmaps, newName, clearCache, useOriginalNonrenderables, maxAtlasSize, padding, textureFormat, mipmaps, newName, clearCache, useOriginalNonrenderables,
additionalTexturePropertyIDsToCopy, additionalOutputTextures, additionalTextureFormats, additionalTextureIsLinear); additionalTexturePropertyIDsToCopy, additionalOutputTextures, additionalTextureFormats, additionalTextureIsLinear);
int i = 0; int i = 0;
foreach (var originalSkinEntry in o.Attachments) { foreach (var originalSkinEntry in skinAttachments) {
var newAttachment = inoutAttachments[i++]; var newAttachment = inoutAttachments[i++];
newSkin.SetAttachment(originalSkinEntry.SlotIndex, originalSkinEntry.Name, newAttachment); newSkin.SetAttachment(originalSkinEntry.SlotIndex, originalSkinEntry.Name, newAttachment);
} }
@ -680,7 +680,13 @@ namespace Spine.Unity.AttachmentTools {
/// <summary> /// <summary>
/// Returns a Rect of the AtlasRegion according to Spine texture coordinates. (x-right, y-down)</summary> /// Returns a Rect of the AtlasRegion according to Spine texture coordinates. (x-right, y-down)</summary>
static Rect GetSpineAtlasRect (this AtlasRegion region, bool includeRotate = true) { static Rect GetSpineAtlasRect (this AtlasRegion region, bool includeRotate = true) {
return new Rect(region.x, region.y, region.packedWidth, region.packedHeight); float width = region.packedWidth;
float height = region.packedHeight;
if (includeRotate && region.degrees == 270) {
width = region.packedHeight;
height = region.packedWidth;
}
return new Rect(region.x, region.y, width, height);
} }
/// <summary> /// <summary>
@ -706,13 +712,20 @@ namespace Spine.Unity.AttachmentTools {
/// <summary> /// <summary>
/// Creates a new Spine AtlasRegion according to a Unity UV Rect (x-right, y-up, uv-normalized).</summary> /// Creates a new Spine AtlasRegion according to a Unity UV Rect (x-right, y-up, uv-normalized).</summary>
static AtlasRegion UVRectToAtlasRegion (Rect uvRect, AtlasRegion referenceRegion, AtlasPage page) { static AtlasRegion UVRectToAtlasRegion (Rect uvRect, AtlasRegion referenceRegion, AtlasPage page) {
var tr = UVRectToTextureRect(uvRect, page.width, page.height); Rect tr = UVRectToTextureRect(uvRect, page.width, page.height);
var rr = tr.SpineUnityFlipRect(page.height); Rect rr = tr.SpineUnityFlipRect(page.height);
int x = (int)rr.x; int x = (int)rr.x;
int y = (int)rr.y; int y = (int)rr.y;
int w = (int)rr.width; int w = (int)rr.width;
int h = (int)rr.height; int h = (int)rr.height;
if (referenceRegion.degrees == 270) {
int tempW = w;
w = h;
h = tempW;
}
// Note: originalW and originalH need to be scaled according to the // Note: originalW and originalH need to be scaled according to the
// repacked width and height, repacking can mess with aspect ratio, etc. // repacked width and height, repacking can mess with aspect ratio, etc.
int originalW = Mathf.RoundToInt((float)w * ((float)referenceRegion.originalWidth / (float)referenceRegion.width)); int originalW = Mathf.RoundToInt((float)w * ((float)referenceRegion.originalWidth / (float)referenceRegion.width));
@ -726,6 +739,14 @@ namespace Spine.Unity.AttachmentTools {
float v = uvRect.yMax; float v = uvRect.yMax;
float v2 = uvRect.yMin; 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;
}
return new AtlasRegion { return new AtlasRegion {
page = page, page = page,
name = referenceRegion.name, name = referenceRegion.name,