parallax (sky looks bluer when you go up)

.gitignore

@@ -5,3 +5,5 @@ Thumbs.db
 *.jar
 .DS_Store
 ~$*
+assets/modules/basegame/demoworld
+assets/modules/basegame/demoworld.gz

assets/4096_bayer_skyboxfill.frag

@@ -5,6 +5,8 @@ uniform sampler2D u_texture;
 
 uniform vec3 topColor;
 uniform vec3 bottomColor;
+uniform float parallax = 0.0; // +1.0: all top col, -1.0: all bototm col, 0.0: normal grad
+uniform float parallax_size = 1.0/3.0; // 0: no parallax
 
 
 // "steps" of R, G and B. Must be integer && equal or greater than 2
@@ -48,7 +50,9 @@ vec4 nearestColour(vec4 incolor) {
 void main(void) {
     float spread = 1.0 / (0.299 * (rcount - 1.0) + 0.587 * (gcount - 1.0) + 0.114 * (bcount - 1.0));  // this spread value is optimised one -- try your own values for various effects!
 
-    float scale = v_texCoords.y;
+    float scale = v_texCoords.y * (1.0 - parallax_size) + (parallax_size / 2.0) + (parallax * parallax_size / 2.0);
+
+
     float inR = mix(bottomColor.r, topColor.r, scale);
     float inG = mix(bottomColor.g, topColor.g, scale);
     float inB = mix(bottomColor.b, topColor.b, scale);
@@ -58,4 +62,16 @@ void main(void) {
     vec2 entry = mod(gl_FragCoord.xy, vec2(bayerSize, bayerSize));
 
     gl_FragColor = nearestColour(inColor + spread * (bayer[int(entry.y)][int(entry.x)] / bayerDivider - 0.5));
-}
+}
+
+/*
+UV mapping coord.y
+
+-+ <- 1.0  =
+D|         = // parallax of +1
+i|  =      =
+s|  = // parallax of 0
+p|  =      =
+.|         = // parallax of -1
+-+ <- 0.0  =
+*/

assets/locales/bgBG/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Модули"
+}

assets/locales/csCZ/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduly"
+}

assets/locales/daDK/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduler"
+}

assets/locales/de/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modulen"
+}

assets/locales/elGR/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Ενότητες"
+}

assets/locales/en/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modules"
+}

assets/locales/es/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Módulos"
+}

assets/locales/fiFI/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduulit"
+}

assets/locales/frFR/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modules"
+}

assets/locales/huHU/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modulok"
+}

assets/locales/isIC/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Einingar"
+}

assets/locales/it/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduli"
+}

assets/locales/jaJP/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "モジュール"
+}

assets/locales/jakanaJP/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "モジュール"
+}

assets/locales/koKR/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "모듈"
+}

assets/locales/nlNL/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modules"
+}

assets/locales/noNB/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduler"
+}

assets/locales/plPL/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduły"
+}

assets/locales/ptBR/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Módulos"
+}

assets/locales/ptPT/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Módulos"
+}

assets/locales/roRO/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Module"
+}

assets/locales/ruRU/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Модули"
+}

assets/locales/svSE/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Moduler"
+}

assets/locales/thTH/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "โมดูล"
+}

assets/locales/trTR/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "Modüller"
+}

assets/locales/zhCN/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "模块"
+}

assets/locales/zhTW/terrarum.json

@@ -0,0 +1,3 @@
+{
+  "MENU_MODULES" : "模塊"
+}

src/net/torvald/terrarum/Terrarum.kt

@@ -400,18 +400,18 @@ object Terrarum : Game() {
 
 
 
-        //ingame = Ingame(batch)
+        ingame = Ingame(batch)
         //ingame!!.gameLoadInfoPayload = Ingame.NewWorldParameters(8192, 2048, HQRNG().nextLong())
 
         // TODO: create world being used by title screen, and serialise it.
-        //ingame!!.gameLoadInfoPayload = Ingame.NewWorldParameters(2400, 800, HQRNG().nextLong())
+        ingame!!.gameLoadInfoPayload = Ingame.NewWorldParameters(2400, 800, HQRNG().nextLong())
-        //ingame!!.gameLoadMode = Ingame.GameLoadMode.CREATE_NEW
+        ingame!!.gameLoadMode = Ingame.GameLoadMode.CREATE_NEW
 
 
-        //LoadScreen.screenToLoad = ingame!!
+        LoadScreen.screenToLoad = ingame!!
 
-        super.setScreen(TitleScreen(batch))
+        //super.setScreen(TitleScreen(batch))
-        //super.setScreen(LoadScreen)
+        super.setScreen(LoadScreen)
 
         //super.setScreen(ingame)
     }

src/net/torvald/terrarum/TitleScreen.kt

@@ -79,7 +79,7 @@ class TitleScreen(val batch: SpriteBatch) : Screen {
         )
         cameraPlayer.hitbox.setDimension(2.0, 2.0)
 
-        demoWorld.time.timeDelta = 45
+        demoWorld.time.timeDelta = 60
 
 
         LightmapRenderer.world = demoWorld

