[haxe] Port of commit 687260a: Removed SlotData#path.

The name now always contains the full path.
This commit is contained in:
Davide Tantillo 2024-05-15 10:34:32 +02:00
parent 24dc328b15
commit 91db26ee40
3 changed files with 2 additions and 19 deletions

View File

@ -193,14 +193,7 @@ class SkeletonBinary {
n = input.readInt(true);
for (i in 0...n) {
var slotName:String = input.readString();
var path:String = null;
if (nonessential) {
var slash:Int = slotName.lastIndexOf('/');
if (slash != -1) {
path = slotName.substring(0, slash);
slotName = slotName.substring(slash + 1);
}
}
var slotBoneData:BoneData = skeletonData.bones[input.readInt(true)];
var slotData:SlotData = new SlotData(i, slotName, slotBoneData);
slotData.color.setFromRgba8888(input.readInt32());
@ -213,10 +206,7 @@ class SkeletonBinary {
slotData.attachmentName = input.readStringRef();
slotData.blendMode = BlendMode.values[input.readInt(true)];
if (nonessential) {
slotData.visible = input.readBoolean();
slotData.path = path;
}
if (nonessential) slotData.visible = input.readBoolean();
skeletonData.slots.push(slotData);
}

View File

@ -150,11 +150,6 @@ class SkeletonJson {
for (slotMap in cast(Reflect.getProperty(root, "slots"), Array<Dynamic>)) {
var path:String = null;
var slotName:String = Reflect.getProperty(slotMap, "name");
var slash:Int = slotName.lastIndexOf('/');
if (slash != -1) {
path = slotName.substring(0, slash);
slotName = slotName.substring(slash + 1);
}
var boneName:String = Reflect.getProperty(slotMap, "bone");
boneData = skeletonData.findBone(boneName);
@ -176,7 +171,6 @@ class SkeletonJson {
slotData.attachmentName = Reflect.getProperty(slotMap, "attachment");
slotData.blendMode = Reflect.hasField(slotMap, "blend") ? BlendMode.fromName(Reflect.getProperty(slotMap, "blend")) : BlendMode.normal;
slotData.visible = getValue(slotMap, "visible", true);
slotData.path = path;
skeletonData.slots.push(slotData);
}

View File

@ -39,7 +39,6 @@ class SlotData {
public var attachmentName:String;
public var blendMode:BlendMode = BlendMode.normal;
public var visible:Bool = true;
public var path:String = null;
public function new(index:Int, name:String, boneData:BoneData) {
if (index < 0)