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

[libgdx] Allow calling RegionAttachment#updateRegion when region is null.

Browse Source 
Mesh already allows this. SkeletonJson/Binary call `updateRegion` when the sequence is null, which fails before this commit if the attachment loader doesn't set a region. That is a valid usecase, eg to set regions later.

This also orders setting the UVs array indices to 0-7.
This commit is contained in:
Nathan Sweet 2022-09-13 18:12:31 -04:00
parent 537978eb0a
commit d6adbe96d8
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/attachments/RegionAttachment.java
View File

@ -81,6 +81,18 @@ public class RegionAttachment extends Attachment implements HasTextureRegion {
/** Calculates the {@link #offset} and {@link #uvs} using the region and the attachment's transform. Must be called if the /** Calculates the {@link #offset} and {@link #uvs} using the region and the attachment's transform. Must be called if the
* region, the region's properties, or the transform are changed. */ * region, the region's properties, or the transform are changed. */
public void updateRegion () { public void updateRegion () {
if (region == null) {
uvs[BLX] = 0;
uvs[BLY] = 0;
uvs[ULX] = 1;
uvs[ULY] = 1;
uvs[URX] = 1;
uvs[URY] = 1;
uvs[BRX] = 1;
uvs[BRY] = 0;
return;
}
float width = getWidth(); float width = getWidth();
float height = getHeight(); float height = getHeight();
float localX2 = width / 2; float localX2 = width / 2;
@ -132,23 +144,23 @@ public class RegionAttachment extends Attachment implements HasTextureRegion {
float[] uvs = this.uvs; float[] uvs = this.uvs;
if (rotated) { if (rotated) {
uvs[URX] = region.getU();
uvs[URY] = region.getV2();
uvs[BRX] = region.getU();
uvs[BRY] = region.getV();
uvs[BLX] = region.getU2(); uvs[BLX] = region.getU2();
uvs[BLY] = region.getV(); uvs[BLY] = region.getV();
uvs[ULX] = region.getU2(); uvs[ULX] = region.getU2();
uvs[ULY] = region.getV2(); uvs[ULY] = region.getV2();
uvs[URX] = region.getU();
uvs[URY] = region.getV2();
uvs[BRX] = region.getU();
uvs[BRY] = region.getV();
} else { } else {
uvs[BLX] = region.getU2();
uvs[BLY] = region.getV2();
uvs[ULX] = region.getU(); uvs[ULX] = region.getU();
uvs[ULY] = region.getV2(); uvs[ULY] = region.getV2();
uvs[URX] = region.getU(); uvs[URX] = region.getU();
uvs[URY] = region.getV(); uvs[URY] = region.getV();
uvs[BRX] = region.getU2(); uvs[BRX] = region.getU2();
uvs[BRY] = region.getV(); uvs[BRY] = region.getV();
uvs[BLX] = region.getU2();
uvs[BLY] = region.getV2();
} }
} }