From 3b4129921c48d4d0c2de0fad84a400bae242aad6 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Thu, 15 Apr 2021 11:57:59 -0400 Subject: [PATCH] guns and animation shit in progress --- source/animate/FlxAnimate.hx | 13 +++++++++++++ source/animate/FlxSymbol.hx | 21 +++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/source/animate/FlxAnimate.hx b/source/animate/FlxAnimate.hx index 16d6ba022..635cbe5f7 100644 --- a/source/animate/FlxAnimate.hx +++ b/source/animate/FlxAnimate.hx @@ -39,6 +39,19 @@ class FlxAnimate extends FlxSymbol super.draw(); renderFrame(coolParse.AN.TL, coolParse, true); + + if (FlxG.keys.justPressed.E) + { + for (shit in FlxSymbol.nestedShit.keys()) + { + for (spr in FlxSymbol.nestedShit.get(shit)) + { + spr.draw(); + } + } + + FlxSymbol.nestedShit.clear(); + } } var curFrame:Int = 0; diff --git a/source/animate/FlxSymbol.hx b/source/animate/FlxSymbol.hx index ff3ac5ab7..8779337a0 100644 --- a/source/animate/FlxSymbol.hx +++ b/source/animate/FlxSymbol.hx @@ -29,6 +29,8 @@ class FlxSymbol extends FlxSprite super.draw(); } + public static var nestedShit:Map> = new Map(); + var swagX:Float = 0; var swagY:Float = 0; @@ -37,6 +39,7 @@ class FlxSymbol extends FlxSprite var drawQueue:Array = []; public var daFrame:Int = 0; + public var nestDepth:Int = 0; function renderFrame(TL:Timeline, coolParsed:Parsed, ?isMainLoop:Bool = false) { @@ -97,8 +100,9 @@ class FlxSymbol extends FlxSprite // spr._matrix.setTo(m3d[0], m3d[1], m3d[4], m3d[5], m3d[12], m3d[13]); - drawQueue.push(spr); - // spr.draw(); + // drawQueue.push(spr); + + setDaMap(spr); // swagX = 0; } @@ -138,6 +142,7 @@ class FlxSymbol extends FlxSprite // nestedShit.oldMatrix = element.SI.M3D; nestedShit.hasFrameByPass = true; + nestedShit.nestDepth = nestDepth + 1; nestedShit.renderFrame(nestedSymbol.TL, coolParsed); // renderFrame(nestedSymbol.TL, coolParsed); @@ -149,8 +154,16 @@ class FlxSymbol extends FlxSprite // drawQueue.reverse(); // - for (thing in drawQueue) - thing.draw(); + // for (thing in drawQueue) + // thing.draw(); + } + + function setDaMap(spr:FlxSymbol):Void + { + if (!nestedShit.exists(nestDepth)) + nestedShit.set(nestDepth, [spr]); + else + nestedShit.get(nestDepth).push(spr); } function changeFrame(frameChange:Int = 0):Void