diff --git a/.idea/artifacts/TerranBASIC.xml b/.idea/artifacts/TerranBASIC.xml
index 5d305be..8c859f6 100644
--- a/.idea/artifacts/TerranBASIC.xml
+++ b/.idea/artifacts/TerranBASIC.xml
@@ -16,8 +16,6 @@
-
-
diff --git a/.idea/libraries/libGDX_1_11_0.xml b/.idea/libraries/libGDX_1_11_0.xml
index c646ec1..5adf10b 100644
--- a/.idea/libraries/libGDX_1_11_0.xml
+++ b/.idea/libraries/libGDX_1_11_0.xml
@@ -6,8 +6,6 @@
-
-
@@ -60,6 +58,8 @@
+
+
@@ -67,13 +67,13 @@
-
+
@@ -81,13 +81,14 @@
-
+
+
\ No newline at end of file
diff --git a/TerranBASICexecutable/src/net/torvald/tsvm/TerranBASIC.java b/TerranBASICexecutable/src/net/torvald/tsvm/TerranBASIC.java
index eb8dd1d..9870a0a 100644
--- a/TerranBASICexecutable/src/net/torvald/tsvm/TerranBASIC.java
+++ b/TerranBASICexecutable/src/net/torvald/tsvm/TerranBASIC.java
@@ -1,5 +1,7 @@
package net.torvald.tsvm;
+import com.badlogic.gdx.ApplicationAdapter;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.graphics.glutils.ShaderProgram;
@@ -105,6 +107,13 @@ public class TerranBASIC {
VM tbasvm = new VM("./assets", 64 << 10, new TheRealWorld(), new VMProgramRom[]{TerranBASICreleaseBios.INSTANCE}, 2, watchdogs);
EmulInstance tbasrunner = new EmulInstance(tbasvm, "net.torvald.tsvm.peripheral.ReferenceGraphicsAdapter", diskDir, 560, 448);
- new Lwjgl3Application(new VMGUI(tbasrunner, WIDTH, HEIGHT), appConfig);
+
+ try {
+ new Lwjgl3Application(new VMGUI(tbasrunner, WIDTH, HEIGHT), appConfig);
+ }
+ catch (Throwable e) {
+ e.printStackTrace();
+ if (Gdx.app != null) Gdx.app.exit();
+ }
}
}
diff --git a/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt b/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt
index fb4a846..baaa991 100644
--- a/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt
+++ b/TerranBASICexecutable/src/net/torvald/tsvm/VMGUI.kt
@@ -45,6 +45,8 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe
lateinit var fullscreenQuad: Mesh
override fun create() {
+ println("[VMGUI] create()")
+
super.create()
fullscreenQuad = Mesh(
@@ -66,6 +68,8 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe
}
private fun init() {
+ println("[VMGUI] init()")
+
if (loaderInfo.display != null) {
val loadedClass = Class.forName(loaderInfo.display)
val loadedClassConstructor = loadedClass.getConstructor(String::class.java, vm::class.java)
@@ -108,7 +112,6 @@ class VMGUI(val loaderInfo: EmulInstance, val viewportWidth: Int, val viewportHe
Gdx.input.inputProcessor = vm.getIO()
-
vmRunner = VMRunnerFactory("./assets", vm, "js")
coroutineJob = Thread({
vmRunner.executeCommand(vm.roms[0]!!.readAll())
diff --git a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-javadoc.jar b/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-javadoc.jar
deleted file mode 100644
index 526939c..0000000
Binary files a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-javadoc.jar and /dev/null differ
diff --git a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-sources.jar b/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-sources.jar
deleted file mode 100644
index beb1a5e..0000000
Binary files a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0-sources.jar and /dev/null differ
diff --git a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0.jar b/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0.jar
deleted file mode 100644
index 38bc30c..0000000
Binary files a/lib/gdx-lwjgl3-glfw-awt-macos-1.11.0.jar and /dev/null differ
diff --git a/lib/jnlp.jar b/lib/jnlp.jar
deleted file mode 100644
index 8fd98f2..0000000
Binary files a/lib/jnlp.jar and /dev/null differ
diff --git a/tsvm_executable/src/net/torvald/tsvm/TsvmEmulator.java b/tsvm_executable/src/net/torvald/tsvm/TsvmEmulator.java
index d819240..8e96a00 100644
--- a/tsvm_executable/src/net/torvald/tsvm/TsvmEmulator.java
+++ b/tsvm_executable/src/net/torvald/tsvm/TsvmEmulator.java
@@ -1,5 +1,6 @@
package net.torvald.tsvm;
+import com.badlogic.gdx.Game;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.graphics.Texture;