Skip to content

Commit 6fef698

Browse files
committed
Uncuddled braces
and moved private helpers to the bottom of the class
1 parent 29972cd commit 6fef698

File tree

1 file changed

+84
-84
lines changed

1 file changed

+84
-84
lines changed

flixel/animation/FlxAnimationController.hx

+84-84
Original file line numberDiff line numberDiff line change
@@ -280,23 +280,6 @@ class FlxAnimationController implements IFlxDestroyable
280280
}
281281
}
282282

283-
/**
284-
* Private helper method for add- and appendByNames. Gets frames and appends them to AddTo.
285-
*/
286-
private function byNamesHelper(AddTo:Array<Int>, FrameNames:Array<String>):Void {
287-
288-
var l:Int = FrameNames.length;
289-
for (i in 0...l)
290-
{
291-
var name:String = FrameNames[i];
292-
if (_sprite.framesData.framesHash.exists(name))
293-
{
294-
var frameToAdd:FlxFrame = _sprite.framesData.framesHash.get(name);
295-
AddTo.push(getFrameIndex(frameToAdd));
296-
}
297-
}
298-
}
299-
300283
/**
301284
* Adds a new _animations to the sprite. Should works a little bit faster than addByIndices()
302285
* @param Name What this _animations should be called (e.g. "run").
@@ -346,23 +329,6 @@ class FlxAnimationController implements IFlxDestroyable
346329
}
347330
}
348331

349-
/**
350-
* Private helper method for add- and appendByStringIndices. Gets frames and appends them to AddTo.
351-
*/
352-
private function byStringIndicesHelper(AddTo:Array<Int>, Prefix:String, Indices:Array<String>, Postfix:String):Void {
353-
354-
var l:Int = Indices.length;
355-
for (i in 0...l)
356-
{
357-
var name:String = Prefix + Indices[i] + Postfix;
358-
if (_sprite.framesData.framesHash.exists(name))
359-
{
360-
var frameToAdd:FlxFrame = _sprite.framesData.framesHash.get(name);
361-
AddTo.push(getFrameIndex(frameToAdd));
362-
}
363-
}
364-
}
365-
366332
/**
367333
* Adds a new _animations to the sprite.
368334
* @param Name What this _animations should be called (e.g. "run").
@@ -412,22 +378,6 @@ class FlxAnimationController implements IFlxDestroyable
412378
}
413379
}
414380

415-
/**
416-
* Private helper method for add- and appendByIndices. Finds frames and appends them to AddTo.
417-
*/
418-
private function byIndicesHelper(AddTo:Array<Int>, Prefix:String, Indices:Array<Int>, Postfix:String):Void {
419-
420-
var l:Int = Indices.length;
421-
for (i in 0...l)
422-
{
423-
var indexToAdd:Int = findSpriteFrame(Prefix, Indices[i], Postfix);
424-
if (indexToAdd != -1)
425-
{
426-
AddTo.push(indexToAdd);
427-
}
428-
}
429-
}
430-
431381
/**
432382
* Find a sprite frame so that for Prefix = "file"; Indice = 5; Postfix = ".png"
433383
* It will find frame with name "file5.png", but if it desn't exist it will try
@@ -511,40 +461,6 @@ class FlxAnimationController implements IFlxDestroyable
511461
}
512462
}
513463

514-
/**
515-
* Private helper method for add- and appendByPrefix. Sorts frames and appends them to AddTo.
516-
*/
517-
private function byPrefixHelper(AddTo:Array<Int>, AnimFrames:Array<FlxFrame>, Prefix:String):Void {
518-
519-
var name:String = AnimFrames[0].name;
520-
var postIndex:Int = name.indexOf(".", Prefix.length);
521-
var postFix:String = name.substring(postIndex == -1 ? name.length : postIndex, name.length);
522-
FlxAnimationController.prefixLength = Prefix.length;
523-
FlxAnimationController.postfixLength = postFix.length;
524-
AnimFrames.sort(FlxAnimationController.frameSortFunction);
525-
526-
var l:Int = AnimFrames.length;
527-
for (i in 0...l)
528-
{
529-
AddTo.push(getFrameIndex(AnimFrames[i]));
530-
}
531-
}
532-
533-
/**
534-
* Private helper method for add- and appendByPrefix. Finds frames with the given prefix and appends them to AnimFrames.
535-
*/
536-
private function findByPrefix(AnimFrames:Array<FlxFrame>, Prefix:String):Void {
537-
538-
var l:Int = _sprite.framesData.frames.length;
539-
for (i in 0...l)
540-
{
541-
if (StringTools.startsWith(_sprite.framesData.frames[i].name, Prefix))
542-
{
543-
AnimFrames.push(_sprite.framesData.frames[i]);
544-
}
545-
}
546-
}
547-
548464
/**
549465
* Plays an existing _animations (e.g. "run").
550466
* If you call an _animations that is already playing it will be ignored.
@@ -621,6 +537,90 @@ class FlxAnimationController implements IFlxDestroyable
621537
frameIndex = FlxRandom.intRanged(0, frames - 1);
622538
}
623539

540+
/**
541+
* Private helper method for add- and appendByNames. Gets frames and appends them to AddTo.
542+
*/
543+
private function byNamesHelper(AddTo:Array<Int>, FrameNames:Array<String>):Void
544+
{
545+
var l:Int = FrameNames.length;
546+
for (i in 0...l)
547+
{
548+
var name:String = FrameNames[i];
549+
if (_sprite.framesData.framesHash.exists(name))
550+
{
551+
var frameToAdd:FlxFrame = _sprite.framesData.framesHash.get(name);
552+
AddTo.push(getFrameIndex(frameToAdd));
553+
}
554+
}
555+
}
556+
557+
/**
558+
* Private helper method for add- and appendByStringIndices. Gets frames and appends them to AddTo.
559+
*/
560+
private function byStringIndicesHelper(AddTo:Array<Int>, Prefix:String, Indices:Array<String>, Postfix:String):Void
561+
{
562+
var l:Int = Indices.length;
563+
for (i in 0...l)
564+
{
565+
var name:String = Prefix + Indices[i] + Postfix;
566+
if (_sprite.framesData.framesHash.exists(name))
567+
{
568+
var frameToAdd:FlxFrame = _sprite.framesData.framesHash.get(name);
569+
AddTo.push(getFrameIndex(frameToAdd));
570+
}
571+
}
572+
}
573+
574+
/**
575+
* Private helper method for add- and appendByIndices. Finds frames and appends them to AddTo.
576+
*/
577+
private function byIndicesHelper(AddTo:Array<Int>, Prefix:String, Indices:Array<Int>, Postfix:String):Void
578+
{
579+
var l:Int = Indices.length;
580+
for (i in 0...l)
581+
{
582+
var indexToAdd:Int = findSpriteFrame(Prefix, Indices[i], Postfix);
583+
if (indexToAdd != -1)
584+
{
585+
AddTo.push(indexToAdd);
586+
}
587+
}
588+
}
589+
590+
/**
591+
* Private helper method for add- and appendByPrefix. Sorts frames and appends them to AddTo.
592+
*/
593+
private function byPrefixHelper(AddTo:Array<Int>, AnimFrames:Array<FlxFrame>, Prefix:String):Void
594+
{
595+
var name:String = AnimFrames[0].name;
596+
var postIndex:Int = name.indexOf(".", Prefix.length);
597+
var postFix:String = name.substring(postIndex == -1 ? name.length : postIndex, name.length);
598+
FlxAnimationController.prefixLength = Prefix.length;
599+
FlxAnimationController.postfixLength = postFix.length;
600+
AnimFrames.sort(FlxAnimationController.frameSortFunction);
601+
602+
var l:Int = AnimFrames.length;
603+
for (i in 0...l)
604+
{
605+
AddTo.push(getFrameIndex(AnimFrames[i]));
606+
}
607+
}
608+
609+
/**
610+
* Private helper method for add- and appendByPrefix. Finds frames with the given prefix and appends them to AnimFrames.
611+
*/
612+
private function findByPrefix(AnimFrames:Array<FlxFrame>, Prefix:String):Void
613+
{
614+
var l:Int = _sprite.framesData.frames.length;
615+
for (i in 0...l)
616+
{
617+
if (StringTools.startsWith(_sprite.framesData.frames[i].name, Prefix))
618+
{
619+
AnimFrames.push(_sprite.framesData.frames[i]);
620+
}
621+
}
622+
}
623+
624624
private function set_frameIndex(Frame:Int):Int
625625
{
626626
if (_sprite.framesData != null)

0 commit comments

Comments
 (0)