diff --git a/.idea/artifacts/TerranBASIC.xml b/.idea/artifacts/TerranBASIC.xml index 8c859f6..e40ceb8 100644 --- a/.idea/artifacts/TerranBASIC.xml +++ b/.idea/artifacts/TerranBASIC.xml @@ -11,63 +11,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -81,6 +27,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 6d8bb6e..1cebe50 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -3,7 +3,11 @@ + + - \ No newline at end of file diff --git a/.idea/libraries/GetCpuName.xml b/.idea/libraries/GetCpuName.xml deleted file mode 100644 index f0745d5..0000000 --- a/.idea/libraries/GetCpuName.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/aircompressor_0_25.xml b/.idea/libraries/aircompressor_0_25.xml deleted file mode 100644 index ef8117e..0000000 --- a/.idea/libraries/aircompressor_0_25.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/graalvm_js_22_3_1.xml b/.idea/libraries/graalvm_js_22_3_1.xml deleted file mode 100644 index 3854ecd..0000000 --- a/.idea/libraries/graalvm_js_22_3_1.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml new file mode 100644 index 0000000..9f4ee14 --- /dev/null +++ b/.idea/libraries/lib.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/libGDX_1_11_0.xml b/.idea/libraries/libGDX_1_11_0.xml deleted file mode 100644 index 5adf10b..0000000 --- a/.idea/libraries/libGDX_1_11_0.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 07115cd..4c38193 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/TerranBASICexecutable/TerranBASICexecutable.iml b/TerranBASICexecutable/TerranBASICexecutable.iml index 13bc4ac..d98a81a 100644 --- a/TerranBASICexecutable/TerranBASICexecutable.iml +++ b/TerranBASICexecutable/TerranBASICexecutable.iml @@ -8,9 +8,7 @@ - - - + \ No newline at end of file diff --git a/assets/bios/wp.js b/assets/bios/wp.js index 2b3bab1..b9bf68e 100644 --- a/assets/bios/wp.js +++ b/assets/bios/wp.js @@ -47,15 +47,12 @@ let scrollHor = 0 'The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.' ]*/ let paragraphs = [ -'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.', +'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem', +'Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an', +'unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.', 'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.', 'The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.' ] -/*let paragraphs = [ -'Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry\'s standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting,remaining essentially unchanged.It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.', -'Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance.The first line of Lorem Ipsum,"Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.', -'The standard chunk of Lorem Ipsum used since the 1500s is reproduced below for those interested. Sections 1.10.32 and 1.10.33 from "de Finibus Bonorum et Malorum" by Cicero are also reproduced in their exact original form, accompanied by English versions from the 1914 translation by H. Rackham.' -]*/ let typeset = {lineIndices: [], lineValidated: [], strategy: TYPESET_STRATEGY_JUSTIFIED} // index 0 == 2nd line let cursorRow = 0 let cursorCol = 0 @@ -68,6 +65,8 @@ let filename = "NEWFILE" let modified = false let editorMode = 1 // 0: Visual Mode, 1: Edit Mode, 2: Command Mode; just like the good ol' Vi const editorModeLabel = ["VISUAL MODE (hit I to EDIT, hit : to enter a COMMAND)", "EDIT MODE (hit ESC for Visual Mode)", ":"] +// follows current typesetStrats +const parModeLabel = [" NO ALIGNMENT"," FLUSH-LEFT","FLUSH-LEFT-HYPH"," JUSTIFIED"] let cmdbuf = "" let windowWidth = 0 @@ -119,10 +118,17 @@ function drawPRC() { con.move(1,2) print(`PG:${page+1} LN:${cursorRow+1} COL:${cursorCol+1} `) - let rb = MEM - paragraphs.map(it => it.length).reduce((acc,i) => acc + i) - let rp = (rb/100)|0 - let s = ` REMAIN:${(rp/10)|0}.${rp%10}K` + let s = '' + if (rb >= 2000) { + let rp = (rb/1024)|0 + let rf = (''+(rb - (rp*1024)) / 1024 * 1000)[0] + s = ` REMAIN:${rp|0}.${rf}K` + } + else { + s = ` REMAIN:${rb|0}B` + } + con.move(1,windowWidth - s.length) print(s) } @@ -279,7 +285,7 @@ function typesetJustified(lineStart, lineEnd) { - function tryJustify(recDepth, adjust, fuckit) { + function tryJustify(recDepth, adjust, fuckit, paintWidth) { let isLineEnd = (words.last().type == "ct_lf") // trim spaces at the end of the line if ("sp" == words.last().type) { @@ -287,7 +293,7 @@ function typesetJustified(lineStart, lineEnd) { words.pop() } - return tryJustify(recDepth, adjust) + return tryJustify(recDepth, adjust, fuckit, paintWidth) } // trim spaces at the head of the line // "pull" the words when removing preceding spaces @@ -300,7 +306,7 @@ function typesetJustified(lineStart, lineEnd) { printdbg(`Pulled ${pullLen} characters`) adjust += pullLen - return tryJustify(recDepth, adjust) + return tryJustify(recDepth, adjust, fuckit, paintWidth) } @@ -401,19 +407,19 @@ function typesetJustified(lineStart, lineEnd) { // fuckit else { printdbg("GIVE UP") - return tryJustify(recDepth + 1, adjust, true) + return tryJustify(recDepth + 1, adjust, true, paintWidth) } //printdbg(`[${words.flatMap(o => o.value.split('').map(s => typesetSymToVisual(s.charCodeAt(0)))).reduce((a,c) => a + String.fromCharCode(c),'')}]`) - return tryJustify(recDepth + 1, adjust) + return tryJustify(recDepth + 1, adjust, fuckit, paintWidth) } words.forEach((o,i) => printdbg(`${i}\t${o.type}\t${o.value}`)) - let justed = tryJustify(0,0) + let justed = tryJustify(0,0,false,paintWidth) textCursor += justed let lastLineInd = (lineIndices.last() || 0) - 1 @@ -514,6 +520,9 @@ function drawCmdbuf() { con.move(windowHeight, 2) print(editorModeLabel[editorMode]) + con.move(windowHeight, windowWidth - 16) + print(parModeLabel[typeset.strategy]) + if (2 == editorMode) print(cmdbuf) } diff --git a/lib/gdx-1.11.0-javadoc.jar b/lib/gdx-1.11.0-javadoc.jar deleted file mode 100644 index c8482fa..0000000 Binary files a/lib/gdx-1.11.0-javadoc.jar and /dev/null differ diff --git a/lib/gdx-1.11.0.jar b/lib/gdx-1.11.0.jar deleted file mode 100644 index 1a0381b..0000000 Binary files a/lib/gdx-1.11.0.jar and /dev/null differ diff --git a/lib/gdx-1.12.1-javadoc.jar b/lib/gdx-1.12.1-javadoc.jar new file mode 100644 index 0000000..b5a2406 Binary files /dev/null and b/lib/gdx-1.12.1-javadoc.jar differ diff --git a/lib/gdx-1.11.0-sources.jar b/lib/gdx-1.12.1-sources.jar similarity index 69% rename from lib/gdx-1.11.0-sources.jar rename to lib/gdx-1.12.1-sources.jar index 22d94b5..85793e3 100644 Binary files a/lib/gdx-1.11.0-sources.jar and b/lib/gdx-1.12.1-sources.jar differ diff --git a/lib/gdx-1.12.1.jar b/lib/gdx-1.12.1.jar new file mode 100644 index 0000000..cca1834 Binary files /dev/null and b/lib/gdx-1.12.1.jar differ diff --git a/lib/gdx-backend-lwjgl3-1.11.0-javadoc.jar b/lib/gdx-backend-lwjgl3-1.11.0-javadoc.jar deleted file mode 100644 index 266008a..0000000 Binary files a/lib/gdx-backend-lwjgl3-1.11.0-javadoc.jar and /dev/null differ diff --git a/lib/gdx-backend-lwjgl3-1.11.0-sources.jar b/lib/gdx-backend-lwjgl3-1.11.0-sources.jar deleted file mode 100644 index d3e9d25..0000000 Binary files a/lib/gdx-backend-lwjgl3-1.11.0-sources.jar and /dev/null differ diff --git a/lib/gdx-backend-lwjgl3-1.11.0.jar b/lib/gdx-backend-lwjgl3-1.11.0.jar deleted file mode 100644 index 66778d9..0000000 Binary files a/lib/gdx-backend-lwjgl3-1.11.0.jar and /dev/null differ diff --git a/lib/gdx-backend-lwjgl3-1.12.1-javadoc.jar b/lib/gdx-backend-lwjgl3-1.12.1-javadoc.jar new file mode 100644 index 0000000..336b777 Binary files /dev/null and b/lib/gdx-backend-lwjgl3-1.12.1-javadoc.jar differ diff --git a/lib/gdx-backend-lwjgl3-1.12.1-sources.jar b/lib/gdx-backend-lwjgl3-1.12.1-sources.jar new file mode 100644 index 0000000..e25f6a3 Binary files /dev/null and b/lib/gdx-backend-lwjgl3-1.12.1-sources.jar differ diff --git a/lib/gdx-backend-lwjgl3-1.12.1.jar b/lib/gdx-backend-lwjgl3-1.12.1.jar new file mode 100644 index 0000000..fa3cda5 Binary files /dev/null and b/lib/gdx-backend-lwjgl3-1.12.1.jar differ diff --git a/lib/gdx-platform-1.11.0-natives-arm64-v8a.jar b/lib/gdx-platform-1.11.0-natives-arm64-v8a.jar deleted file mode 100644 index 5b47824..0000000 Binary files a/lib/gdx-platform-1.11.0-natives-arm64-v8a.jar and /dev/null differ diff --git a/lib/gdx-platform-1.11.0-natives-armeabi-v7a.jar b/lib/gdx-platform-1.11.0-natives-armeabi-v7a.jar deleted file mode 100644 index 18f864e..0000000 Binary files a/lib/gdx-platform-1.11.0-natives-armeabi-v7a.jar and /dev/null differ diff --git a/lib/gdx-platform-1.11.0-natives-desktop.jar b/lib/gdx-platform-1.11.0-natives-desktop.jar deleted file mode 100644 index 10d0a11..0000000 Binary files a/lib/gdx-platform-1.11.0-natives-desktop.jar and /dev/null differ diff --git a/lib/gdx-platform-1.11.0-natives-x86_64.jar b/lib/gdx-platform-1.11.0-natives-x86_64.jar deleted file mode 100644 index 17ec203..0000000 Binary files a/lib/gdx-platform-1.11.0-natives-x86_64.jar and /dev/null differ diff --git a/lib/gdx-platform-1.12.1-natives-arm64-v8a.jar b/lib/gdx-platform-1.12.1-natives-arm64-v8a.jar new file mode 100644 index 0000000..a4da440 Binary files /dev/null and b/lib/gdx-platform-1.12.1-natives-arm64-v8a.jar differ diff --git a/lib/gdx-platform-1.12.1-natives-desktop.jar b/lib/gdx-platform-1.12.1-natives-desktop.jar new file mode 100644 index 0000000..fb8b5e1 Binary files /dev/null and b/lib/gdx-platform-1.12.1-natives-desktop.jar differ diff --git a/lib/gdx-platform-1.12.1-natives-x86_64.jar b/lib/gdx-platform-1.12.1-natives-x86_64.jar new file mode 100644 index 0000000..e78b503 Binary files /dev/null and b/lib/gdx-platform-1.12.1-natives-x86_64.jar differ diff --git a/lib/lwjgl-3.3.1-javadoc.jar b/lib/lwjgl-3.3.1-javadoc.jar deleted file mode 100644 index abe70ff..0000000 Binary files a/lib/lwjgl-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index 2156f90..0000000 Binary files a/lib/lwjgl-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index 28b2a23..0000000 Binary files a/lib/lwjgl-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-linux.jar b/lib/lwjgl-3.3.1-natives-linux.jar deleted file mode 100644 index 4bc4509..0000000 Binary files a/lib/lwjgl-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index c529058..0000000 Binary files a/lib/lwjgl-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-macos.jar b/lib/lwjgl-3.3.1-natives-macos.jar deleted file mode 100644 index aad7d19..0000000 Binary files a/lib/lwjgl-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-windows-x86.jar b/lib/lwjgl-3.3.1-natives-windows-x86.jar deleted file mode 100644 index 29fa98b..0000000 Binary files a/lib/lwjgl-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-natives-windows.jar b/lib/lwjgl-3.3.1-natives-windows.jar deleted file mode 100644 index 11b7d35..0000000 Binary files a/lib/lwjgl-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1-sources.jar b/lib/lwjgl-3.3.1-sources.jar deleted file mode 100644 index 02a4bec..0000000 Binary files a/lib/lwjgl-3.3.1-sources.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.1.jar b/lib/lwjgl-3.3.1.jar deleted file mode 100644 index 2d84fdc..0000000 Binary files a/lib/lwjgl-3.3.1.jar and /dev/null differ diff --git a/lib/lwjgl-3.3.3-javadoc.jar b/lib/lwjgl-3.3.3-javadoc.jar new file mode 100644 index 0000000..dd18b2c Binary files /dev/null and b/lib/lwjgl-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..33bb64d Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..78bbfeb Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-3.3.3-natives-linux.jar b/lib/lwjgl-3.3.3-natives-linux.jar new file mode 100644 index 0000000..68018d8 Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..4734724 Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-3.3.3-natives-macos.jar b/lib/lwjgl-3.3.3-natives-macos.jar new file mode 100644 index 0000000..9e66402 Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-3.3.3-natives-windows-x86.jar b/lib/lwjgl-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..0b3c670 Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-3.3.3-natives-windows.jar b/lib/lwjgl-3.3.3-natives-windows.jar new file mode 100644 index 0000000..b4d4691 Binary files /dev/null and b/lib/lwjgl-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-3.3.3-sources.jar b/lib/lwjgl-3.3.3-sources.jar new file mode 100644 index 0000000..55ed37b Binary files /dev/null and b/lib/lwjgl-3.3.3-sources.jar differ diff --git a/lib/lwjgl-3.3.3.jar b/lib/lwjgl-3.3.3.jar new file mode 100644 index 0000000..2d1fcf9 Binary files /dev/null and b/lib/lwjgl-3.3.3.jar differ diff --git a/lib/lwjgl-glfw-3.3.1-javadoc.jar b/lib/lwjgl-glfw-3.3.1-javadoc.jar deleted file mode 100644 index 9c45602..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-glfw-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index 9931a42..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-glfw-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index 9fc7cb7..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-linux.jar b/lib/lwjgl-glfw-3.3.1-natives-linux.jar deleted file mode 100644 index f86908a..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-glfw-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index 4341de3..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-macos.jar b/lib/lwjgl-glfw-3.3.1-natives-macos.jar deleted file mode 100644 index 3159b58..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-windows-x86.jar b/lib/lwjgl-glfw-3.3.1-natives-windows-x86.jar deleted file mode 100644 index 4048dbb..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-natives-windows.jar b/lib/lwjgl-glfw-3.3.1-natives-windows.jar deleted file mode 100644 index 0ab2fa7..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.1-sources.jar b/lib/lwjgl-glfw-3.3.1-sources.jar deleted file mode 100644 index ed7edb9..0000000 Binary files a/lib/lwjgl-glfw-3.3.1-sources.jar and /dev/null differ diff --git a/lib/lwjgl-glfw-3.3.3-javadoc.jar b/lib/lwjgl-glfw-3.3.3-javadoc.jar new file mode 100644 index 0000000..da73b0e Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-glfw-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..9a52302 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-glfw-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..0dcbf63 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-linux.jar b/lib/lwjgl-glfw-3.3.3-natives-linux.jar new file mode 100644 index 0000000..28db301 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-glfw-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..85a87e1 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-macos.jar b/lib/lwjgl-glfw-3.3.3-natives-macos.jar new file mode 100644 index 0000000..d372768 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-windows-x86.jar b/lib/lwjgl-glfw-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..109b53f Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-natives-windows.jar b/lib/lwjgl-glfw-3.3.3-natives-windows.jar new file mode 100644 index 0000000..1a20464 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-glfw-3.3.3-sources.jar b/lib/lwjgl-glfw-3.3.3-sources.jar new file mode 100644 index 0000000..1d19d00 Binary files /dev/null and b/lib/lwjgl-glfw-3.3.3-sources.jar differ diff --git a/lib/lwjgl-glfw-3.3.1.jar b/lib/lwjgl-glfw-3.3.3.jar similarity index 52% rename from lib/lwjgl-glfw-3.3.1.jar rename to lib/lwjgl-glfw-3.3.3.jar index f3961ac..791fe06 100644 Binary files a/lib/lwjgl-glfw-3.3.1.jar and b/lib/lwjgl-glfw-3.3.3.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.1-javadoc.jar b/lib/lwjgl-jemalloc-3.3.1-javadoc.jar deleted file mode 100644 index 80a167b..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index 95a13dc..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index cc4dc02..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-linux.jar b/lib/lwjgl-jemalloc-3.3.1-natives-linux.jar deleted file mode 100644 index df249fa..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-jemalloc-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index a667c87..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-macos.jar b/lib/lwjgl-jemalloc-3.3.1-natives-macos.jar deleted file mode 100644 index f74296d..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-windows-x86.jar b/lib/lwjgl-jemalloc-3.3.1-natives-windows-x86.jar deleted file mode 100644 index 9ad2a91..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1-natives-windows.jar b/lib/lwjgl-jemalloc-3.3.1-natives-windows.jar deleted file mode 100644 index 8c3de21..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.1.jar b/lib/lwjgl-jemalloc-3.3.1.jar deleted file mode 100644 index 3ef8862..0000000 Binary files a/lib/lwjgl-jemalloc-3.3.1.jar and /dev/null differ diff --git a/lib/lwjgl-jemalloc-3.3.3-javadoc.jar b/lib/lwjgl-jemalloc-3.3.3-javadoc.jar new file mode 100644 index 0000000..5db7bdc Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..8485ec6 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..ff4a5ae Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-linux.jar b/lib/lwjgl-jemalloc-3.3.3-natives-linux.jar new file mode 100644 index 0000000..c72f93a Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-jemalloc-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..f420c27 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-macos.jar b/lib/lwjgl-jemalloc-3.3.3-natives-macos.jar new file mode 100644 index 0000000..6e0d867 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-windows-x86.jar b/lib/lwjgl-jemalloc-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..0994f15 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3-natives-windows.jar b/lib/lwjgl-jemalloc-3.3.3-natives-windows.jar new file mode 100644 index 0000000..3bf7629 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.1-sources.jar b/lib/lwjgl-jemalloc-3.3.3-sources.jar similarity index 55% rename from lib/lwjgl-jemalloc-3.3.1-sources.jar rename to lib/lwjgl-jemalloc-3.3.3-sources.jar index adc5a39..74b6a1c 100644 Binary files a/lib/lwjgl-jemalloc-3.3.1-sources.jar and b/lib/lwjgl-jemalloc-3.3.3-sources.jar differ diff --git a/lib/lwjgl-jemalloc-3.3.3.jar b/lib/lwjgl-jemalloc-3.3.3.jar new file mode 100644 index 0000000..6881c26 Binary files /dev/null and b/lib/lwjgl-jemalloc-3.3.3.jar differ diff --git a/lib/lwjgl-openal-3.3.1-javadoc.jar b/lib/lwjgl-openal-3.3.1-javadoc.jar deleted file mode 100644 index d515e03..0000000 Binary files a/lib/lwjgl-openal-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-openal-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index 897c123..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-openal-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index 322f5ef..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-linux.jar b/lib/lwjgl-openal-3.3.1-natives-linux.jar deleted file mode 100644 index 4bc6bc9..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-openal-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index d021df0..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-macos.jar b/lib/lwjgl-openal-3.3.1-natives-macos.jar deleted file mode 100644 index 0f4570f..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-windows-x86.jar b/lib/lwjgl-openal-3.3.1-natives-windows-x86.jar deleted file mode 100644 index 5f4952f..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-natives-windows.jar b/lib/lwjgl-openal-3.3.1-natives-windows.jar deleted file mode 100644 index 0172f5c..0000000 Binary files a/lib/lwjgl-openal-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.1-sources.jar b/lib/lwjgl-openal-3.3.1-sources.jar deleted file mode 100644 index 5f17394..0000000 Binary files a/lib/lwjgl-openal-3.3.1-sources.jar and /dev/null differ diff --git a/lib/lwjgl-openal-3.3.3-javadoc.jar b/lib/lwjgl-openal-3.3.3-javadoc.jar new file mode 100644 index 0000000..a8be56f Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-openal-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..b7130e8 Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-openal-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..88b136e Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-linux.jar b/lib/lwjgl-openal-3.3.3-natives-linux.jar new file mode 100644 index 0000000..46252b4 Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-openal-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..b8f43d9 Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-macos.jar b/lib/lwjgl-openal-3.3.3-natives-macos.jar new file mode 100644 index 0000000..979ca8d Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-windows-x86.jar b/lib/lwjgl-openal-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..cc4e4d5 Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-openal-3.3.3-natives-windows.jar b/lib/lwjgl-openal-3.3.3-natives-windows.jar new file mode 100644 index 0000000..aef969f Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-openal-3.3.3-sources.jar b/lib/lwjgl-openal-3.3.3-sources.jar new file mode 100644 index 0000000..a5ad272 Binary files /dev/null and b/lib/lwjgl-openal-3.3.3-sources.jar differ diff --git a/lib/lwjgl-openal-3.3.1.jar b/lib/lwjgl-openal-3.3.3.jar similarity index 58% rename from lib/lwjgl-openal-3.3.1.jar rename to lib/lwjgl-openal-3.3.3.jar index 97595e3..2a60334 100644 Binary files a/lib/lwjgl-openal-3.3.1.jar and b/lib/lwjgl-openal-3.3.3.jar differ diff --git a/lib/lwjgl-opengl-3.3.1-javadoc.jar b/lib/lwjgl-opengl-3.3.1-javadoc.jar deleted file mode 100644 index 925a83e..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-opengl-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index d566cee..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-opengl-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index aef5906..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-linux.jar b/lib/lwjgl-opengl-3.3.1-natives-linux.jar deleted file mode 100644 index f9ea471..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-opengl-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index b1abd6e..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-macos.jar b/lib/lwjgl-opengl-3.3.1-natives-macos.jar deleted file mode 100644 index 24c1604..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-windows-x86.jar b/lib/lwjgl-opengl-3.3.1-natives-windows-x86.jar deleted file mode 100644 index c710602..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-natives-windows.jar b/lib/lwjgl-opengl-3.3.1-natives-windows.jar deleted file mode 100644 index 07ebba5..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.1-sources.jar b/lib/lwjgl-opengl-3.3.1-sources.jar deleted file mode 100644 index 31f4261..0000000 Binary files a/lib/lwjgl-opengl-3.3.1-sources.jar and /dev/null differ diff --git a/lib/lwjgl-opengl-3.3.3-javadoc.jar b/lib/lwjgl-opengl-3.3.3-javadoc.jar new file mode 100644 index 0000000..fa7217c Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-opengl-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..3fa9767 Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-opengl-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..3746f54 Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-linux.jar b/lib/lwjgl-opengl-3.3.3-natives-linux.jar new file mode 100644 index 0000000..b4198d5 Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-opengl-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..5ef970c Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-macos.jar b/lib/lwjgl-opengl-3.3.3-natives-macos.jar new file mode 100644 index 0000000..3bf3d9c Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-windows-x86.jar b/lib/lwjgl-opengl-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..ca888bb Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-natives-windows.jar b/lib/lwjgl-opengl-3.3.3-natives-windows.jar new file mode 100644 index 0000000..2b98a32 Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-opengl-3.3.3-sources.jar b/lib/lwjgl-opengl-3.3.3-sources.jar new file mode 100644 index 0000000..70c0f78 Binary files /dev/null and b/lib/lwjgl-opengl-3.3.3-sources.jar differ diff --git a/lib/lwjgl-opengl-3.3.1.jar b/lib/lwjgl-opengl-3.3.3.jar similarity index 65% rename from lib/lwjgl-opengl-3.3.1.jar rename to lib/lwjgl-opengl-3.3.3.jar index 0a61e4e..9905636 100644 Binary files a/lib/lwjgl-opengl-3.3.1.jar and b/lib/lwjgl-opengl-3.3.3.jar differ diff --git a/lib/lwjgl-stb-3.3.1-javadoc.jar b/lib/lwjgl-stb-3.3.1-javadoc.jar deleted file mode 100644 index 7a2f0e5..0000000 Binary files a/lib/lwjgl-stb-3.3.1-javadoc.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-linux-arm32.jar b/lib/lwjgl-stb-3.3.1-natives-linux-arm32.jar deleted file mode 100644 index caab715..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-linux-arm32.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-linux-arm64.jar b/lib/lwjgl-stb-3.3.1-natives-linux-arm64.jar deleted file mode 100644 index fc8d7d2..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-linux-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-linux.jar b/lib/lwjgl-stb-3.3.1-natives-linux.jar deleted file mode 100644 index 75f02ae..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-linux.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-macos-arm64.jar b/lib/lwjgl-stb-3.3.1-natives-macos-arm64.jar deleted file mode 100644 index 342f5f9..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-macos-arm64.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-macos.jar b/lib/lwjgl-stb-3.3.1-natives-macos.jar deleted file mode 100644 index 40422e2..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-macos.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-windows-x86.jar b/lib/lwjgl-stb-3.3.1-natives-windows-x86.jar deleted file mode 100644 index 7bee560..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-windows-x86.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-natives-windows.jar b/lib/lwjgl-stb-3.3.1-natives-windows.jar deleted file mode 100644 index 0f6876a..0000000 Binary files a/lib/lwjgl-stb-3.3.1-natives-windows.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1-sources.jar b/lib/lwjgl-stb-3.3.1-sources.jar deleted file mode 100644 index fc8c6f8..0000000 Binary files a/lib/lwjgl-stb-3.3.1-sources.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.1.jar b/lib/lwjgl-stb-3.3.1.jar deleted file mode 100644 index db8b94d..0000000 Binary files a/lib/lwjgl-stb-3.3.1.jar and /dev/null differ diff --git a/lib/lwjgl-stb-3.3.3-javadoc.jar b/lib/lwjgl-stb-3.3.3-javadoc.jar new file mode 100644 index 0000000..5910560 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-javadoc.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-linux-arm32.jar b/lib/lwjgl-stb-3.3.3-natives-linux-arm32.jar new file mode 100644 index 0000000..e5ae6d2 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-linux-arm32.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-linux-arm64.jar b/lib/lwjgl-stb-3.3.3-natives-linux-arm64.jar new file mode 100644 index 0000000..58b799e Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-linux-arm64.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-linux.jar b/lib/lwjgl-stb-3.3.3-natives-linux.jar new file mode 100644 index 0000000..b8ccae2 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-linux.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-macos-arm64.jar b/lib/lwjgl-stb-3.3.3-natives-macos-arm64.jar new file mode 100644 index 0000000..22015e8 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-macos-arm64.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-macos.jar b/lib/lwjgl-stb-3.3.3-natives-macos.jar new file mode 100644 index 0000000..eaffd91 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-macos.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-windows-x86.jar b/lib/lwjgl-stb-3.3.3-natives-windows-x86.jar new file mode 100644 index 0000000..be4d378 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-windows-x86.jar differ diff --git a/lib/lwjgl-stb-3.3.3-natives-windows.jar b/lib/lwjgl-stb-3.3.3-natives-windows.jar new file mode 100644 index 0000000..6cd6512 Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-natives-windows.jar differ diff --git a/lib/lwjgl-stb-3.3.3-sources.jar b/lib/lwjgl-stb-3.3.3-sources.jar new file mode 100644 index 0000000..80ca7ce Binary files /dev/null and b/lib/lwjgl-stb-3.3.3-sources.jar differ diff --git a/lib/lwjgl-stb-3.3.3.jar b/lib/lwjgl-stb-3.3.3.jar new file mode 100644 index 0000000..ba65bed Binary files /dev/null and b/lib/lwjgl-stb-3.3.3.jar differ diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt index 1ec357b..6fdd636 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/GraphicsAdapter.kt @@ -23,6 +23,7 @@ import java.io.InputStream import java.io.OutputStream import java.lang.IllegalArgumentException import kotlin.experimental.and +import kotlin.math.floor data class AdapterConfig( val theme: String, @@ -39,7 +40,7 @@ data class AdapterConfig( val paletteShader: String = DRAW_SHADER_FRAG, val drawScale: Float = 1f, val scaleFiltered: Boolean = false, - val baudRate: Double = 57600.0, + val baudRate: Double = 20_480_000.0,//57600.0, val bitsPerChar: Int = 10 // start bit + 8 data bits + stop bit ) @@ -243,6 +244,31 @@ open class GraphicsAdapter(private val assetsRoot: String, val vm: VM, val confi } } + + protected val sleepMillis = if (config.baudRate == 0.0 || config.baudRate >= 1000000000.0) // sleep time of 1ns or less is considered as instant + 0L + else + floor((1.0 / (config.baudRate / config.bitsPerChar)) * 1000).toLong() + + protected val sleepNanos = if (config.baudRate == 0.0 || config.baudRate >= 1000000000.0) // sleep time of 1ns or less is considered as instant + 0 + else + (((1.0 / (config.baudRate / config.bitsPerChar)) * 1000 * 1000000) % 1000000).toInt() + + protected var slpcnt = 0L + + + @SuppressWarnings() + protected fun applyDelay() { + slpcnt += sleepMillis * 1000000L + sleepNanos + val millis = slpcnt / 1000000L + + if (slpcnt >= 1000000L) { + Thread.sleep(millis, 0) + slpcnt -= millis * 1000000L + } + } + override fun poke(addr: Long, byte: Byte) { val adi = addr.toInt() val bi = byte.toInt().and(255) @@ -272,6 +298,7 @@ open class GraphicsAdapter(private val assetsRoot: String, val vm: VM, val confi poke(addr % VRAM_SIZE, byte) } // HW mirroring } + applyDelay() } private fun getTextmodeAttirbutes(): Byte = (currentChrRom.and(15).shl(4) or diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/IOSpace.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/IOSpace.kt index ca96050..62b5a81 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/IOSpace.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/IOSpace.kt @@ -389,4 +389,7 @@ class IOSpace(val vm: VM) : PeriBase("io"), InputProcessor { return false } + override fun touchCancelled(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + return false + } } diff --git a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt index 02dec02..eae6e1f 100644 --- a/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt +++ b/tsvm_core/src/net/torvald/tsvm/peripheral/TexticsAdapter.kt @@ -12,33 +12,10 @@ import kotlin.math.floor open class TexticsAdapterBase(assetsRoot: String, vm: VM, config: AdapterConfig) : GraphicsAdapter(assetsRoot, vm, config) { - protected val sleepMillis = if (config.baudRate == 0.0 || config.baudRate >= 10000000.0) // sleep time of 100ns or less is considered as instant - 0L - else - floor((1.0 / (config.baudRate / config.bitsPerChar)) * 1000).toLong() - - protected val sleepNanos = if (config.baudRate == 0.0 || config.baudRate >= 10000000.0) // sleep time of 100ns or less is considered as instant - 0 - else - (((1.0 / (config.baudRate / config.bitsPerChar)) * 1000 * 1000000) % 1000000).toInt() - - protected var slpcnt = 0L - init { println("Baud: $sleepMillis ms $sleepNanos ns") } - @SuppressWarnings() - protected inline fun applyDelay() { - slpcnt += sleepMillis * 1000000L + sleepNanos - val millis = slpcnt / 1000000L - - if (slpcnt >= 1000000L) { - Thread.sleep(millis, 0) - slpcnt -= millis * 1000000L - } - } - // private val crtGradTex = Texture("$assetsRoot/crt_grad.png") companion object { @@ -120,7 +97,7 @@ class Term(assetsRoot: String, vm: VM) : TexticsAdapterBase(assetsRoot, vm, Adap "./hp2640.png", 0.32f, GraphicsAdapter.TEXT_TILING_SHADER_MONOCHROME, - baudRate = 57600.0 + baudRate = 9600.0 )) class WpTerm(assetsRoot: String, vm: VM) : TexticsAdapterBase(assetsRoot, vm, AdapterConfig( diff --git a/tsvm_core/tsvm_core.iml b/tsvm_core/tsvm_core.iml index 24f0da6..516f4f1 100644 --- a/tsvm_core/tsvm_core.iml +++ b/tsvm_core/tsvm_core.iml @@ -7,13 +7,10 @@ - - - - + \ No newline at end of file diff --git a/tsvm_executable.iml b/tsvm_executable.iml index 8eb7ed7..942bf2b 100644 --- a/tsvm_executable.iml +++ b/tsvm_executable.iml @@ -7,10 +7,8 @@ - - - + \ No newline at end of file diff --git a/tsvm_executable/src/net/torvald/tsvm/AppLoader.java b/tsvm_executable/src/net/torvald/tsvm/AppLoader.java index 4a7dfc3..9129e69 100644 --- a/tsvm_executable/src/net/torvald/tsvm/AppLoader.java +++ b/tsvm_executable/src/net/torvald/tsvm/AppLoader.java @@ -14,8 +14,8 @@ public class AppLoader { public static String appTitle = "tsvm"; public static Lwjgl3ApplicationConfiguration appConfig; - public static int WIDTH = 800;//1080;//640; - public static int HEIGHT = 540;//436;//480; + public static int WIDTH = 640; + public static int HEIGHT = 480; public static void main(String[] args) { ShaderProgram.pedantic = false; @@ -41,9 +41,9 @@ public class AppLoader { // VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, BasicRom.INSTANCE}); // VM vm = new VM(64 << 10, new TheRealWorld(), new VMProgramRom[]{OEMBios.INSTANCE, BasicRom.INSTANCE}); // VM vm = new VM("./assets", 64 << 10, new TheRealWorld(), new VMProgramRom[]{TandemBios.INSTANCE, BasicRom.INSTANCE}, 2, watchdogs); -// VM vm = new VM(128 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, WPBios.INSTANCE}); - VM vm = new VM("./assets", 8192 << 10, new TheRealWorld(), new VMProgramRom[]{TsvmBios.INSTANCE}, 8, watchdogs); -// VM vm = new VM("./assets", 8192 << 10, new TheRealWorld(), new VMProgramRom[]{OpenBios.INSTANCE}, 8, watchdogs); +// VM vm = new VM("./assets", 128 << 10, new TheRealWorld(), new VMProgramRom[]{BasicBios.INSTANCE, WPBios.INSTANCE}, 2, watchdogs); +// VM vm = new VM("./assets", 8192 << 10, new TheRealWorld(), new VMProgramRom[]{TsvmBios.INSTANCE}, 8, watchdogs); + VM vm = new VM("./assets", 8192 << 10, new TheRealWorld(), new VMProgramRom[]{OpenBios.INSTANCE}, 8, watchdogs); // VM pipvm = new VM("./assets", 4096, new TheRealWorld(), new VMProgramRom[]{PipBios.INSTANCE, PipROM.INSTANCE}, 8, watchdogs); vm.getIO().getBlockTransferPorts()[0].attachDevice(new TestDiskDrive(vm, 0, diskPath)); diff --git a/tsvm_executable/src/net/torvald/tsvm/VMEmuInputProcessor.kt b/tsvm_executable/src/net/torvald/tsvm/VMEmuInputProcessor.kt index 34ef866..4258cb4 100644 --- a/tsvm_executable/src/net/torvald/tsvm/VMEmuInputProcessor.kt +++ b/tsvm_executable/src/net/torvald/tsvm/VMEmuInputProcessor.kt @@ -38,4 +38,8 @@ class VMEmuInputProcessor(val host: VMEmuExecutable) : InputProcessor { override fun scrolled(amountX: Float, amountY: Float): Boolean { return false } + + override fun touchCancelled(screenX: Int, screenY: Int, pointer: Int, button: Int): Boolean { + return false + } } \ No newline at end of file