From 819d6d570d01041b4603788b545c49520bdef15f Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 18 Jun 2021 14:18:56 -0400
Subject: [PATCH] fix layering jitter

---
 source/animate/FlxSymbol.hx | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/source/animate/FlxSymbol.hx b/source/animate/FlxSymbol.hx
index b7e9924eb..05b1a2b71 100644
--- a/source/animate/FlxSymbol.hx
+++ b/source/animate/FlxSymbol.hx
@@ -5,6 +5,7 @@ import flixel.FlxG;
 import flixel.FlxSprite;
 import flixel.graphics.frames.FlxFrame.FlxFrameAngle;
 import flixel.math.FlxAngle;
+import flixel.math.FlxMath;
 import flixel.math.FlxMatrix;
 import flixel.math.FlxPoint;
 import openfl.geom.Matrix;
@@ -44,7 +45,6 @@ class FlxSymbol extends FlxSprite
 	var symbolMap:Map<String, Animation> = new Map();
 
 	public var daFrame:Int = 0;
-	public var nestDepth:Int = 0;
 
 	public var transformMatrix:Matrix = new Matrix();
 
@@ -65,6 +65,9 @@ class FlxSymbol extends FlxSprite
 			{
 				case LOOP:
 					var tempFrame = layer.FR[newFrameNum + firstFrame % layer.FR.length];
+					// newFrameNum += firstFrame;
+					// newFrameNum = newFrameNum % (tempFrame.I + tempFrame.DU);
+					// newFrameNum = FlxMath.wrap(newFrameNum, tempFrame.I, tempFrame.I + tempFrame.DU);
 					newFrameNum += 0; // temp, fix later for good looping
 				case PLAY_ONCE:
 					newFrameNum += 0;
@@ -72,11 +75,11 @@ class FlxSymbol extends FlxSprite
 					newFrameNum = firstFrame;
 			}
 
-			trace(daLoopType);
-			trace(newFrameNum);
-			trace(layer.FR.length);
+			// trace(daLoopType);
+			// trace(newFrameNum);
+			// trace(layer.FR.length);
 
-			trace(newFrameNum % layer.FR.length);
+			// trace(newFrameNum % layer.FR.length);
 
 			var swagFrame:Frame = layer.FR[newFrameNum % layer.FR.length]; // has modulo just in case????
 
@@ -150,12 +153,9 @@ class FlxSymbol extends FlxSprite
 					nestedShit.firstFrame = element.SI.FF;
 					// nestedShit.daFrame += nestedShit.firstFrame;
 
-					nestedSymbol.TL.L.reverse();
-
 					nestedShit.daLoopType = element.SI.LP;
 					nestedShit.daFrame = daFrame;
 					nestedShit.hasFrameByPass = true;
-					nestedShit.nestDepth = nestDepth + 1;
 					nestedShit.renderFrame(nestedSymbol.TL, coolParsed);
 
 					// renderFrame(nestedSymbol.TL, coolParsed);
@@ -166,14 +166,6 @@ class FlxSymbol extends FlxSprite
 		}
 	}
 
-	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
 	{
 		daFrame += frameChange;
@@ -187,6 +179,10 @@ class FlxSymbol extends FlxSprite
 			symbolMap.set(symbol.SN, symbol);
 
 			var symbolName = symbol.SN;
+
+			// one time reverse?
+			symbol.TL.L.reverse();
+
 			for (layer in symbol.TL.L)
 			{
 				for (frame in layer.FR)
@@ -320,6 +316,7 @@ typedef Layer =
 
 typedef Frame =
 {
+	/** Frame index*/
 	var I:Int;
 
 	/** Duration, in frames*/