mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-03-26 22:49:01 +08:00
Merge branch 'origin/master'
This commit is contained in:
commit
74b41be899
@ -57,12 +57,12 @@ public class StarlingAtlasAttachmentLoader implements AttachmentLoader {
|
|||||||
var frame:Rectangle = texture.frame;
|
var frame:Rectangle = texture.frame;
|
||||||
texture = Texture.fromTexture(texture); // Discard frame.
|
texture = Texture.fromTexture(texture); // Discard frame.
|
||||||
regionAttachment.rendererObject = new SkeletonImage(texture);
|
regionAttachment.rendererObject = new SkeletonImage(texture);
|
||||||
regionAttachment.regionOffsetX = -frame.x;
|
regionAttachment.regionOffsetX = frame ? -frame.x : 0;
|
||||||
regionAttachment.regionOffsetY = -frame.y;
|
regionAttachment.regionOffsetY = frame ? -frame.y : 0;
|
||||||
regionAttachment.regionWidth = texture.width;
|
regionAttachment.regionWidth = texture.width;
|
||||||
regionAttachment.regionHeight = texture.height;
|
regionAttachment.regionHeight = texture.height;
|
||||||
regionAttachment.regionOriginalWidth = frame.width;
|
regionAttachment.regionOriginalWidth = frame ? frame.width : texture.width;
|
||||||
regionAttachment.regionOriginalHeight = frame.height;
|
regionAttachment.regionOriginalHeight = frame ? frame.height : texture.height;
|
||||||
return regionAttachment;
|
return regionAttachment;
|
||||||
case AttachmentType.boundingbox:
|
case AttachmentType.boundingbox:
|
||||||
return new BoundingBoxAttachment(name);
|
return new BoundingBoxAttachment(name);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user