Toggleable fps counter + toggleable fps debug categories (#1060)

* wip (gotta add translations Lol!)

* Added Options.fpsCounter functionality

* Added options boolean for all of the framerate categories

* Each said categories are toggleable wow!

* Kissed my gf (not yet but soon)

* maybe i shouldve slept instead of opening the pr at 1am oops

Author: chronicsilly

assets/languages/en/Options.xml

@@ -69,6 +69,12 @@
 		<str id="framerate-desc">Pretty self explanatory, isn't it?</str>
 		<str id="framerate-unlimited">Unlimited</str>
 
+		<str id="fpsCounter-name">FPS Counter</str>
+		<str id="fpsCounter-desc">If checked, displays the Framerate and Memory counter in the top left.</str>
+
+		<str id="fpsAdvanced-name">More Options</str>
+		<str id="fpsAdvanced-desc">Use this menu to toggle the debug info categories on the FPS counter.</str>
+
 		<str id="flashingMenu-name">Flashing Menu</str>
 		<str id="flashingMenu-desc">If unchecked, will disable menu flashing when you select an option in the Main Menu, and other flashes will be slower.</str>
 
@@ -97,6 +103,23 @@
 			<str id="gpuOnlyBitmaps-name">VRAM-Only Sprites</str>
 			<str id="gpuOnlyBitmaps-desc">If checked, will only store the bitmaps in the GPU, freeing a LOT of memory (EXPERIMENTAL). Turning this off will consume a lot of memory, especially on bigger sprites. If you aren't sure, leave this on.</str>
 		</group>
+
+		<group name="AppearanceOptionsFramerate" prefix="Advanced.">
+			<str id="fpsCounterConductor-name">Show Conductor Info</str>
+			<str id="fpsCounterConductor-desc">If checked, will display information relating to the conductor on the debug FPS Counter menu.</str>
+
+			<str id="fpsCounterFlixel-name">Show Flixel Info</str>
+			<str id="fpsCounterFlixel-desc">If checked, will display information relating to Flixel on the debug FPS Counter menu.</str>
+		
+			<str id="fpsCounterSystem-name">Show System Info</str>
+			<str id="fpsCounterSystem-desc">If checked, will display information relating to your system on the debug FPS Counter menu.</str>
+		
+			<str id="fpsCounterAssets-name">Show Assets Tree Info</str>
+			<str id="fpsCounterAssets-desc">If checked, will display information relating to the assets tree on the debug FPS Counter menu.</str>
+		
+			<str id="fpsCounterStats-name">Show Stats Info</str>
+			<str id="fpsCounterStats-desc">If checked, will Fuck idk</str>
+		</group>
 	</group>
 
 	<group name="GameplayOptions" prefix="GameplayOptions.">

source/funkin/backend/system/Main.hx

@@ -198,7 +198,7 @@ class Main extends Sprite
 		if (PlayerSettings.solo.controls.DEV_CONSOLE)
 			NativeAPI.allocConsole();
 
-		if (PlayerSettings.solo.controls.FPS_COUNTER)
+		if (PlayerSettings.solo.controls.FPS_COUNTER && Options.fpsCounter)
 			Framerate.debugMode = (Framerate.debugMode + 1) % 3;
 	}
 

source/funkin/backend/system/framerate/AssetTreeInfo.hx

@@ -13,6 +13,7 @@ class AssetTreeInfo extends FramerateCategory {
 
 	public function new() {
 		super("Asset Libraries Tree Info");
+		visible = Options.fpsCounterAssets;
 	}
 
 	public override function __enterFrame(t:Int) {

source/funkin/backend/system/framerate/ConductorInfo.hx

@@ -5,6 +5,7 @@ import funkin.backend.system.macros.StringMacro;
 class ConductorInfo extends FramerateCategory {
 	public function new() {
 		super("Conductor Info");
+		visible = Options.fpsCounterConductor;
 	}
 
 	public override function __enterFrame(t:Int) {

source/funkin/backend/system/framerate/FlixelInfo.hx

@@ -6,6 +6,7 @@ import funkin.backend.system.macros.StringMacro;
 class FlixelInfo extends FramerateCategory {
 	public function new() {
 		super("Flixel Info");
+		visible = Options.fpsCounterFlixel;
 	}
 
 	public override function __enterFrame(t:Int) {

source/funkin/backend/system/framerate/Framerate.hx

@@ -19,6 +19,13 @@ class Framerate extends Sprite {
 	#if SHOW_BUILD_ON_FPS
 	public static var codenameBuildField:CodenameBuildField;
 	#end
+	public static var conductorInfo:ConductorInfo;
+	public static var flixelInfo:FlixelInfo;
+	public static var systemInfo:SystemInfo;
+	public static var assetInfo:AssetTreeInfo;
+	#if (gl_stats && !disable_cffi && (!html5 || !canvas))
+	public static var statsInfo:StatsInfo;
+	#end
 
 	public static var fontName:String = #if windows '${Sys.getEnv("windir")}\\Fonts\\consola.ttf' #else "_typewriter" #end;
 
@@ -27,7 +34,7 @@ class Framerate extends Sprite {
 	 * 1: FPS VISIBLE
 	 * 2: FPS & DEBUG INFO VISIBLE
 	 */
-	public static var debugMode:Int = 1;
+	public static var debugMode:Int = Options.fpsCounter ? 1 : 0;
 	public static var offset:FlxPoint = new FlxPoint();
 
 	public var bgSprite:Bitmap;
@@ -65,13 +72,13 @@ class Framerate extends Sprite {
 		#if SHOW_BUILD_ON_FPS
 		__addToList(codenameBuildField = new CodenameBuildField());
 		#end
-		__addCategory(new ConductorInfo());
-		__addCategory(new FlixelInfo());
-		__addCategory(new SystemInfo());
-		__addCategory(new AssetTreeInfo());
+		__addCategory(conductorInfo = new ConductorInfo());
+		__addCategory(flixelInfo = new FlixelInfo());
+		__addCategory(systemInfo = new SystemInfo());
+		__addCategory(assetInfo = new AssetTreeInfo());
 
 		#if (gl_stats && !disable_cffi && (!html5 || !canvas))
-		__addCategory(new StatsInfo());
+		__addCategory(statsInfo = new StatsInfo());
 		#end
 	}
 
@@ -127,6 +134,7 @@ class Framerate extends Sprite {
 
 		var y:Float = height + 4;
 		for(c in categories) {
+			if (!c.visible) continue;
 			c.title.selectable = c.text.selectable = selectable;
 			c.alpha = debugAlpha;
 			c.x = FlxMath.lerp(-c.width - offset.x, 0, debugAlpha);

source/funkin/backend/system/framerate/FramerateCategory.hx

@@ -36,7 +36,6 @@ class FramerateCategory extends Sprite {
 		this.title.multiline = this.title.wordWrap = false;
 		this.text.multiline = true;
 
-
 		this.text.y = this.title.y + this.title.height + 2;
 	}
 

source/funkin/backend/system/framerate/StatsInfo.hx

@@ -8,6 +8,7 @@ import funkin.backend.system.macros.StringMacro;
 class StatsInfo extends FramerateCategory {
 	public function new() {
 		super("Asset Libraries Tree Info");
+		visible = Options.fpsCounterStats;
 	}
 
 	public override function __enterFrame(t:Int) {

source/funkin/backend/system/framerate/SystemInfo.hx

@@ -179,6 +179,7 @@ class SystemInfo extends FramerateCategory {
 
 	public function new() {
 		super("System Info");
+		visible = Options.fpsCounterSystem;
 	}
 
 	public override function __enterFrame(t:Int) {

source/funkin/options/Options.hx

@@ -26,6 +26,11 @@ class Options
 	public static var flashingMenu:Bool = true;
 	public static var camZoomOnBeat:Bool = true;
 	public static var fpsCounter:Bool = true;
+	public static var fpsCounterConductor:Bool = true;
+	public static var fpsCounterFlixel:Bool = true;
+	public static var fpsCounterSystem:Bool = true;
+	public static var fpsCounterAssets:Bool = true;
+	public static var fpsCounterStats:Bool = true;
 	public static var autoPause:Bool = true;
 	public static var antialiasing:Bool = true;
 	public static var volume:Float = 1;