diff --git a/source/funkin/backend/system/framerate/SystemInfo.hx b/source/funkin/backend/system/framerate/SystemInfo.hx index 28982857..4cc698d6 100644 --- a/source/funkin/backend/system/framerate/SystemInfo.hx +++ b/source/funkin/backend/system/framerate/SystemInfo.hx @@ -3,6 +3,10 @@ package funkin.backend.system.framerate; import funkin.backend.system.Logs; import funkin.backend.utils.MemoryUtil; import funkin.backend.utils.native.HiddenProcess; +#if cpp +import cpp.Float64; +import cpp.UInt64; +#end using StringTools; @@ -91,11 +95,13 @@ class SystemInfo extends FramerateCategory { #end if(openfl.display3D.Context3D.__glMemoryTotalAvailable != -1) { - var vRAMBytes:UInt = cast flixel.FlxG.stage.context3D.gl.getParameter(openfl.display3D.Context3D.__glMemoryTotalAvailable); + var vRAMBytes:UInt64 = cast flixel.FlxG.stage.context3D.gl.getParameter(openfl.display3D.Context3D.__glMemoryTotalAvailable); if (vRAMBytes == 1000 || vRAMBytes == 1 || vRAMBytes <= 0) Logs.trace('Unable to grab GPU VRAM', ERROR, RED); - else - vRAM = CoolUtil.getSizeString(vRAMBytes * 1000); + else { + var vRAMBytesFloat:#if cpp Float64 #else Float #end = vRAMBytes*1024; + vRAM = CoolUtil.getSizeString(vRAMBytesFloat); + } } } else Logs.trace('Unable to grab GPU Info', ERROR, RED); diff --git a/source/funkin/backend/utils/CoolUtil.hx b/source/funkin/backend/utils/CoolUtil.hx index 61dfa725..7515a42b 100644 --- a/source/funkin/backend/utils/CoolUtil.hx +++ b/source/funkin/backend/utils/CoolUtil.hx @@ -1,5 +1,8 @@ package funkin.backend.utils; +#if cpp +import cpp.Float64; +#end import flxanimate.data.AnimationData.AnimAtlas; import flixel.graphics.FlxGraphic; import openfl.display.BitmapData; @@ -298,11 +301,11 @@ final class CoolUtil * @param size Size to convert to string * @return String Result string representation */ - public static function getSizeString(size:Float):String { + public static function getSizeString(size: #if cpp Float64 #else Float #end):String { var rSize:Float = size; var label:Int = 0; var len = sizeLabels.length; - while(rSize > 1024 && label < len-1) { + while(rSize >= 1024 && label < len-1) { label++; rSize /= 1024; } @@ -801,6 +804,14 @@ final class CoolUtil #end } + /** + * Browse a path in the operating system's explorer + * @param path + */ + public static inline function browsePath(path:String) { + + } + /** * Converts a timestamp to a readable format such as `01:22` (`mm:ss`) */