Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret

source/Main.hx

@@ -71,6 +71,7 @@ class Main extends Sprite
 	private var overlay:Sprite;
 
 	public static var fpsCounter:FPS;
+	public static var memoryCounter:MemoryCounter;
 
 	private function setupGame():Void
 	{
@@ -94,10 +95,13 @@ class Main extends Sprite
 
 		addChild(new FlxGame(gameWidth, gameHeight, initialState, zoom, framerate, framerate, skipSplash, startFullscreen));
 
-		#if !mobile
+		#if debug
 		fpsCounter = new FPS(10, 3, 0xFFFFFF);
 		addChild(fpsCounter);
+		memoryCounter = new MemoryCounter(10, 13, 0xFFFFFF);
+		addChild(memoryCounter);
 		#end
+
 		/* 
 			video = new Video();
 			addChild(video);

source/MemoryCounter.hx

@@ -0,0 +1,44 @@
+import openfl.text.TextFormat;
+import openfl.system.System;
+import openfl.text.TextField;
+
+class MemoryCounter extends TextField
+{
+	private var memPeak:Float = 0;
+
+	static final BYTES_PER_MEG:Float = 1024 * 1024;
+	static final ROUND_TO:Float = 1 / 100;
+
+	public function new(x:Float = 10, y:Float = 10, color:Int = 0x000000)
+	{
+		super();
+
+		this.x = x;
+		this.y = y;
+		this.width = 500;
+		this.selectable = false;
+		this.mouseEnabled = false;
+		defaultTextFormat = new TextFormat("_sans", 12, color);
+		text = "RAM: ";
+
+		#if flash
+		addEventListener(Event.ENTER_FRAME, function(e)
+		{
+			var time = Lib.getTimer();
+			__enterFrame(time - currentTime);
+		});
+		#end
+	}
+
+	// Event Handlers
+	@:noCompletion
+	private #if !flash override #end function __enterFrame(deltaTime:Float):Void
+	{
+		var mem:Float = Math.round(System.totalMemory / BYTES_PER_MEG / ROUND_TO) * ROUND_TO;
+
+		if (mem > memPeak)
+			memPeak = mem;
+
+		text = 'RAM: ${mem}mb / ${memPeak}mb';
+	}
+}