UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 17:56:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow access to the skin in attachment loader.

Browse Source
This commit is contained in:
NathanSweet 2013-04-11 06:14:53 +02:00
parent 7453edd1e5
commit d5d5839a15
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-libgdx/src/com/esotericsoftware/spine/AttachmentLoader.java
View File

@ -27,5 +27,5 @@ package com.esotericsoftware.spine;
public interface AttachmentLoader { public interface AttachmentLoader {
/** @return May be null to not load any attachment. */ /** @return May be null to not load any attachment. */
public Attachment newAttachment (AttachmentType type, String name); public Attachment newAttachment (Skin skin, AttachmentType type, String name);
} }

6
spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java
View File

@ -154,18 +154,18 @@ public class SkeletonBinary {
int attachmentCount = input.readInt(true); int attachmentCount = input.readInt(true);
for (int ii = 0; ii < attachmentCount; ii++) { for (int ii = 0; ii < attachmentCount; ii++) {
String name = input.readString(); String name = input.readString();
skin.addAttachment(slotIndex, name, readAttachment(input, name)); skin.addAttachment(slotIndex, name, readAttachment(input, skin, name));
} }
} }
return skin; return skin;
} }
private Attachment readAttachment (DataInput input, String attachmentName) throws IOException { private Attachment readAttachment (DataInput input, Skin skin, String attachmentName) throws IOException {
String name = input.readString(); String name = input.readString();
if (name == null) name = attachmentName; if (name == null) name = attachmentName;
AttachmentType type = AttachmentType.values()[input.readByte()]; AttachmentType type = AttachmentType.values()[input.readByte()];
Attachment attachment = attachmentLoader.newAttachment(type, name); Attachment attachment = attachmentLoader.newAttachment(skin, type, name);
if (attachment instanceof RegionSequenceAttachment) { if (attachment instanceof RegionSequenceAttachment) {
RegionSequenceAttachment regionSequenceAttachment = (RegionSequenceAttachment)attachment; RegionSequenceAttachment regionSequenceAttachment = (RegionSequenceAttachment)attachment;

6
spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
View File

@ -129,7 +129,7 @@ public class SkeletonJson {
for (Entry<String, OrderedMap> slotEntry : ((OrderedMap<String, OrderedMap>)entry.value).entries()) { for (Entry<String, OrderedMap> slotEntry : ((OrderedMap<String, OrderedMap>)entry.value).entries()) {
int slotIndex = skeletonData.findSlotIndex(slotEntry.key); int slotIndex = skeletonData.findSlotIndex(slotEntry.key);
for (Entry<String, OrderedMap> attachmentEntry : ((OrderedMap<String, OrderedMap>)slotEntry.value).entries()) { for (Entry<String, OrderedMap> attachmentEntry : ((OrderedMap<String, OrderedMap>)slotEntry.value).entries()) {
Attachment attachment = readAttachment(attachmentEntry.key, attachmentEntry.value); Attachment attachment = readAttachment(skin, attachmentEntry.key, attachmentEntry.value);
if (attachment != null) skin.addAttachment(slotIndex, attachmentEntry.key, attachment); if (attachment != null) skin.addAttachment(slotIndex, attachmentEntry.key, attachment);
} }
} }
@ -152,11 +152,11 @@ public class SkeletonJson {
return skeletonData; return skeletonData;
} }
private Attachment readAttachment (String name, OrderedMap map) { private Attachment readAttachment (Skin skin, String name, OrderedMap map) {
name = (String)map.get("name", name); name = (String)map.get("name", name);
AttachmentType type = AttachmentType.valueOf((String)map.get("type", AttachmentType.region.name())); AttachmentType type = AttachmentType.valueOf((String)map.get("type", AttachmentType.region.name()));
Attachment attachment = attachmentLoader.newAttachment(type, name); Attachment attachment = attachmentLoader.newAttachment(skin, type, name);
if (attachment instanceof RegionSequenceAttachment) { if (attachment instanceof RegionSequenceAttachment) {
RegionSequenceAttachment regionSequenceAttachment = (RegionSequenceAttachment)attachment; RegionSequenceAttachment regionSequenceAttachment = (RegionSequenceAttachment)attachment;

3
spine-libgdx/src/com/esotericsoftware/spine/attachments/AtlasAttachmentLoader.java
View File

@ -28,6 +28,7 @@ package com.esotericsoftware.spine.attachments;
import com.esotericsoftware.spine.Attachment; import com.esotericsoftware.spine.Attachment;
import com.esotericsoftware.spine.AttachmentLoader; import com.esotericsoftware.spine.AttachmentLoader;
import com.esotericsoftware.spine.AttachmentType; import com.esotericsoftware.spine.AttachmentType;
import com.esotericsoftware.spine.Skin;
import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.g2d.TextureAtlas;
import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion; import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion;
@ -40,7 +41,7 @@ public class AtlasAttachmentLoader implements AttachmentLoader {
this.atlas = atlas; this.atlas = atlas;
} }
public Attachment newAttachment (AttachmentType type, String name) { public Attachment newAttachment (Skin skin, AttachmentType type, String name) {
Attachment attachment = null; Attachment attachment = null;
switch (type) { switch (type) {
case region: case region: