android fixes part 1

.gitignore

@@ -11,7 +11,6 @@ settings.json
 console.log
 data/replays/
 release
-Export
 node_modules
 fonts
 package.json
@@ -23,3 +22,10 @@ macos-dist/data/
 .DS_Store
 **/.DS_Store
 
+Export/html5
+Export/.hxml
+Export/android/local.properties
+Export/android/app/src/main/assets
+Export/android/app/src/main/cpp
+Export/android/app/src/main/java
+Export/android/app/src/main/build.hxml

Export/android/.gitignore

@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+app/build
+/app/src/main/cpp/out
+!app/src/main/cpp/out/readme.md

Export/android/.gitmodules

@@ -0,0 +1,15 @@
+[submodule "app/src/main/cpp/hashlink"]
+	path = app/src/main/cpp/hashlink
+	url = https://github.com/HaxeFoundation/hashlink
+[submodule "app/src/main/cpp/heaps"]
+	path = app/src/main/cpp/heaps
+	url = https://github.com/HeapsIO/heaps
+[submodule "app/src/main/cpp/sdl2"]
+	path = app/src/main/cpp/sdl2
+	url = https://github.com/spurious/SDL-mirror.git
+[submodule "app/src/main/cpp/libjpeg-turbo"]
+	path = app/src/main/cpp/libjpeg-turbo
+	url = https://github.com/openstf/android-libjpeg-turbo.git
+[submodule "app/src/main/cpp/openal-soft"]
+	path = app/src/main/cpp/openal-soft
+	url = https://github.com/kcat/openal-soft.git

Export/android/app/build.gradle

@@ -0,0 +1,55 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdk 31
+    ndkVersion "18.1.5063045"
+
+    defaultConfig {
+        applicationId "com.randomityguy.mbhaxe.mbp"
+        minSdk 18
+        targetSdk 31
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        externalNativeBuild {
+            cmake {
+                cppFlags '-lstdc++'
+                arguments "-DANDROID_LD=lld"
+            }
+        }
+    }
+
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    externalNativeBuild {
+        cmake {
+            path file('src/main/cpp/CMakeLists.txt')
+            version '3.10.2'
+        }
+    }
+    buildFeatures {
+        viewBinding true
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}

Export/android/app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

Export/android/app/src/main/AndroidManifest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Replace com.example.heapsandroid.helloword with the identifier of your game below, e.g.
+     com.gamemaker.game -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.example.heapsandroid.helloworld"
+    android:installLocation="auto"
+    android:versionCode="1"
+    android:versionName="1.0">
+
+    <!-- Tell the system this app requires OpenGL ES 3.0. -->
+    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
+
+    <application android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+        android:hardwareAccelerated="true">
+
+        <activity android:name="org.haxe.HashLinkActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:exported="true"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

Export/android/app/src/main/res/drawable-v24/ic_launcher_background.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.67609864"
+      android:scaleY="0.67609864">
+    <path
+        android:pathData="M0,0h159.74v159.74h-159.74z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="169.87"
+            android:startX="111.12"
+            android:endY="-12.4"
+            android:endX="47.83"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFCA2B47"/>
+          <item android:offset="0.16" android:color="#FFCD3348"/>
+          <item android:offset="0.41" android:color="#FFD74A4B"/>
+          <item android:offset="0.71" android:color="#FFE66E50"/>
+          <item android:offset="1" android:color="#FFF79756"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

Export/android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.37844038"
+      android:scaleY="0.37844038"
+      android:translateX="36.811237"
+      android:translateY="34.2">
+    <path
+        android:pathData="M66.75,69.65c-12.84,-5 -18.67,-16.93 -18.67,-16.93l25.08,-11.82 10,7.13 1.19,-10.69h6.5A45.48,45.48 0,0 0,58.99 8.62a20.93,20.93 0,0 0,-5.77 -5.27c-4.28,-2.37 -4.51,-3.56 -6.3,-3.32s-2.73,1.66 -1.06,3.56c0,0 -5.95,-2.85 -7.61,-1.66s2.85,3.67 2.85,3.67 -4.75,0.13 -6.18,0.84a13.8,13.8 0,0 1,-4.27 0.85s-5.47,-0.1 -8.08,0 0.95,3.91 0.95,3.91 -10,1 -8.08,3.56a10.64,10.64 0,0 0,4 2.73A45.43,45.43 0,0 0,34.9 96.23v8.44h24v-7.79a45.57,45.57 0,0 0,29.55 -23.28A64.74,64.74 0,0 1,66.75 69.65Z"
+        android:strokeAlpha="0.12"
+        android:fillColor="#231f20"
+        android:fillAlpha="0.12"/>
+    <path
+        android:pathData="M64.09,69.65c-12.83,-5 -18.66,-16.93 -18.66,-16.93l25.08,-11.82 10,7.13 1.19,-10.69h6.5A45.52,45.52 0,0 0,56.31 8.62a21,21 0,0 0,-5.76 -5.27c-4.28,-2.37 -4.52,-3.56 -6.3,-3.32s-2.73,1.66 -1.07,3.56c0,0 -5.94,-2.85 -7.6,-1.66s2.85,3.67 2.85,3.67 -4.75,0.13 -6.18,0.84a13.89,13.89 0,0 1,-4.28 0.85s-5.46,-0.1 -8.08,0 1,3.91 1,3.91 -10,1 -8.07,3.56a10.48,10.48 0,0 0,4 2.73A45.43,45.43 0,0 0,32.25 96.23v8.44h24v-7.79A45.55,45.55 0,0 0,85.79 73.57,64.74 64.74,0 0,1 64.09,69.65Z"
+        android:fillColor="#fff"/>
+  </group>
+</vector>

