cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master

Browse source
This commit is contained in:
Cameron Taylor 2024-07-11 19:46:40 -04:00
parent 19fd8b5e4e 71947c581e
commit 068a660a91
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/funkin/ui/debug/MemoryCounter.hx
View file

@ -36,7 +36,7 @@ class MemoryCounter extends TextField
@:noCompletion @:noCompletion
#if !flash override #end function __enterFrame(deltaTime:Float):Void #if !flash override #end function __enterFrame(deltaTime:Float):Void
{ {
var mem:Float = Math.round(MemoryUtil.getMemoryUsed() / BYTES_PER_MEG / ROUND_TO) * ROUND_TO; var mem:Float = Math.fround(MemoryUtil.getMemoryUsed() / BYTES_PER_MEG / ROUND_TO) * ROUND_TO;
if (mem > memPeak) memPeak = mem; if (mem > memPeak) memPeak = mem;

4
source/funkin/util/MemoryUtil.hx
View file

@ -48,11 +48,11 @@ class MemoryUtil
* Calculate the total memory usage of the program, in bytes. * Calculate the total memory usage of the program, in bytes.
* @return Int * @return Int
*/ */
public static function getMemoryUsed():Int public static function getMemoryUsed():#if cpp Float #else Int #end
{ {
#if cpp #if cpp
// There is also Gc.MEM_INFO_RESERVED, MEM_INFO_CURRENT, and MEM_INFO_LARGE. // There is also Gc.MEM_INFO_RESERVED, MEM_INFO_CURRENT, and MEM_INFO_LARGE.
return cpp.vm.Gc.memInfo(cpp.vm.Gc.MEM_INFO_USAGE); return cpp.vm.Gc.memInfo64(cpp.vm.Gc.MEM_INFO_USAGE);
#else #else
return openfl.system.System.totalMemory; return openfl.system.System.totalMemory;
#end #end