more testing on skydome / font change

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.72'
 
     repositories {
         mavenCentral()
@@ -27,6 +27,7 @@ repositories {
 }
 
 dependencies {
+    compile "org.jetbrains.kotlin:kotlinx-coroutines-core"
     compile "org.jetbrains.kotlin:kotlin-stdlib"
     compile fileTree(dir: 'lib', include: ['*.jar'])
     implementation 'org.junit:junit-bom:5.2.0'

src/net/torvald/colourutil/CIELChabUtil.kt

@@ -2,12 +2,6 @@ package net.torvald.colourutil
 
 import com.badlogic.gdx.graphics.Color
 import com.jme3.math.FastMath
-import net.torvald.colourutil.CIELChabUtil.toLCh
-import net.torvald.colourutil.CIELChabUtil.toLab
-import net.torvald.colourutil.CIELabUtil.toLab
-import net.torvald.colourutil.CIEXYZUtil.toXYZ
-import net.torvald.colourutil.CIEXYZUtil.toColor
-import net.torvald.colourutil.CIELabUtil.toXYZ
 /**
  * Cylindrical modification of CIELab colour space
  *
@@ -16,10 +10,9 @@ import net.torvald.colourutil.CIELabUtil.toXYZ
  * Created by minjaesong on 2016-09-01.
  */
 
-object CIELChabUtil {
 
 /** Sweet LCh_ab linear gradient */
-    fun getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
+fun cielch_getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
     val from = fromCol.toLCh()
     val to = toCol.toLCh()
     val newL = FastMath.interpolateLinear(scale, from.L, to.L)
@@ -28,7 +21,7 @@ object CIELChabUtil {
     val newH: Float
 
     if ((from.h - to.h).abs() == FastMath.PI) // exact opposite colour
-            return CIELabUtil.getGradient(scale, fromCol, toCol)
+        return cielab_getGradient(scale, fromCol, toCol)
     else if ((from.h - to.h).abs() > FastMath.PI) // reflex angle
         newH = FastMath.interpolateLinear(scale, from.h, to.h + FastMath.TWO_PI)
     else
@@ -55,7 +48,7 @@ object CIELChabUtil {
 private fun Float.sqrt() = Math.sqrt(this.toDouble()).toFloat()
 
 private fun Float.abs() = FastMath.abs(this)
-}
+
 
 fun Color.toLCh() = this.toXYZ().toLab().toLCh()
 fun CIELCh.toColor() = this.toLab().toXYZ().toColor()

src/net/torvald/colourutil/CIELabUtil.kt

@@ -2,11 +2,6 @@ package net.torvald.colourutil
 
 import com.badlogic.gdx.graphics.Color
 import com.jme3.math.FastMath
-import net.torvald.colourutil.CIELabUtil.toLab
-import net.torvald.colourutil.CIEXYZUtil.toColor
-import net.torvald.colourutil.CIEXYZUtil.toRGB
-import net.torvald.colourutil.CIEXYZUtil.toXYZ
-import net.torvald.colourutil.CIELabUtil.toXYZ
 
 /**
  * A modification of CIEXYZ that is useful for surface colours
@@ -23,7 +18,6 @@ import net.torvald.colourutil.CIELabUtil.toXYZ
  *
  * Created by minjaesong on 2016-09-01.
  */
-object CIELabUtil {
 fun Color.brighterLab(scale: Float): Color {
     val brighten = scale + 1f
 
@@ -41,7 +35,7 @@ object CIELabUtil {
 }
 
 /** Tend to have more natural (or less saturated) colour */
-    fun getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
+fun cielab_getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
     val from = fromCol.toLab()
     val to = toCol.toLab()
     val newL = FastMath.interpolateLinear(scale, from.L, to.L)
@@ -85,7 +79,7 @@ object CIELabUtil {
 private fun Float.cbrt() = FastMath.pow(this, 1f / 3f)
 private fun Float.cube() = this * this * this
 private fun Float.powerOf(exp: Float) = FastMath.pow(this, exp)
-}
+
 
 fun Color.toLab() = this.toXYZ().toLab()
 fun RGB.toLab() = this.toXYZ().toLab()

src/net/torvald/colourutil/CIELuvUtil.kt

@@ -2,11 +2,6 @@ package net.torvald.colourutil
 
 import com.jme3.math.FastMath
 import com.badlogic.gdx.graphics.Color
-import net.torvald.colourutil.CIEXYZUtil.toColor
-import net.torvald.colourutil.CIEXYZUtil.toRGB
-import net.torvald.colourutil.CIEXYZUtil.toXYZ
-import net.torvald.colourutil.CIELuvUtil.toLuv
-import net.torvald.colourutil.CIELuvUtil.toXYZ
 
 /**
  * A modification of CIEXYZ that is useful for additive mixtures of lights.
@@ -18,7 +13,6 @@ import net.torvald.colourutil.CIELuvUtil.toXYZ
  *
  * Created by minjaesong on 2016-09-06.
  */
-object CIELuvUtil {
 
 fun Color.brighterLuv(scale: Float): Color {
     val brighten = scale + 1f
@@ -37,7 +31,7 @@ object CIELuvUtil {
 }
 
 /** Tend to have more vivid (or saturated) colour */
-    fun getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
+fun cieluv_getGradient(scale: Float, fromCol: Color, toCol: Color): Color {
     val from = fromCol.toLuv()
     val to = toCol.toLuv()
     val newL = FastMath.interpolateLinear(scale, from.L, to.L)
@@ -107,7 +101,7 @@ object CIELuvUtil {
 
 private fun Float.cbrt() = FastMath.pow(this, 1f / 3f)
 private fun Float.cube() = this * this * this
-}
+
 
 fun Color.toLuv() = this.toXYZ().toLuv()
 fun CIELuv.toRGB() = this.toXYZ().toRGB()

src/net/torvald/colourutil/CIEXYZUtil.kt

@@ -2,11 +2,11 @@ package net.torvald.colourutil
 
 import com.badlogic.gdx.graphics.Color
 import com.jme3.math.FastMath
+import net.torvald.gdx.graphics.Cvec
 
 /**
  * Created by minjaesong on 2017-01-12.
  */
-object CIEXYZUtil {
 
 /**
  * 0..255 -> 0.0..1.0
@@ -34,9 +34,6 @@ object CIEXYZUtil {
 private val rgbToXyzLut_XR = FloatArray(256) { 0.4124564f * (it / 255f) }
 
 
-
-
-
 fun Color.brighterXYZ(scale: Float): Color {
     val xyz = this.toXYZ()
     xyz.X = xyz.X.times(1f + scale).clampOne()
@@ -73,7 +70,7 @@ object CIEXYZUtil {
  * linearly interpolated and thus slightly less accurate. Visually there's little-to-no difference,
  * but may not optimal for rigorous maths.
  */
-    fun RGB.linearise(): RGB {
+/*fun RGB.linearise(): RGB {
     val out = floatArrayOf(0f, 0f, 0f)
     for (i in 0..2) {
         val value = when (i) {
@@ -91,10 +88,10 @@ object CIEXYZUtil {
 
 
     return RGB(out[0], out[1], out[2], alpha)
-    }
+}*/
 
 /** Suitable for rigorous maths but slower */
-    fun RGB.lineariseSuper(): RGB {
+fun RGB.linearise(): RGB {
     val newR = if (r > 0.04045f)
         ((r + 0.055f) / 1.055f).powerOf(2.4f)
     else r / 12.92f
@@ -115,7 +112,7 @@ object CIEXYZUtil {
  * linearly interpolated and thus slightly less accurate. Visually there's little-to-no difference,
  * but may not optimal for rigorous maths.
  */
-    fun RGB.unLinearise(): RGB {
+/*fun RGB.unLinearise(): RGB {
     val out = floatArrayOf(0f, 0f, 0f)
     for (i in 0..2) {
         val value = when (i) {
@@ -133,10 +130,10 @@ object CIEXYZUtil {
 
 
     return RGB(out[0], out[1], out[2], alpha)
-    }
+}*/
 
 /** Suitable for rigorous maths but slower */
-    fun RGB.unLineariseSuper(): RGB {
+fun RGB.unLinearise(): RGB {
     val newR = if (r > 0.0031308f)
         1.055f * r.powerOf(1f / 2.4f) - 0.055f
     else
@@ -164,6 +161,9 @@ object CIEXYZUtil {
     return CIEXYZ(x, y, z, alpha)
 }
 
+fun RGB.toColor() = Color(r, g, b, alpha)
+fun RGB.toCvec() = Cvec(r, g, b, alpha)
+
 fun CIEXYZ.toRGB(): RGB {
     val r =  3.2404542f * X - 1.5371385f * Y - 0.4985314f * Z
     val g = -0.9692660f * X + 1.8760108f * Y + 0.0415560f * Z
@@ -185,6 +185,8 @@ object CIEXYZUtil {
     return Color(rgb.r, rgb.g, rgb.b, rgb.alpha)
 }
 
+fun CIEXYZ.mul(scalar: Float) = CIEXYZ(this.X * scalar, this.Y * scalar, this.Z * scalar, this.alpha)
+
 fun CIEXYZ.toColorRaw(): Color {
     val rgb = this.toRGBRaw()
     return Color(rgb.r, rgb.g, rgb.b, rgb.alpha)
@@ -220,7 +222,6 @@ object CIEXYZUtil {
     }
     else (1f - scale) * startValue + scale * endValue
 }
-}
 
 
 /** Range: X, Y, Z: 0 - 1.0+ (One-based-plus) */

src/net/torvald/colourutil/ColourTemp.kt

@@ -1,7 +1,6 @@
 package net.torvald.colourutil
 
 import com.badlogic.gdx.graphics.Color
-import net.torvald.colourutil.CIEXYZUtil.toColor
 import net.torvald.terrarum.GdxColorMap
 import net.torvald.terrarum.ModMgr
 
@@ -24,5 +23,5 @@ object ColourTemp {
     /** returns CIExyY-based colour converted to slick.color
      * @param CIE_Y 0.0 - 1.0+ */
     operator fun invoke(temp: Float, CIE_Y: Float): Color =
-            CIEXYZUtil.colourTempToXYZ(temp, CIE_Y).toColor()
+            colourTempToXYZ(temp, CIE_Y).toColor()
 }

src/net/torvald/colourutil/ColourUtil.kt

@@ -2,7 +2,6 @@ package net.torvald.colourutil
 
 import com.badlogic.gdx.graphics.Color
 import com.jme3.math.FastMath
-import net.torvald.colourutil.CIEXYZUtil.linearise
 
 /**
  * Created by minjaesong on 2016-07-26.

src/net/torvald/parametricsky/Application.kt

@@ -5,16 +5,22 @@ 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.graphics.Color
 import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import net.torvald.EMDASH
+import net.torvald.colourutil.*
 import net.torvald.parametricsky.datasets.DatasetCIEXYZ
 import net.torvald.parametricsky.datasets.DatasetRGB
 import net.torvald.parametricsky.datasets.DatasetSpectral
 import net.torvald.terrarum.inUse
+import net.torvald.terrarum.modulebasegame.worldgenerator.HALF_PI
+import net.torvald.terrarum.modulebasegame.worldgenerator.TWO_PI
 import java.awt.Dimension
 import javax.swing.*
+import kotlin.math.PI
+import kotlin.math.pow
 
 
 const val WIDTH = 1200
@@ -50,8 +56,9 @@ class Application : Game() {
     private lateinit var testTex: Texture
 
     var turbidity = 5.0
-    var albedo = 0.0
+    var albedo = 0.1
     var elevation = 0.0
+    var scalefactor = 1f
 
     override fun getScreen(): Screen {
         return super.getScreen()
@@ -64,12 +71,14 @@ class Application : Game() {
     override fun render() {
         Gdx.graphics.setTitle("Daylight Model $EMDASH F: ${Gdx.graphics.framesPerSecond}")
 
+        if (turbidity <= 0) throw IllegalStateException()
 
+        // we need to use different modelstate to accomodate different albedo for each spectral band but oh well...
         genTexLoop(ArHosekSkyModel.arhosek_xyz_skymodelstate_alloc_init(turbidity, albedo, elevation))
 
 
         val tex = Texture(oneScreen)
-        tex.setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear)
+        tex.setFilter(Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest)
 
         batch.inUse {
             batch.draw(tex, 0f, 0f, WIDTH.toFloat(), HEIGHT.toFloat())
@@ -94,8 +103,8 @@ class Application : Game() {
         oneScreen.dispose()
     }
 
-    val outTexWidth = 32
+    val outTexWidth = 256
-    val outTexHeight = 16
+    val outTexHeight = 256
 
     /**
      * Generated texture is as if you took the panorama picture of sky: up 70deg to horizon, east-south-west;
@@ -112,6 +121,28 @@ class Application : Game() {
         }
 
 
+        for (y in 0 until oneScreen.height) {
+            for (x in 0 until oneScreen.width) {
+                val gamma = (x / oneScreen.width.toDouble()) * TWO_PI // 0deg..360deg
+                val theta = (1.0 - (y / oneScreen.height.toDouble())) * HALF_PI // 90deg..0deg
+
+                val xyz = CIEXYZ(
+                        ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 0).toFloat().times(scalefactor / 10f),
+                        ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 1).toFloat().times(scalefactor / 10f),
+                        ArHosekSkyModel.arhosek_tristim_skymodel_radiance(state, theta, gamma, 2).toFloat().times(scalefactor / 10f)
+                )
+                val rgb = xyz.toRGB().toColor()
+                rgb.a = 1f
+
+                oneScreen.setColor(rgb)
+                oneScreen.drawPixel(x, y)
+
+                //println("x: ${xyz.X}, y: ${xyz.Y}, z: ${xyz.Z}")
+            }
+
+        }
+
+        //System.exit(0)
     }
 
     /**
@@ -190,14 +221,21 @@ class Application : Game() {
 
         val mainPanel = JPanel()
 
-        val turbidityControl = JSpinner(SpinnerNumberModel(5, 1, 10, 1))
+        val turbidityControl = JSpinner(SpinnerNumberModel(5.0, 1.0, 10.0, 0.1))
-        val albedoControl = JSpinner(SpinnerNumberModel(0.3, 0.0, 1.0, 0.05))
+        val albedoControl = JSpinner(SpinnerNumberModel(0.1, 0.0, 1.0, 0.05))
-        val elevationControl = JSpinner(SpinnerNumberModel(45, 0, 90, 5))
+        val elevationControl = JSpinner(SpinnerNumberModel(0.0, 0.0, 90.0, 0.5))
+        val scalefactorControl = JSpinner(SpinnerNumberModel(1.0, 0.0, 2.0, 0.01))
 
         init {
             val turbidityPanel = JPanel()
             val albedoPanel = JPanel()
             val elevationPanel = JPanel()
+            val scalefactorPanel = JPanel()
+
+            turbidityControl.preferredSize = Dimension(45, 18)
+            albedoControl.preferredSize = Dimension(45, 18)
+            elevationControl.preferredSize = Dimension(45, 18)
+            scalefactorControl.preferredSize = Dimension(45, 18)
 
             turbidityPanel.add(JLabel("Turbidity"))
             turbidityPanel.add(turbidityControl)
@@ -208,9 +246,13 @@ class Application : Game() {
             elevationPanel.add(JLabel("Elevation"))
             elevationPanel.add(elevationControl)
 
+            scalefactorPanel.add(JLabel("Scaling Factor"))
+            scalefactorPanel.add(scalefactorControl)
+
             mainPanel.add(turbidityPanel)
             mainPanel.add(albedoPanel)
             mainPanel.add(elevationPanel)
+            mainPanel.add(scalefactorPanel)
 
             this.isVisible = true
             this.defaultCloseOperation = WindowConstants.EXIT_ON_CLOSE
@@ -228,7 +270,11 @@ class Application : Game() {
             }
 
             elevationControl.addChangeListener {
-                app.elevation = Math.toRadians((elevationControl.value as Int).toDouble())
+                app.elevation = Math.toRadians(elevationControl.value as Double)
+            }
+
+            scalefactorControl.addChangeListener {
+                app.scalefactor = (scalefactorControl.value as Double).toFloat()
             }
 
         }

src/net/torvald/parametricsky/ArHosekSkyModel.kt

@@ -160,8 +160,10 @@ object ArHosekSkyModel {
 // internal definitions
 
     private class DoubleArrayPtr(val arr: DoubleArray, var ptrOffset: Int) {
+        init {
+            if (ptrOffset < 0) throw IllegalArgumentException("Negative ptrOffset: $ptrOffset")
+        }
         operator fun get(i: Int) = arr[ptrOffset + i]
-
     }
 
     private class DoubleArrayArrayPtr(var arr: Array<DoubleArray>, var ptrOffset: Int) {
@@ -185,6 +187,8 @@ object ArHosekSkyModel {
             albedo: Double,
             solar_elevation: Double
     ) {
+        if (turbidity < 1) throw IllegalArgumentException("Turbidity must be equal to or greater than 1 (got $turbidity)")
+
         var elev_matrix: DoubleArrayPtr
 
         val int_turbidity = turbidity.toInt()
@@ -193,7 +197,6 @@ object ArHosekSkyModel {
         val solar_elevation = pow(solar_elevation / (MATH_PI / 2.0), (1.0 / 3.0))
 
         // alb 0 low turb
-
         elev_matrix = DoubleArrayPtr(dataset, 9 * 6 * (int_turbidity - 1))
 
 
@@ -672,13 +675,13 @@ object ArHosekSkyModel {
                 state.configs[channel],
                 theta,
                 gamma
-        ) * state.radiances[channel];
+        ) * state.radiances[channel]
     }
 
     private const val pieces = 45
     private const val order = 4
 
-    fun arhosekskymodel_sr_internal(
+    private fun arhosekskymodel_sr_internal(
             state: ArHosekSkyModelState,
             turbidity: Int,
             wl: Int,
@@ -686,7 +689,7 @@ object ArHosekSkyModel {
     ): Double {
         var pos = (pow(2.0 * elevation / MATH_PI, 1.0 / 3.0) * pieces).toInt() // floor
 
-        if (pos > 44) pos = 44;
+        if (pos > 44) pos = 44
 
         val break_x = pow((pos.toDouble() / pieces.toDouble()), 3.0) * (MATH_PI * 0.5)
 
@@ -773,7 +776,7 @@ object ArHosekSkyModel {
         val singamma = sin(gamma)
         var sc2 = 1.0 - ar2 * singamma * singamma
         if (sc2 < 0.0) sc2 = 0.0
-        var sampleCosine = sqrt (sc2);
+        var sampleCosine = sqrt(sc2)
 
         //   The following will be improved in future versions of the model:
         //   here, we directly use fitted 5th order polynomials provided by the
@@ -791,9 +794,9 @@ object ArHosekSkyModel {
                 ldCoefficient[4] * pow(sampleCosine, 4.0) +
                 ldCoefficient[5] * pow(sampleCosine, 5.0)
 
-        direct_radiance *= darkeningFactor;
+        direct_radiance *= darkeningFactor
 
-        return direct_radiance;
+        return direct_radiance
     }
 
     fun arhosekskymodel_solar_radiance(
@@ -816,7 +819,7 @@ object ArHosekSkyModel {
                 wavelength
         )
 
-        return direct_radiance + inscattered_radiance;
+        return direct_radiance + inscattered_radiance
     }
 }
 

src/net/torvald/parametricsky/datasets/DatasetSpectral.kt

@@ -194,6 +194,8 @@ object DatasetSpectral {
             solarDataset720
     )
 
+    val waves = floatArrayOf(320f, 360f, 400f, 440f, 480f, 520f, 560f, 600f, 640f, 680f, 720f)
+
     val limbDarkeningDataset320 = doubleArrayOf(0.087657, 0.767174, 0.658123, -1.02953, 0.703297, -0.186735)
 
     val limbDarkeningDataset360 = doubleArrayOf(0.122953, 1.01278, 0.238687, -1.12208, 1.17087, -0.424947)

src/net/torvald/terrarum/modulebasegame/ui/UIVitalMetre.kt

@@ -4,7 +4,7 @@ import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.jme3.math.FastMath
-import net.torvald.colourutil.CIELabUtil.darkerLab
+import net.torvald.colourutil.darkerLab
 import net.torvald.terrarum.AppLoader
 import net.torvald.terrarum.Second
 import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid

src/net/torvald/terrarum/modulebasegame/worldgenerator/Worldgen.kt

@@ -87,3 +87,4 @@ infix fun Long.shake(other: Long): Long {
 }
 
 val TWO_PI = Math.PI * 2.0
+val HALF_PI = Math.PI / 2.0

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

@@ -1,2 +1,20 @@
 package net.torvald.terrarum.tests
 
+import net.torvald.colourutil.CIEXYZ
+import net.torvald.colourutil.getXYZUsingIntegral
+import net.torvald.colourutil.toRGB
+import net.torvald.colourutil.toRGBRaw
+
+fun main() {
+    val waves =   floatArrayOf(485f,495f,505f,515f,525f,535f,545f,555f,565f)
+    val samples = floatArrayOf(  0f,0.2f,0.5f,1f,  1f,    1f,0.5f,0.2f,0f)
+
+    val xyz = getXYZUsingIntegral(waves, samples)
+    val srgb = xyz.toRGB()
+
+    println(xyz)
+    println(srgb)
+
+
+    println(CIEXYZ(100f/3f, 100f/3f, 100f/3f).toRGB())
+}

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

@@ -1,10 +1,10 @@
 package net.torvald.terrarum.tests
 
-import net.torvald.colourutil.CIEXYZUtil.linearise
-import net.torvald.colourutil.CIEXYZUtil.unLinearise
 import net.torvald.colourutil.ColourUtil.getLuminosity
 import net.torvald.colourutil.ColourUtil.getLuminosityQuick
 import net.torvald.colourutil.RGB
+import net.torvald.colourutil.linearise
+import net.torvald.colourutil.unLinearise
 import net.torvald.random.HQRNG
 import kotlin.system.measureNanoTime
 

terrarum.iml

@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 12" allPlatforms="JVM [12]">
-        <compilerSettings />
-        <compilerArguments>
-          <option name="jvmTarget" value="12" />
-        </compilerArguments>
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">