fix major hashlink crashes

MaybeMaru · Dec 5, 2023 · 76fef5e · 76fef5e
1 parent 4d2cf15
commit 76fef5e
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 11 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -65,3 +65,31 @@ jobs:
           name: Maru-Funkin-Linux
           path: export/release/linux/bin
           if-no-files-found: error
+
+  hashlinkBuild:
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout latest commit
+        uses: actions/checkout@main
+        with:
+          submodules: true
+
+      - name: Install & Setup Haxe
+        uses: krdlab/setup-haxe@master
+        with:
+          haxe-version: 4.3.3
+
+      - name: Install Libraries
+        run: |
+          haxe -cp ./actions -D analyzer-optimize -main Main --interp
+
+      - name: Build
+        run: haxelib run lime build hl
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@main
+        with:
+          name: Maru-Funkin-HashLink
+          path: export/release/hl/bin
+          if-no-files-found: error
diff --git a/source/funkin/objects/note/Note.hx b/source/funkin/objects/note/Note.hx
@@ -226,7 +226,10 @@ class Note extends FlxSpriteExt implements INoteData {
             pixels.fillRect(new Rectangle(0, endPos, width, susEnd.height), FlxColor.fromRGB(0,0,0,0));
             stampBitmap(susEnd, 0, endPos);
 
+            #if !hl
             frames = AssetManager.uploadGpuFromKey(key).imageFrame; // After this the sustain bitmap data wont be readable, sorry
+            #end
+
             origin.set(width * 0.5, 0);
         }
     }

diff --git a/source/funkin/states/MusicBeatState.hx b/source/funkin/states/MusicBeatState.hx
@@ -94,7 +94,7 @@ class MusicBeatState extends FlxUIState implements IMusicGetter {
 	override function destroy() {
 		instance = null;
 		super.destroy();
-		CoolUtil.runGc(false); // Minor Gc Clear
+		CoolUtil.gc(false);
 	}
 
 	// Some shortcuts

diff --git a/source/funkin/states/editors/ChartingState.hx b/source/funkin/states/editors/ChartingState.hx
@@ -643,8 +643,8 @@ class ChartingState extends MusicBeatState {
 		}, _);
 	}
 
-    function saveJson(input:Any, fileName:String) {
-        final data:String = cast input is String ? input : FunkyJson.stringify(input, "\t");
+    function saveJson(input:Dynamic, fileName:String) {
+        final data:String = input is String ? input : FunkyJson.stringify(input, "\t");
         if (data.length > 0) {
 			final chartFile:FileReference = new FileReference();
 			chartFile.save(data.trim(), '$fileName.json');

diff --git a/source/funkin/util/CoolUtil.hx b/source/funkin/util/CoolUtil.hx
@@ -1,10 +1,14 @@
 package funkin.util;
 
+import funkin.util.backend.SongZip;
+//import openfl.system.System;
 #if cpp
 import cpp.vm.Gc;
+#elseif hl
+import hl.Gc;
+#elseif neko
+import neko.vm.Gc;
 #end
-import funkin.util.backend.SongZip;
-import openfl.system.System;
 
 typedef CacheClearing =  {
 	?bitmap:Bool,
@@ -77,14 +81,17 @@ class CoolUtil {
 		if (cacheClear.sustains) NoteUtil.clearSustainCache();
 		if (cacheClear.sounds) AssetManager.clearSoundCache(!softClear);
 		if (cacheClear.shaders) Shader.clearShaders();
-		runGc(true); // Major gc clear
+		gc(true);
 	}
 
-	inline public static function runGc(major:Bool = true) {
-		System.gc();
-		#if cpp
-		Gc.run(major);
-		if (major) Gc.compact();
+	inline public static function gc(major:Bool = false) {
+		#if hl
+			Gc.blocking(true);
+			Gc.major();
+			Gc.blocking(false);
+		#else
+			Gc.run(major);
+			#if cpp if (major) Gc.compact(); #end
 		#end
 	}