From 3bf261dc4b99ef63e41a2f9b019a684fadf10f0a Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Thu, 13 Oct 2016 18:05:00 +0200 Subject: [PATCH] Clean up. --- .../src/com/esotericsoftware/spine/Skeleton.java | 2 +- .../src/com/esotericsoftware/spine/SkeletonBounds.java | 2 +- .../com/esotericsoftware/spine/SkeletonMeshRenderer.java | 2 +- .../src/com/esotericsoftware/spine/SkeletonRenderer.java | 2 +- .../com/esotericsoftware/spine/SkeletonRendererDebug.java | 6 +++--- .../spine-libgdx/src/com/esotericsoftware/spine/Skin.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java index 8b52e8bec..3886cb033 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skeleton.java @@ -557,7 +557,7 @@ public class Skeleton { for (int i = 0, n = drawOrder.size; i < n; i++) { Slot slot = drawOrder.get(i); float[] vertices = null; - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (attachment instanceof RegionAttachment) vertices = ((RegionAttachment)attachment).updateWorldVertices(slot, false); else if (attachment instanceof MeshAttachment) // diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java index 4811be41a..8ebaf5044 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBounds.java @@ -60,7 +60,7 @@ public class SkeletonBounds { for (int i = 0; i < slotCount; i++) { Slot slot = slots.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (attachment instanceof BoundingBoxAttachment) { BoundingBoxAttachment boundingBox = (BoundingBoxAttachment)attachment; boundingBoxes.add(boundingBox); diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonMeshRenderer.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonMeshRenderer.java index ec1922b4f..d58796c81 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonMeshRenderer.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonMeshRenderer.java @@ -51,7 +51,7 @@ public class SkeletonMeshRenderer extends SkeletonRenderer { Array drawOrder = skeleton.drawOrder; for (int i = 0, n = drawOrder.size; i < n; i++) { Slot slot = drawOrder.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; Texture texture = null; if (attachment instanceof RegionAttachment) { RegionAttachment region = (RegionAttachment)attachment; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java index 619ea30c1..dd76d4370 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRenderer.java @@ -46,7 +46,7 @@ public class SkeletonRenderer { Array drawOrder = skeleton.drawOrder; for (int i = 0, n = drawOrder.size; i < n; i++) { Slot slot = drawOrder.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (attachment instanceof RegionAttachment) { RegionAttachment regionAttachment = (RegionAttachment)attachment; float[] vertices = regionAttachment.updateWorldVertices(slot, premultipliedAlpha); diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java index f10ac29b0..4bf701e95 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonRendererDebug.java @@ -104,7 +104,7 @@ public class SkeletonRendererDebug { Array slots = skeleton.getSlots(); for (int i = 0, n = slots.size; i < n; i++) { Slot slot = slots.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (attachment instanceof RegionAttachment) { RegionAttachment regionAttachment = (RegionAttachment)attachment; float[] vertices = regionAttachment.updateWorldVertices(slot, false); @@ -120,7 +120,7 @@ public class SkeletonRendererDebug { Array slots = skeleton.getSlots(); for (int i = 0, n = slots.size; i < n; i++) { Slot slot = slots.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (!(attachment instanceof MeshAttachment)) continue; MeshAttachment mesh = (MeshAttachment)attachment; mesh.updateWorldVertices(slot, false); @@ -169,7 +169,7 @@ public class SkeletonRendererDebug { Array slots = skeleton.getSlots(); for (int i = 0, n = slots.size; i < n; i++) { Slot slot = slots.get(i); - Attachment attachment = slot.getAttachment(); + Attachment attachment = slot.attachment; if (!(attachment instanceof PathAttachment)) continue; PathAttachment path = (PathAttachment)attachment; int nn = path.getWorldVerticesLength(); diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java index 7cd96018b..7858f28c9 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Skin.java @@ -101,7 +101,7 @@ public class Skin { for (Entry entry : oldSkin.attachments.entries()) { int slotIndex = entry.key.slotIndex; Slot slot = skeleton.slots.get(slotIndex); - if (slot.getAttachment() == entry.value) { + if (slot.attachment == entry.value) { Attachment attachment = getAttachment(slotIndex, entry.key.name); if (attachment != null) slot.setAttachment(attachment); }