Skip to content

Commit 9215a2f

Browse files
author
punkice3407
committed
1 parent 48e888b commit 9215a2f

4 files changed

Lines changed: 37 additions & 26 deletions

File tree

‎src/ObjectBuilder.mxml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ THE SOFTWARE.
230230
private var _clientChanged:Boolean;
231231
private var _clientIsTemporary:Boolean;
232232
private var _clientLoaded:Boolean;
233-
233+
234234
//--------------------------------------
235235
// Getters / Setters
236236
//--------------------------------------
@@ -1254,14 +1254,13 @@ THE SOFTWARE.
12541254
12551255
var extra:String = "";
12561256
if(format == OTFormat.OBD)
1257-
extra = "-" + clientVersion.toString() + "-v" + obdVersion.toString().substring(0, 1);
1257+
extra = clientVersion.toString() + "-v" + obdVersion.toString().substring(0, 1);
12581258
12591259
var length:uint = things.length;
12601260
for (var i:uint = 0; i < length; i++) {
12611261
var id:uint = things[i].id;
1262-
var name:String = fileName + "_" + id.toString() + extra.replace(" ", "").replace(".", "");
12631262
1264-
queue.addFile(id, name, format, directory);
1263+
queue.addFile(id, fileName + "_" + id.toString() + "_" + extra.replace(" ", "").replace(".", ""), format, directory);
12651264
}
12661265
queue.start();
12671266
@@ -1283,13 +1282,12 @@ THE SOFTWARE.
12831282
var queue:FileQueueHelper = new FileQueueHelper();
12841283
queue.parent = this;
12851284
queue.addEventListener(Event.COMPLETE, completeHandler);
1286-
var changeName:Boolean = (fileName.indexOf("_") == -1);
12871285
12881286
var length:uint = sprites.length;
12891287
for (var i:uint = 0; i < length; i++) {
12901288
var id:uint = sprites[i].id;
1291-
var name:String = !changeName ? fileName : (name = fileName + "_" + id);
1292-
queue.addFile(id, name, format, directory);
1289+
1290+
queue.addFile(id, fileName + "_" + id.toString(), format, directory);
12931291
}
12941292
queue.start();
12951293
@@ -1669,7 +1667,7 @@ THE SOFTWARE.
16691667
16701668
thingTypeEditor.settings = _settings;
16711669
thingTypeEditor.bindableThingType.settings = _settings;
1672-
1670+
16731671
_logTarget.writeStart();
16741672
}
16751673
@@ -1847,7 +1845,7 @@ THE SOFTWARE.
18471845
return;
18481846
}
18491847
1850-
FileUtil.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
1848+
ObUtils.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
18511849
18521850
for (var i:uint = 0; i < length; i++) {
18531851
list[i] = new PathHelper(files[i].nativePath, selectedIds[i]);
@@ -1875,7 +1873,7 @@ THE SOFTWARE.
18751873
var length:uint = files.length;
18761874
var list:Vector.<PathHelper> = new Vector.<PathHelper>(length, true);
18771875
1878-
FileUtil.sortFiles(files, Array.NUMERIC);
1876+
ObUtils.sortFiles(files, Array.NUMERIC);
18791877
18801878
for (var i:uint = 0; i < length; i++) {
18811879
list[i] = new PathHelper(files[i].nativePath, i);
@@ -2035,6 +2033,8 @@ THE SOFTWARE.
20352033
var length:uint = dropfiles.length;
20362034
var list:Vector.<PathHelper> = new Vector.<PathHelper>();
20372035
2036+
ObUtils.sortFiles(dropfiles, Array.NUMERIC);
2037+
20382038
for (var i:uint = 0; i < length; i++) {
20392039
var file:File = dropfiles[i];
20402040
if (file.extension == OTFormat.OBD) {
@@ -2133,7 +2133,7 @@ THE SOFTWARE.
21332133
return;
21342134
}
21352135
2136-
FileUtil.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
2136+
ObUtils.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
21372137
21382138
for (var i:uint = 0; i < length; i++) {
21392139
list[i] = new PathHelper(files[i].nativePath, selectedIds[i]);
@@ -2196,7 +2196,7 @@ THE SOFTWARE.
21962196
if (length > 0)
21972197
_settings.setIODirectory(files[0]);
21982198
2199-
FileUtil.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
2199+
ObUtils.sortFiles(files, Array.NUMERIC | Array.DESCENDING);
22002200
22012201
for (var i:uint = 0; i < length; i++) {
22022202
list[i] = new PathHelper(files[i].nativePath, i);
@@ -2293,7 +2293,7 @@ THE SOFTWARE.
22932293
if (clipboard.hasFormat(ClipboardFormats.FILE_LIST_FORMAT)) {
22942294
var dropfiles:Array = clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
22952295
2296-
FileUtil.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
2296+
ObUtils.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
22972297
22982298
var length:uint = dropfiles.length;
22992299
var list:Vector.<PathHelper> = new Vector.<PathHelper>();
@@ -2413,11 +2413,11 @@ THE SOFTWARE.
24132413
24142414
case Menu.TOOLS_FRAME_DURATIONS_OPTIMIZER:
24152415
openFrameDurationsOptimizer();
2416-
break;
2416+
break;
24172417
24182418
case Menu.TOOLS_FRAME_GROUPS_CONVERTER:
24192419
openFrameGroupsConverter();
2420-
break;
2420+
break;
24212421
24222422
case Menu.WINDOW_LOG:
24232423
openLogWindow();

‎src/com/mignari/animator/AnimationEditor.mxml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ THE SOFTWARE.
4848
import com.worlize.gif.GIFDecoder;
4949
import com.worlize.gif.GIFFrame;
5050
import com.worlize.gif.events.GIFDecoderEvent;
51-
51+
5252
import mx.events.DragEvent;
5353
import mx.events.FlexEvent;
5454
import mx.events.MoveEvent;
5555
import mx.managers.DragManager;
56-
56+
5757
import spark.events.IndexChangeEvent;
58-
58+
5959
import nail.assets.NailAssets;
6060
import nail.components.controls.Alert;
6161
import nail.image.ClipboardBitmapLoader;
@@ -67,9 +67,9 @@ THE SOFTWARE.
6767
import nail.utils.SaveHelper;
6868
import nail.utils.StringUtil;
6969
import nail.utils.WindowUtil;
70-
70+
7171
import ob.utils.ObUtils;
72-
72+
7373
import otlib.animation.FrameDuration;
7474
import otlib.animation.FrameGroup;
7575
import otlib.assets.Assets;
@@ -356,7 +356,7 @@ THE SOFTWARE.
356356
var height:uint = _size.height;
357357
var thing:ThingType = new ThingType();
358358
var frameGroup:FrameGroup = new FrameGroup();
359-
359+
360360
thing.category = getCurrentCategory();
361361
thing.id = 0;
362362
frameGroup.width = (width / 32);
@@ -376,7 +376,7 @@ THE SOFTWARE.
376376
377377
var sprites:Dictionary = new Dictionary();
378378
sprites[FrameGroupType.DEFAULT] = new Vector.<SpriteData>(spriteCount);
379-
379+
380380
var id:uint = uint.MAX_VALUE;
381381
var rect:Rectangle = new Rectangle(0, 0, 32, 32);
382382
var f:uint;
@@ -719,7 +719,7 @@ THE SOFTWARE.
719719
if (clipboard.hasFormat(ClipboardFormats.FILE_LIST_FORMAT)) {
720720
var dropfiles:Array = clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
721721
722-
FileUtil.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
722+
ObUtils.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
723723
724724
var length:uint = dropfiles.length;
725725
var list:Vector.<File> = new Vector.<File>();

‎src/ob/utils/ObUtils.as‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,19 @@ package ob.utils
139139
var id:uint = 0;
140140
var file : File = list[i];
141141
var name:String = FileUtil.getName(file);
142-
var index:int = name.indexOf("_");
143-
if (index != -1) id = parseInt(name.split("_")[1]);
142+
143+
var parts:Array = name.split("_");
144+
if (parts.length > 1) {
145+
id = parseInt(parts[1])
146+
} else {
147+
var extensionIndex:int = name.indexOf(".");
148+
if (extensionIndex != -1) {
149+
id = parseInt(name.substring(0, extensionIndex))
150+
} else {
151+
id = parseInt(name)
152+
}
153+
}
154+
144155
array[i] = {id:id, file:file};
145156
}
146157

‎src/slicer/Slicer.mxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ THE SOFTWARE.
517517
if (clipboard.hasFormat(ClipboardFormats.FILE_LIST_FORMAT)) {
518518
var dropfiles:Array = clipboard.getData(ClipboardFormats.FILE_LIST_FORMAT) as Array;
519519
520-
FileUtil.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
520+
ObUtils.sortFiles(dropfiles, Array.NUMERIC | Array.DESCENDING);
521521
522522
var length:uint = dropfiles.length;
523523
var list:Vector.<File> = new Vector.<File>();

0 commit comments

Comments
 (0)