Conductor fixes, cache update, PerformanceStats has outline

Author: TechnikTil

src/Main.hx

@@ -42,7 +42,7 @@ class Main extends Sprite
 			!flxGameData.showSplash, flxGameData.startFullscreen);
 		addChild(flxGame);
 
-		performanceStats = new PerformanceStats(5, 5, 0xFFFFFF);
+		performanceStats = new PerformanceStats(5, 5);
 		addChild(performanceStats);
 
 		Assets.cache.enabled = false;

src/funkin/Conductor.hx

@@ -151,6 +151,22 @@ class Conductor implements IFlxDestroyable
 		recalculateBPMChangeCache();
 	}
 
+	/**
+	 * Fully resets BPM Changes.
+	 */
+	public function resetBPMChanges():Void
+	{
+		var currentBPM:Float = bpmChangesLeft[0].bpm;
+		var currentTimeSignature:{numerator:Float, denominator:Float} = bpmChangesLeft[0].timeSignature;
+		setupBPMChanges([
+			{
+				bpm: currentBPM,
+				time: 0,
+				timeSignature: currentTimeSignature
+			}
+		]);
+	}
+
 	/**
 	 * Updates the current conductor time.
 	 * @param songTime The time to set it to. If not specified the FlxG.sound.music time will be used instead.

src/funkin/objects/ui/PerformanceStats.hx

@@ -1,13 +1,14 @@
 package funkin.objects.ui;
 
 import flixel.util.FlxStringUtil;
+import openfl.display.Sprite;
 import openfl.text.TextField;
 import openfl.text.TextFormat;
 
 /**
  * The performance stats TextField keeps track of FPS and Memory in-game.
  */
