gdx 1.10/lwjgl3 migration; removing old Lua stuffs

src/net/torvald/terrarum/tests/ColorMapTest.kt

@@ -3,8 +3,8 @@ package net.torvald.terrarum.tests
 import com.badlogic.gdx.Game
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Screen
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import net.torvald.terrarum.GdxColorMap
 
@@ -53,16 +53,9 @@ class ColorMapTest : Game() {
 fun main(args: Array<String>) {
     ShaderProgram.pedantic = false
 
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = false//true;
-    //appConfig.width = 1072; // IMAX ratio
-    //appConfig.height = 742; // IMAX ratio
-    appConfig.width = 1110 // photographic ratio (1.5:1)
-    appConfig.height = 740 // photographic ratio (1.5:1)
-    appConfig.backgroundFPS = 9999
-    appConfig.foregroundFPS = 9999
-    appConfig.forceExit = false
-
-    LwjglApplication(ColorMapTest(), appConfig)
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(1110, 740)
+    Lwjgl3Application(ColorMapTest(), appConfig)
 }

src/net/torvald/terrarum/tests/MakeKeylayoutFile.kt

@@ -2,8 +2,8 @@ package net.torvald.terrarum.tests
 
 import com.badlogic.gdx.*
 import com.badlogic.gdx.Input.Keys.*
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.g2d.BitmapFont
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.EMDASH
@@ -133,15 +133,15 @@ class GetKeycode : Game() {
     }
 }
 
