fixed a bug where colourmap won't interpolate properly. BUG: fadeout/fadein is somewhat glitched, UIQuickBar does not fade-in/out instead it just (dis)appears with no effect

Former-commit-id: 029f504b7e2e4d85676ec8b36b27dcbed5e5db47
Former-commit-id: 0b56ca1e8976bfc5e7ea8d665e6ed6496a52de85

src/net/torvald/terrarum/mapdrawer/MapDrawer.kt

@@ -5,6 +5,7 @@ import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.tileproperties.TileNameCode
 import net.torvald.terrarum.tilestats.TileStats
 import com.jme3.math.FastMath
+import net.torvald.colourutil.ColourTemp
 import org.newdawn.slick.*
 
 /**
@@ -13,14 +14,13 @@ import org.newdawn.slick.*
 object MapDrawer {
     const val TILE_SIZE = 16
 
-    private var envOverlayColourmap: Image = Image("./res/graphics/colourmap/black_body_col_1000_40000_K.png")
-
     private val ENV_COLTEMP_LOWEST = 5500
     private val ENV_COLTEMP_HIGHEST = 7500
 
     val ENV_COLTEMP_NOON = 6500 // 6500 == sRGB White == untouched!
 
-    private var colTemp: Int = 0
+    var colTemp: Int = 0
+        private set
 
     private val TILES_COLD = intArrayOf(
               TileNameCode.ICE_MAGICAL
@@ -49,7 +49,7 @@ object MapDrawer {
         colTemp = colTemp_warm + colTemp_cold - ENV_COLTEMP_NOON
         val zoom = Terrarum.ingame.screenZoom
 
-        g.color = getColourFromMap(colTemp)
+        g.color = ColourTemp(colTemp)
         //g.color = getColourFromMap(3022)
         g.fillRect(
                 MapCamera.cameraX * zoom,
@@ -70,18 +70,4 @@ object MapDrawer {
 
         return Math.round((ENV_COLTEMP_HIGHEST - ENV_COLTEMP_LOWEST) / 2 * FastMath.clamp(x, -1f, 1f) + colTempMedian)
     }
-
-    fun getColourFromMap(K: Int): Color {
-        return envOverlayColourmap.getColor(colTempToImagePos(K), 0)
-    }
-
-    private fun colTempToImagePos(K: Int): Int {
-        if (K < 1000 || K >= 40000) throw IllegalArgumentException("K: out of range. ($K)")
-        return (K - 1000) / 10
-    }
-
-    @JvmStatic
-    fun getColTemp(): Int {
-        return colTemp
-    }
 }