-class PerformanceStats extends TextField
+class PerformanceStats extends Sprite
 {
 	/**
 	 * How many frames have passed since the last second.
@@ -19,23 +20,67 @@ class PerformanceStats extends TextField
 	 */
 	public var randomAccessMemory(get, null):Null<Float>;
 
+	/**
+	 * The main text that shows FPS and RAM Usage.
+	 */
+	public var mainText:TextField;
+
+	/**
+	 * The outline text group.
+	 */
+	public var outlineTextGrp:Sprite;
+
 	var cacheCount:Int;
 	var currentTime:Float;
 	var times:Array<Float>;
 
-	public function new(x:Float = 10, y:Float = 10, color:Int = 0x000000)
+	public function new(x:Float = 10, y:Float = 10)
 	{
 		super();
+		visible = true;
+
+		outlineTextGrp = new Sprite();
+		addChild(outlineTextGrp);
+
+		mainText = new TextField();
+		mainText.x = x;
+		mainText.y = y;
+		addChild(mainText);
+
+		var outlinePosArray:Array<Array<Int>> = [];
 
-		this.x = x;
-		this.y = y;
+		// stolen from FlxText
+		outlinePosArray.push([-1, -1]); // upper-left
+		outlinePosArray.push([1, 0]); // upper-middle
+		outlinePosArray.push([1, 0]); // upper-right
+		outlinePosArray.push([0, 1]); // middle-right
+		outlinePosArray.push([0, 1]); // lower-right
+		outlinePosArray.push([-1, 0]); // lower-middle
+		outlinePosArray.push([-1, 0]); // lower-left
+		outlinePosArray.push([0, -1]); // lower-left
+
+		for (pos in outlinePosArray)
+		{
+			var outlineText:TextField = new TextField();
+			outlineText.x = x + pos[0];
+			outlineText.y = y + pos[1];
+			outlineTextGrp.addChild(outlineText);
+		}
 
 		framesPerSecond = 0;
 
-		selectable = false;
+		mainText.selectable = false;
 		mouseEnabled = false;
-		defaultTextFormat = new TextFormat(Paths.location.get('ui/fonts/vcr.ttf'), 12, color);
-		text = '';
+		mainText.defaultTextFormat = new TextFormat(Paths.location.get('ui/fonts/vcr.ttf'), 12, 0xFFFFFF);
+		mainText.text = '';
+
+		for (i in 0...outlineTextGrp.numChildren)
+		{
+			var outlineText:TextField = cast outlineTextGrp.getChildAt(i);
+			outlineText.selectable = false;
+			outlineText.defaultTextFormat = new TextFormat(Paths.location.get('ui/fonts/vcr.ttf'), 12, 0x000000);
+			outlineText.text = '';
+		}
 
 		cacheCount = 0;
 		currentTime = 0;
@@ -57,10 +102,18 @@ class PerformanceStats extends TextField
 
 		if (currentCount != cacheCount)
 		{
-			text = getFramesPerSecond() + getRandomAccessMemory();
+			mainText.text = getFramesPerSecond() + getRandomAccessMemory();
+
+			for (i in 0...outlineTextGrp.numChildren)
+			{
+				var outlineText:TextField = cast outlineTextGrp.getChildAt(i);
+				outlineText.text = getFramesPerSecond() + getRandomAccessMemory();
+			}
 		}
 
 		cacheCount = currentCount;
+
+		super.__enterFrame(cast deltaTime);
 	}
 
 	function getFramesPerSecond():String

src/funkin/states/ui/FreeplayState.hx

@@ -318,7 +318,8 @@ class FreeplayState extends FunkinState
 
 		if (curSelected == 0)
 		{
-			conductor.changeBPM(145, false);
+			conductor.changeBPM(145);
+			conductor.resetBPMChanges();
 			var songPosToSetTo:Float = lastSongPos;
 			lastSongPos = FlxG.sound.music.time;
 			FlxG.sound.playMusic(Paths.content.audio('ui/freeplay/freeplayRandom'));
@@ -328,7 +329,8 @@ class FreeplayState extends FunkinState
 		}
 		else if (isRandomPlaying)
 		{
-			conductor.changeBPM(102, false);
+			conductor.changeBPM(102);
+			conductor.resetBPMChanges();
 			var songPosToSetTo:Float = lastSongPos;
 			lastSongPos = FlxG.sound.music?.time;
 			FlxG.sound.playMusic(Paths.content.audio('ui/menu/freakyMenu'));
@@ -422,7 +424,8 @@ class FreeplayState extends FunkinState
 	{
 		if (isRandomPlaying)
 		{
-			conductor.changeBPM(102, false);
+			conductor.changeBPM(102);
+			conductor.resetBPMChanges();
 			var songPosToSetTo:Float = lastSongPos;
 			lastSongPos = FlxG.sound.music?.time;
 			FlxG.sound.playMusic(Paths.content.audio('ui/menu/freakyMenu'));

src/funkin/util/paths/PathsCache.hx

@@ -18,6 +18,7 @@ class PathsCache
 {
 	/**
 	 * The content that doesn't get wiped from a cache clean.
+	 * These can also be Flixel cache IDs!
 	 *
 	 * You should only put something here if you use it on a daily basis.
 	 */
@@ -207,7 +208,22 @@ class PathsCache
 			removeImage(image, bypassExcludeKeys);
 		}
 
-		FlxG.bitmap.reset(); // Flixel likes to cache all texts and transitions, nothing wrong with it but this is a graphic clear.
+		// Flixel likes to cache all texts and transitions, nothing wrong with it but this is a graphic clear.
+		@:privateAccess
+		if (FlxG.bitmap._cache != null)
+		{
+			for (key in FlxG.bitmap._cache.keys())
+			{
+				if (removeExcludeKeys.contains(key) && !bypassExcludeKeys)
+					continue;
+
+				var obj:FlxGraphic = FlxG.bitmap.get(key);
+				FlxG.bitmap.removeKey(key);
+
+				if (obj != null)
+					obj.destroy();
+			}
+		}
 
 		if (runGarbageCollector)
 			System.gc();