-fun main() {val appConfig = LwjglApplicationConfiguration()
-    appConfig.resizable = false
-    appConfig.width = 256
-    appConfig.height = 64
-    appConfig.foregroundFPS = 60
-    appConfig.backgroundFPS = 60
+fun main() {
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(256, 64)
+    appConfig.setForegroundFPS(2)
+    appConfig.setIdleFPS(2)
 
     val gdxWindow = GetKeycode()
 
-    LwjglApplication(gdxWindow, appConfig)
+    Lwjgl3Application(gdxWindow, appConfig)
     MakeKeylayoutFile.invoke()
 }

src/net/torvald/terrarum/tests/NoiseGenerator.kt

@@ -4,8 +4,8 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Input
 import com.badlogic.gdx.InputAdapter
 import com.badlogic.gdx.ScreenAdapter
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.Pixmap
@@ -45,11 +45,11 @@ class NoiseGenerator : ScreenAdapter() {
         Gdx.input.inputProcessor = NoiseGeneratorController(this)
 
         batch = SpriteBatch()
-        camera = OrthographicCamera(AppLoader.appConfig.width.toFloat(), AppLoader.appConfig.height.toFloat())
+        camera = OrthographicCamera(AppLoader.screenSize.screenWf, AppLoader.screenSize.screenHf)
 
-        camera.setToOrtho(true, AppLoader.appConfig.width.toFloat(), AppLoader.appConfig.height.toFloat())
+        camera.setToOrtho(true, AppLoader.screenSize.screenWf, AppLoader.screenSize.screenHf)
         camera.update()
-        Gdx.gl20.glViewport(0, 0, AppLoader.appConfig.width, AppLoader.appConfig.height)
+        Gdx.gl20.glViewport(0, 0, AppLoader.screenSize.screenW, AppLoader.screenSize.screenH)
 
         pixmap = Pixmap(IMAGE_SIZE, IMAGE_SIZE, Pixmap.Format.RGBA8888)
         texture = Texture(1, 1, Pixmap.Format.RGBA8888)
@@ -253,14 +253,10 @@ class NoiseGeneratorController(val host: NoiseGenerator) : InputAdapter() {
 fun main(args: Array<String>) {
     ShaderProgram.pedantic = false
 
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = false//true;
-    appConfig.width = 1024
-    appConfig.height = 1024
-    appConfig.backgroundFPS = 9999
-    appConfig.foregroundFPS = 9999
-    appConfig.forceExit = false
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(1024, 1024)
 
-    LwjglApplication(AppLoader(appConfig, NoiseGenerator()), appConfig)
+    Lwjgl3Application(AppLoader(appConfig, NoiseGenerator()), appConfig)
 }

src/net/torvald/terrarum/tests/NoopRectTest.kt

@@ -2,8 +2,8 @@ package net.torvald.terrarum.tests
 
 import com.badlogic.gdx.Game
 import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.Pixmap
@@ -15,10 +15,13 @@ import net.torvald.terrarum.Point2i
 import net.torvald.terrarum.inUse
 import net.torvald.terrarum.worlddrawer.toRGBA
 
+val RECTTEST_WIDTH = 768
+val RECTTEST_HEIGHT = 768
+
 /**
  * Created by minjaesong on 2019-02-04.
  */
-class NoopRectTest(val appConfig: LwjglApplicationConfiguration) : Game() {
+class NoopRectTest(val appConfig: Lwjgl3ApplicationConfiguration) : Game() {
 
     private val SIZE = 100
 
@@ -47,7 +50,7 @@ class NoopRectTest(val appConfig: LwjglApplicationConfiguration) : Game() {
         texture = Texture(1, 1, Pixmap.Format.RGBA8888)
 
         batch = SpriteBatch()
-        camera = OrthographicCamera(appConfig.width.toFloat(), appConfig.height.toFloat())
+        camera = OrthographicCamera(RECTTEST_WIDTH.toFloat(), RECTTEST_HEIGHT.toFloat())
         camera.setToOrtho(true)
     }
 
@@ -104,7 +107,7 @@ class NoopRectTest(val appConfig: LwjglApplicationConfiguration) : Game() {
 
         batch.inUse {
             batch.projectionMatrix = camera.combined
-            batch.draw(texture, 0f, 0f, appConfig.width.toFloat(), appConfig.height.toFloat())
+            batch.draw(texture, 0f, 0f, RECTTEST_WIDTH.toFloat(), RECTTEST_HEIGHT.toFloat())
         }
 
         println()
@@ -167,12 +170,8 @@ class NoopRectTest(val appConfig: LwjglApplicationConfiguration) : Game() {
 }
 
 fun main(args: Array<String>) {
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.forceExit = false
-    appConfig.width = 768
-    appConfig.height = 768
-    appConfig.backgroundFPS = 2
-    appConfig.foregroundFPS = 2
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.setWindowedMode(RECTTEST_WIDTH, RECTTEST_HEIGHT)
 
-    LwjglApplication(NoopRectTest(appConfig), appConfig)
+    Lwjgl3Application(NoopRectTest(appConfig), appConfig)
 }

src/net/torvald/terrarum/tests/SurroundPannerTest.kt

@@ -3,8 +3,8 @@ package net.torvald.terrarum.tests
 import com.badlogic.gdx.Game
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.audio.Sound
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.files.FileHandle
 import java.awt.BorderLayout
 import javax.swing.JFrame
@@ -59,15 +59,14 @@ class AudioPlayerSlave : Game() {
 }
 
 fun main(args: Array<String>) {
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = true
-    appConfig.width = 256
-    appConfig.height = 256
-    appConfig.backgroundFPS = 20
-    appConfig.foregroundFPS = 20
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(true)
+    appConfig.setWindowedMode(256, 256)
+    appConfig.setForegroundFPS(20)
+    appConfig.setIdleFPS(20)
 
-    LwjglApplication(AudioPlayerSlave(), appConfig)
+    Lwjgl3Application(AudioPlayerSlave(), appConfig)
 }
 
 

src/net/torvald/terrarum/tests/UIElemTest.kt

@@ -3,8 +3,8 @@ package net.torvald.terrarum.tests
 import com.badlogic.gdx.ApplicationAdapter
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Input
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
@@ -110,14 +110,11 @@ class DummyTogglePane : UICanvas() {
 fun main(args: Array<String>) {
     ShaderProgram.pedantic = false
 
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = false
-    appConfig.width = 800
-    appConfig.height = 600
-    appConfig.backgroundFPS = 60
-    appConfig.foregroundFPS = 60
-    appConfig.forceExit = false
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(800, 600)
+    appConfig.setForegroundFPS(60)
 
-    LwjglApplication(UIElemTest(), appConfig)
+    Lwjgl3Application(UIElemTest(), appConfig)
 }

src/net/torvald/terrarum/tests/UITestPad1.kt

@@ -3,8 +3,8 @@ package net.torvald.terrarum.tests
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.InputAdapter
 import com.badlogic.gdx.ScreenAdapter
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
@@ -13,6 +13,9 @@ import net.torvald.terrarum.*
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.ui.UINSMenu
 
+val UITEST1_WIDTH = 1280
+val UITEST1_HEIGHT = 720
+
 /**
  * Created by minjaesong on 2018-12-09.
  */
@@ -67,13 +70,13 @@ class UITestPad1 : ScreenAdapter() {
                 Yaml(treeStr)
         )
         batch = SpriteBatch()
-        camera = OrthographicCamera(AppLoader.appConfig.width.toFloat(), AppLoader.appConfig.height.toFloat())
+        camera = OrthographicCamera(UITEST1_WIDTH.toFloat(), UITEST1_HEIGHT.toFloat())
 
-        camera.setToOrtho(true, AppLoader.appConfig.width.toFloat(), AppLoader.appConfig.height.toFloat())
+        camera.setToOrtho(true, UITEST1_WIDTH.toFloat(), UITEST1_HEIGHT.toFloat())
         camera.update()
-        Gdx.gl20.glViewport(0, 0, AppLoader.appConfig.width, AppLoader.appConfig.height)
+        Gdx.gl20.glViewport(0, 0, UITEST1_WIDTH, UITEST1_HEIGHT)
 
-        resize(AppLoader.appConfig.width, AppLoader.appConfig.height)
+        resize(UITEST1_WIDTH, UITEST1_HEIGHT)
 
         nsMenu.setPosition(0, 0)
         nsMenu.setAsAlwaysVisible()
@@ -148,16 +151,10 @@ class UITestPad1Controller(val host: UITestPad1) : InputAdapter() {
 fun main(args: Array<String>) {
     ShaderProgram.pedantic = false
 
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = false//true;
-    //appConfig.width = 1072; // IMAX ratio
-    //appConfig.height = 742; // IMAX ratio
-    appConfig.width = 1110 // photographic ratio (1.5:1)
-    appConfig.height = 740 // photographic ratio (1.5:1)
-    appConfig.backgroundFPS = 9999
-    appConfig.foregroundFPS = 9999
-    appConfig.forceExit = false
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(UITEST1_WIDTH, UITEST1_HEIGHT)
 
-    LwjglApplication(AppLoader(appConfig, UITestPad1()), appConfig)
+    Lwjgl3Application(AppLoader(appConfig, UITestPad1()), appConfig)
 }

src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt

@@ -3,8 +3,8 @@ package net.torvald.terrarum.tests
 import com.badlogic.gdx.ApplicationAdapter
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Input
-import com.badlogic.gdx.backends.lwjgl.LwjglApplication
-import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
+import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.Pixmap
@@ -29,8 +29,8 @@ import kotlin.math.sin
 import kotlin.random.Random
 import kotlin.coroutines.*
 
-const val WIDTH = 768
-const val HEIGHT = 512
+const val NOISEBOX_WIDTH = 768
+const val NOISEBOX_HEIGHT = 512
 const val TWO_PI = Math.PI * 2
 
 /**
@@ -60,13 +60,13 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
         font = BitmapFont() // use default because fuck it
 
         batch = SpriteBatch()
-        camera = OrthographicCamera(WIDTH.toFloat(), HEIGHT.toFloat())
+        camera = OrthographicCamera(NOISEBOX_WIDTH.toFloat(), NOISEBOX_HEIGHT.toFloat())
         camera.setToOrtho(false) // some elements are pre-flipped, while some are not. The statement itself is absolutely necessary to make edge of the screen as the origin
         camera.update()
         batch.projectionMatrix = camera.combined
-        Gdx.gl20.glViewport(0, 0, WIDTH, HEIGHT)
+        Gdx.gl20.glViewport(0, 0, NOISEBOX_WIDTH, NOISEBOX_HEIGHT)
 
-        testTex = Pixmap(WIDTH, HEIGHT, Pixmap.Format.RGBA8888)
+        testTex = Pixmap(NOISEBOX_WIDTH, NOISEBOX_HEIGHT, Pixmap.Format.RGBA8888)
         testTex.blending = Pixmap.Blending.None
         tempTex = Texture(1, 1, Pixmap.Format.RGBA8888)
 
@@ -112,10 +112,10 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
         // draw timer
         batch.inUse {
             if (!generationTimeInMeasure) {
-                font.draw(batch, "Generation time: ${generationTime} seconds", 8f, HEIGHT - 8f)
+                font.draw(batch, "Generation time: ${generationTime} seconds", 8f, NOISEBOX_HEIGHT - 8f)
             }
             else {
-                font.draw(batch, "Generating...", 8f, HEIGHT - 8f)
+                font.draw(batch, "Generating...", 8f, NOISEBOX_HEIGHT - 8f)
             }
         }
     }
@@ -129,7 +129,7 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
 
     val colourNull = Color(0x1b3281ff)
 
-    private val sampleOffset = WIDTH / 8.0
+    private val sampleOffset = NOISEBOX_WIDTH / 8.0
 
     private val testColSet = arrayOf(
             Color(0xff0000ff.toInt()),
@@ -222,8 +222,8 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
         val runnables: List<RunnableFun> = (0 until testTex.width).sliceEvenly(genSlices).map { range -> {
                 val localJoise = getNoiseGenerator(seed)
                 for (x in range) {
-                    for (y in 0 until HEIGHT) {
-                        val sampleTheta = (x.toDouble() / WIDTH) * TWO_PI
+                    for (y in 0 until NOISEBOX_HEIGHT) {
+                        val sampleTheta = (x.toDouble() / NOISEBOX_WIDTH) * TWO_PI
                         val sampleX = sin(sampleTheta) * sampleOffset + sampleOffset // plus sampleOffset to make only
                         val sampleZ = cos(sampleTheta) * sampleOffset + sampleOffset // positive points are to be sampled
                         val sampleY = y.toDouble()
@@ -253,16 +253,13 @@ class WorldgenNoiseSandbox : ApplicationAdapter() {
 fun main(args: Array<String>) {
     ShaderProgram.pedantic = false
 
-    val appConfig = LwjglApplicationConfiguration()
-    appConfig.vSyncEnabled = false
-    appConfig.resizable = false
-    appConfig.width = WIDTH
-    appConfig.height = HEIGHT
-    appConfig.backgroundFPS = 60
-    appConfig.foregroundFPS = 60
-    appConfig.forceExit = false
+    val appConfig = Lwjgl3ApplicationConfiguration()
+    appConfig.useVsync(false)
+    appConfig.setResizable(false)
+    appConfig.setWindowedMode(NOISEBOX_WIDTH, NOISEBOX_HEIGHT)
+    appConfig.setForegroundFPS(60)
 
-    LwjglApplication(WorldgenNoiseSandbox(), appConfig)
+    Lwjgl3Application(WorldgenNoiseSandbox(), appConfig)
 }
 
 internal interface NoiseMaker {