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

removed unnecessary class Light10B, minor fixes for LightmapRenderer

Browse Source 
Former-commit-id: 4cddfb080cc689738d9bf308f7d08852f4c78a8b
Former-commit-id: 2354b2483f30e70862a327c1b9688a19bd1b2f66
This commit is contained in:
Song Minjae
2016-09-07 22:58:42 +09:00
parent d817c586e9
commit 9b9b65efba
31 changed files with 3718 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ import net.torvald.colourutil.ColourUtil
import net.torvald.random.HQRNG
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gamemap.WorldTime
import net.torvald.terrarum.mapdrawer.Light10B
import org.newdawn.slick.Color
import org.newdawn.slick.GameContainer
import org.newdawn.slick.Graphics
@@ -32,7 +31,7 @@ object WeatherMixer {
private var skyBoxCurrent = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat())
private var skyBoxNext = Rectangle(0f, 0f, Terrarum.WIDTH.toFloat(), Terrarum.HEIGHT.toFloat())
val globalLightNow = Light10B(0)
val globalLightNow = Color(0)
// Weather indices
const val WEATHER_GENERIC = "generic"
@@ -91,11 +90,14 @@ object WeatherMixer {
g.fill(skyBoxCurrent, skyColourFill)
// calculate global light
globalLightNow.fromSlickColor(getGradientColour(lightColourMap, 0, timeNow))
val gradCol = getGradientColour(lightColourMap, 0, timeNow)
globalLightNow.r = gradCol.r
globalLightNow.g = gradCol.g
globalLightNow.b = gradCol.b
}
fun getGlobalLightOfTime(timeInSec: Int): Light10B =
Light10B(getGradientColour(currentWeather.globalLightColourMap, 0, timeInSec))
fun getGlobalLightOfTime(timeInSec: Int): Color =
getGradientColour(currentWeather.globalLightColourMap, 0, timeInSec)
fun getGradientColour(image: Image, row: Int, timeInSec: Int): Color {
val dataPointDistance = WorldTime.DAY_LENGTH / image.width