src/net/torvald/terrarum/ui/UIStartMenu.kt

@@ -12,6 +12,7 @@ class UIStartMenu : UICanvas() {
                 "MENU_MODE_SINGLEPLAYER",
                 "MENU_OPTIONS",
                 "MENU_MODULES",
+                "MENU_LABEL_LANGUAGE",
                 "MENU_LABEL_EXIT"
         )
 
@@ -34,6 +35,8 @@ class UIStartMenu : UICanvas() {
             readFromLang = true,
             activeBackCol = Color(0),
             highlightBackCol = Color(0),
+            backgroundCol = Color(0),
+            inactiveCol = Color.WHITE,
             defaultSelection = null
     )
 

src/net/torvald/terrarum/weather/WeatherMixer.kt

@@ -2,6 +2,7 @@ package net.torvald.terrarum.weather
 
 import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.*
+import javafx.scene.effect.Light
 import net.torvald.terrarum.utils.JsonFetcher
 import net.torvald.colourutil.*
 import net.torvald.random.HQRNG
@@ -11,6 +12,10 @@ import net.torvald.terrarum.gameactors.ParticleTestRain
 import net.torvald.terrarum.gamecontroller.KeyToggler
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.WorldTime
+import net.torvald.terrarum.worlddrawer.FeaturesDrawer
+import net.torvald.terrarum.worlddrawer.LightmapRenderer
+import net.torvald.terrarum.worlddrawer.WorldCamera
+import net.torvald.terrarum.worldgenerator.WorldGenerator
 import java.io.File
 import java.util.*
 
@@ -89,6 +94,9 @@ object WeatherMixer {
 
     }
 
+    private val parallaxZeroPos = WorldGenerator.TERRAIN_AVERAGE_HEIGHT// + WorldGenerator.TERRAIN_UNDULATION.div(2)
+    private val parallaxDomainSize = WorldGenerator.TERRAIN_UNDULATION / 2f
+
     fun render(camera: Camera, world: GameWorld) {
 
         // we will not care for nextSkybox for now
@@ -100,16 +108,33 @@ object WeatherMixer {
         globalLightNow.set(globalLight)
 
 
+        /* (copied from the shader source)
+         UV mapping coord.y
+
+         -+ <- 1.0  =
+         D|         = // parallax of +1
+         i|  =      =
+         s|  = // parallax of 0
+         p|  =      =
+         .|         = // parallax of -1
+         -+ <- 0.0  =
+         */
+        val parallax: Float = (parallaxZeroPos - WorldCamera.gdxCamY.div(FeaturesDrawer.TILE_SIZE.toFloat())) / parallaxDomainSize
+
+
         // draw skybox to provided graphics instance
         val topCol = getGradientColour(skyboxColourMap, 0, timeNow)
         val bottomCol = getGradientColour(skyboxColourMap, 1, timeNow)
 
+        println("zero pos: $parallaxZeroPos, domain_size: $parallaxDomainSize")
+
         //Terrarum.textureWhiteSquare.bind(0)
 
         Terrarum.shaderBayerSkyboxFill.begin()
         Terrarum.shaderBayerSkyboxFill.setUniformMatrix("u_projTrans", camera.combined)
         Terrarum.shaderBayerSkyboxFill.setUniformf("topColor", topCol.r, topCol.g, topCol.b)
         Terrarum.shaderBayerSkyboxFill.setUniformf("bottomColor", bottomCol.r, bottomCol.g, bottomCol.b)
+        Terrarum.shaderBayerSkyboxFill.setUniformf("parallax", parallax)
         Terrarum.fullscreenQuad.render(Terrarum.shaderBayerSkyboxFill, GL20.GL_TRIANGLES)
         Terrarum.shaderBayerSkyboxFill.end()
     }

src/net/torvald/terrarum/worldgenerator/WorldGenerator.kt

@@ -39,16 +39,16 @@ object WorldGenerator {
     private val NOISE_SIMPLEX_ORE_START = 1.42
     private val NOISE_SIMPLEX_ORE_END = 1.28
 
-    private val TERRAIN_UNDULATION = 200
+    val TERRAIN_UNDULATION = 200
 
-    private val SIMPLEXGEN_LARGEST_FEATURE = 200
+    val SIMPLEXGEN_LARGEST_FEATURE = 200
 
-    private var OCEAN_WIDTH = 400
+    var OCEAN_WIDTH = 400
-    private var SHORE_WIDTH = 120
+    var SHORE_WIDTH = 120
-    private val MAX_OCEAN_DEPTH = 200
+    val MAX_OCEAN_DEPTH = 200
 
-    private var GLACIER_MOUNTAIN_WIDTH = 900
+    var GLACIER_MOUNTAIN_WIDTH = 900
-    private val GLACIER_MOUNTAIN_HEIGHT = 300
+    val GLACIER_MOUNTAIN_HEIGHT = 300
 
     private val CAVEGEN_THRE_START = 0.4
     private val CAVEGEN_THRE_END = 0.1