Export/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

Export/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

Export/android/app/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Marble Blast Platinum</string>
+</resources>

Export/android/build.gradle

@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath "com.android.tools.build:gradle:7.0.3"
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

Export/android/gradle.properties

@@ -0,0 +1,20 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
+android.injected.testOnly=false

Export/android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sun Nov 21 12:46:43 PST 2021
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

Export/android/gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

Export/android/gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

Export/android/settings.gradle

@@ -0,0 +1,10 @@
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        jcenter() // Warning: this repository is going to shut down soon
+    }
+}
+rootProject.name = "HeapsAndroidHelloWorld"
+include ':app'

src/MarbleWorld.hx

@@ -255,11 +255,11 @@ class MarbleWorld extends Scheduler {
 		scanMission(this.mission.root);
 		this.resourceLoadFuncs.push(fwd -> this.initScene(fwd));
 		this.resourceLoadFuncs.push(fwd -> this.initMarble(fwd));
-		// this.resourceLoadFuncs.push(fwd -> {
+		this.resourceLoadFuncs.push(fwd -> {
-		// 	this.addSimGroup(this.mission.root);
+			this.addSimGroup(this.mission.root);
-		// 	this._loadingLength = resourceLoadFuncs.length;
+			this._loadingLength = resourceLoadFuncs.length;
-		// 	fwd();
+			fwd();
-		// });
+		});
 		this.resourceLoadFuncs.push(fwd -> this.loadMusic(fwd));
 		this._loadingLength = resourceLoadFuncs.length;
 	}
@@ -276,7 +276,7 @@ class MarbleWorld extends Scheduler {
 	public function postInit() {
 		// Add the sky at the last so that cubemap reflections work
 		this.playGui.init(this.scene2d, this.mission.game.toLowerCase(), () -> {
-			this.scene.addChild(this.sky);
+			// this.scene.addChild(this.sky); TODO FIX ANDROID
 			this._ready = true;
 			var musicFileName = 'data/sound/music/' + this.mission.missionInfo.music;
 			AudioManager.playMusic(ResourceLoader.getResource(musicFileName, ResourceLoader.getAudio, this.soundResources), this.mission.missionInfo.music);
@@ -1105,21 +1105,11 @@ class MarbleWorld extends Scheduler {
 			var func = this.resourceLoadFuncs.shift();
 			lock = true;
 			#if hl
-			try {
+			func(() -> {
-				func(() -> {
-					lock = false;
-					this._resourcesLoaded++;
-					this.loadingGui.setProgress((1 - resourceLoadFuncs.length / _loadingLength));
-				});
-			} catch (e) {
 				lock = false;
 				this._resourcesLoaded++;
-				var errorTxt = new h2d.Text(hxd.res.DefaultFont.get());
+				this.loadingGui.setProgress((1 - resourceLoadFuncs.length / _loadingLength));
-				errorTxt.setPosition(20, 20);
+			});
-				errorTxt.text = e.toString();
-				errorTxt.textColor = 0xFFFFFF;
-				MarbleGame.canvas.scene2d.addChild(errorTxt);
-			}
 			#end
 			#if js
 			func(() -> {

src/ResourceLoaderWorker.hx

@@ -47,58 +47,26 @@ class ResourceLoaderWorker {
 
 		if (tasks.length > 0) {
 			var task = tasks.shift();
-			try {
+			task(() -> {
-				task(() -> {
+				if (tasks.length > 0) {
-					if (tasks.length > 0) {
+					run();
-						run();
+				} else {
-					} else {
+					onFinish();
-						onFinish();
+				}
-					}
+			});
-				});
-			} catch (e) {
-				var errorTxt = new h2d.Text(hxd.res.DefaultFont.get());
-				errorTxt.setPosition(20, 20);
-				errorTxt.text = e.toString();
-				errorTxt.textColor = 0xFFFFFF;
-				MarbleGame.canvas.scene2d.addChild(errorTxt);
-			}
 		} else {
-			try {
+			onFinish();
-				onFinish();
-			} catch (e) {
-				var errorTxt = new h2d.Text(hxd.res.DefaultFont.get());
-				errorTxt.setPosition(20, 20);
-				errorTxt.text = e.toString();
-				errorTxt.textColor = 0xFFFFFF;
-				MarbleGame.canvas.scene2d.addChild(errorTxt);
-			}
 		}
 	}
 
 	public function loadFile(path:String) {
 		#if (!android)
 		paralleltasks.push(fwd -> {
-			try {
+			ResourceLoader.load(path).entry.load(fwd);
-				ResourceLoader.load(path).entry.load(fwd);
-			} catch (e) {
-				var errorTxt = new h2d.Text(hxd.res.DefaultFont.get());
-				errorTxt.setPosition(20, 20);
-				errorTxt.text = e.toString();
-				errorTxt.textColor = 0xFFFFFF;
-				MarbleGame.canvas.scene2d.addChild(errorTxt);
-			}
 		});
 		#else
 		tasks.push(fwd -> {
-			try {
+			ResourceLoader.load(path).entry.load(fwd);
-				ResourceLoader.load(path).entry.load(fwd);
-			} catch (e) {
-				var errorTxt = new h2d.Text(hxd.res.DefaultFont.get());
-				errorTxt.setPosition(20, 20);
-				errorTxt.text = e.toString();
-				errorTxt.textColor = 0xFFFFFF;
-				MarbleGame.canvas.scene2d.addChild(errorTxt);
-			}
 		});
 		#end
 	}