curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-11 11:04:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

colourutil update

Browse Source
This commit is contained in:
minjaesong
2018-02-16 10:49:13 +09:00
parent e565a9f173
commit dde69d2e7e
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/terrarum/ui/ConsoleWindow.kt
View File

@@ -125,8 +125,6 @@ class ConsoleWindow : UICanvas() {
val acceptedChars = "1234567890-=qwfpgjluy;[]\\arstdhneio'zxcvbkm,./!@#$%^&*()_+QWFPGJLUY:{}|ARSTDHNEIO\"ZXCVBKM<>? ".toSet()
override fun keyTyped(character: Char): Boolean {
println("[ConsoleWindow] Key typed event; isVisible = $isVisible")
if (character in acceptedChars) {
commandInputPool!!.append(character)
inputCursorPos += 1

2
src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -168,7 +168,7 @@ object WeatherMixer {
// interpolate R, G, B and A
val scale = (timeInSec % dataPointDistance).toFloat() / dataPointDistance // [0.0, 1.0]
val newCol = CIELabUtil.getGradient(scale, colourThis, colourNext)
val newCol = CIELuvUtil.getGradient(scale, colourThis, colourNext)
/* // very nice monitor code
// 65 -> 66 | 300 | 19623 | RGB8(255, 0, 255) -[41%]-> RGB8(193, 97, 23) | * `230`40`160`