diff --git a/source/funkin/backend/system/framerate/FlixelInfo.hx b/source/funkin/backend/system/framerate/FlixelInfo.hx index 297fcde7..c485468c 100644 --- a/source/funkin/backend/system/framerate/FlixelInfo.hx +++ b/source/funkin/backend/system/framerate/FlixelInfo.hx @@ -12,9 +12,7 @@ class FlixelInfo extends FramerateCategory { @:privateAccess { - var c:Int = 0; - for(_ in FlxG.bitmap._cache.keys()) - c++; + var c:Int = Lambda.count(FlxG.bitmap._cache); if((FlxG.state is ModState)) { var state:ModState = cast FlxG.state; @@ -27,6 +25,7 @@ class FlixelInfo extends FramerateCategory { _text += '\nBitmaps Count: ${c}'; _text += '\nSounds Count: ${FlxG.sound.list.length}'; _text += '\nFlxG.game Childs Count: ${FlxG.game.numChildren}'; + if(FlxG.renderBlit) _text += '\nBlitting Render: true'; // _text += '\nCached objects count: ${cachedObjects}'; #if FLX_POINT_POOL //var points = flixel.math.FlxPoint.FlxBasePoint.pool; diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx index 637f4bdc..39f2aa6c 100644 --- a/source/funkin/backend/system/framerate/SystemInfo.hx +++ b/source/funkin/backend/system/framerate/SystemInfo.hx @@ -82,7 +82,7 @@ class SystemInfo extends FramerateCategory { Logs.trace('Unable to grab CPU Name: $e', ERROR, RED); } - @:privateAccess { + @:privateAccess if(FlxG.renderTile) { // Blit doesn't enable the gpu. Idk if we should fix this if (flixel.FlxG.stage.context3D != null && flixel.FlxG.stage.context3D.gl != null) { gpuName = Std.string(flixel.FlxG.stage.context3D.gl.getParameter(flixel.FlxG.stage.context3D.gl.RENDERER)).split("/")[0].trim(); #if !flash diff --git a/source/funkin/backend/utils/ZipUtil.hx b/source/funkin/backend/utils/ZipUtil.hx index d971e317..d347ab6d 100644 --- a/source/funkin/backend/utils/ZipUtil.hx +++ b/source/funkin/backend/utils/ZipUtil.hx @@ -1,5 +1,8 @@ package funkin.backend.utils; +import haxe.zip.Entry; +import haxe.zip.Reader; + #if sys #if (!macro && sys) import openfl.display.BitmapData; @@ -9,8 +12,6 @@ import haxe.Exception; import haxe.Json; import haxe.crypto.Crc32; import haxe.zip.Compress; -import haxe.zip.Entry; -import haxe.zip.Reader; import haxe.zip.Tools; import haxe.zip.Uncompress; import haxe.zip.Writer; @@ -227,20 +228,6 @@ class ZipProgress { public function new() {} } -class ZipReader extends Reader { - public var files:List; - - public override function read() { - if (files != null) return files; - try { - var files = super.read(); - return this.files = files; - } catch(e) { - } - return new List(); - } -} - class ZipWriter extends Writer { public function flush() { o.flush(); @@ -265,4 +252,18 @@ class StrNameLabel { this.label = label; } } -#end \ No newline at end of file +#end + +class ZipReader extends Reader { + public var files:List; + + public override function read() { + if (files != null) return files; + try { + var files = super.read(); + return this.files = files; + } catch(e) { + } + return new List(); + } +} \ No newline at end of file