UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-09 08:38:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed SlotData#path.

Browse Source 
The name now always contains the full path.
This commit is contained in:
Nathan Sweet 2024-05-14 15:28:59 -04:00
parent 6c89b10972
commit 687260a384
3 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,15 +224,7 @@ public class SkeletonBinary extends SkeletonLoader {
// Slots.
Object[] slots = skeletonData.slots.setSize(n = input.readInt(true));
for (int i = 0; i < n; i++) {
String slotName = input.readString(), path = null;
if (nonessential) {
int slash = slotName.lastIndexOf('/');
if (slash != -1) {
path = slotName.substring(0, slash);
slotName = slotName.substring(slash + 1);
}
}
String slotName = input.readString();
BoneData boneData = (BoneData)bones[input.readInt(true)];
SlotData data = new SlotData(i, slotName, boneData);
Color.rgba8888ToColor(data.color, input.readInt());
@ -242,10 +234,7 @@ public class SkeletonBinary extends SkeletonLoader {
data.attachmentName = input.readStringRef();
data.blendMode = BlendMode.values[input.readInt(true)];
if (nonessential) {
data.visible = input.readBoolean();
data.path = path;
}
if (nonessential) data.visible = input.readBoolean();
slots[i] = data;
}

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

@ -181,13 +181,7 @@ public class SkeletonJson extends SkeletonLoader {
// Slots.
for (JsonValue slotMap = root.getChild("slots"); slotMap != null; slotMap = slotMap.next) {
String slotName = slotMap.getString("name"), path = null;
int slash = slotName.lastIndexOf('/');
if (slash != -1) {
path = slotName.substring(0, slash);
slotName = slotName.substring(slash + 1);
}
String slotName = slotMap.getString("name");
String boneName = slotMap.getString("bone");
BoneData boneData = skeletonData.findBone(boneName);
if (boneData == null) throw new SerializationException("Slot bone not found: " + boneName);
@ -203,7 +197,6 @@ public class SkeletonJson extends SkeletonLoader {
data.attachmentName = slotMap.getString("attachment", null);
data.blendMode = BlendMode.valueOf(slotMap.getString("blend", BlendMode.normal.name()));
data.visible = slotMap.getBoolean("visible", true);
data.path = path;
skeletonData.slots.add(data);
}

10
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SlotData.java
View File

@ -44,7 +44,6 @@ public class SlotData {
// Nonessential.
boolean visible = true;
String path;
public SlotData (int index, String name, BoneData boneData) {
if (index < 0) throw new IllegalArgumentException("index must be >= 0.");
@ -114,15 +113,6 @@ public class SlotData {
this.visible = visible;
}
/** The folders for this slot in the draw order, delimited by <code>/</code>, or null if nonessential data was not exported. */
public @Null String getPath () {
return path;
}
public void setPath (String path) {
this.path = path;
}
public String toString () {
return name;
}