Skip to content

Commit 91db26e

Browse files
committed
[haxe] Port of commit 687260a: Removed SlotData#path.
The name now always contains the full path.
1 parent 24dc328 commit 91db26e

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

spine-haxe/spine-haxe/spine/SkeletonBinary.hx

+2-12
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,7 @@ class SkeletonBinary {
193193
n = input.readInt(true);
194194
for (i in 0...n) {
195195
var slotName:String = input.readString();
196-
var path:String = null;
197-
if (nonessential) {
198-
var slash:Int = slotName.lastIndexOf('/');
199-
if (slash != -1) {
200-
path = slotName.substring(0, slash);
201-
slotName = slotName.substring(slash + 1);
202-
}
203-
}
196+
204197
var slotBoneData:BoneData = skeletonData.bones[input.readInt(true)];
205198
var slotData:SlotData = new SlotData(i, slotName, slotBoneData);
206199
slotData.color.setFromRgba8888(input.readInt32());
@@ -213,10 +206,7 @@ class SkeletonBinary {
213206

214207
slotData.attachmentName = input.readStringRef();
215208
slotData.blendMode = BlendMode.values[input.readInt(true)];
216-
if (nonessential) {
217-
slotData.visible = input.readBoolean();
218-
slotData.path = path;
219-
}
209+
if (nonessential) slotData.visible = input.readBoolean();
220210
skeletonData.slots.push(slotData);
221211
}
222212

spine-haxe/spine-haxe/spine/SkeletonJson.hx

-6
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,6 @@ class SkeletonJson {
150150
for (slotMap in cast(Reflect.getProperty(root, "slots"), Array<Dynamic>)) {
151151
var path:String = null;
152152
var slotName:String = Reflect.getProperty(slotMap, "name");
153-
var slash:Int = slotName.lastIndexOf('/');
154-
if (slash != -1) {
155-
path = slotName.substring(0, slash);
156-
slotName = slotName.substring(slash + 1);
157-
}
158153

159154
var boneName:String = Reflect.getProperty(slotMap, "bone");
160155
boneData = skeletonData.findBone(boneName);
@@ -176,7 +171,6 @@ class SkeletonJson {
176171
slotData.attachmentName = Reflect.getProperty(slotMap, "attachment");
177172
slotData.blendMode = Reflect.hasField(slotMap, "blend") ? BlendMode.fromName(Reflect.getProperty(slotMap, "blend")) : BlendMode.normal;
178173
slotData.visible = getValue(slotMap, "visible", true);
179-
slotData.path = path;
180174
skeletonData.slots.push(slotData);
181175
}
182176

spine-haxe/spine-haxe/spine/SlotData.hx

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class SlotData {
3939
public var attachmentName:String;
4040
public var blendMode:BlendMode = BlendMode.normal;
4141
public var visible:Bool = true;
42-
public var path:String = null;
4342

4443
public function new(index:Int, name:String, boneData:BoneData) {
4544
if (index < 0)

0 commit comments

Comments
 (0)