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

new lightmap: nice try but didn't work

Browse Source
This commit is contained in:
minjaesong
2020-02-21 03:40:37 +09:00
parent 9d51f419f5
commit 947224c290
6 changed files with 240 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/net/torvald/terrarum/blockproperties/BlockProp.kt
View File

@@ -19,6 +19,14 @@ class BlockProp {
lateinit var opacity: Cvec
fun getOpacity(channel: Int) = when (channel) {
0 -> shadeColR
1 -> shadeColG
2 -> shadeColB
3 -> shadeColA
else -> throw IllegalArgumentException("Invalid channel $channel")
}
var strength: Int = 0
var density: Int = 0
var viscosity: Int = 0
@@ -48,6 +56,16 @@ class BlockProp {
inline val luminosity: Cvec
get() = BlockPropUtil.getDynamicLumFunc(internalLumCol, dynamicLuminosityFunction)
fun getLum(channel: Int) = BlockPropUtil.getDynamicLumFuncByChan(
when (channel) {
0 -> lumColR
1 -> lumColG
2 -> lumColB
3 -> lumColA
else -> throw IllegalArgumentException("Invalid channel $channel")
}, dynamicLuminosityFunction, channel
)
var drop: Int = 0
var maxSupport: Int = -1 // couldn't use NULL at all...

29
src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt
View File

@@ -37,22 +37,31 @@ object BlockPropUtil {
private fun getTorchFlicker(baseLum: Cvec): Cvec {
val funcY = FastMath.interpolateLinear(flickerFuncX / flickerFuncDomain, flickerP0, flickerP1)
return alterBrightnessUniform(baseLum, funcY)
}
private fun getTorchFlicker(baseLum: Float): Float {
return baseLum + FastMath.interpolateLinear(flickerFuncX / flickerFuncDomain, flickerP0, flickerP1)
}
private fun getSlowBreath(baseLum: Cvec): Cvec {
val funcY = FastMath.sin(FastMath.PI * breathFuncX / breathCycleDuration) * breathRange
return alterBrightnessUniform(baseLum, funcY)
}
private fun getSlowBreath(baseLum: Float): Float {
return baseLum + FastMath.sin(FastMath.PI * breathFuncX / breathCycleDuration) * breathRange
}
private fun getPulsate(baseLum: Cvec): Cvec {
val funcY = FastMath.sin(FastMath.PI * pulsateFuncX / pulsateCycleDuration) * pulsateRange
return alterBrightnessUniform(baseLum, funcY)
}
private fun getPulsate(baseLum: Float): Float {
return baseLum + FastMath.sin(FastMath.PI * pulsateFuncX / pulsateCycleDuration) * pulsateRange
}
/**
* Using our own timer so that they flickers for same duration regardless of game's FPS
*/
@@ -94,6 +103,20 @@ object BlockPropUtil {
}
}
/**
* @param chan 0 for R, 1 for G, 2 for B, 3 for A
*/
fun getDynamicLumFuncByChan(baseLum: Float, type: Int, chan: Int): Float {
return when (type) {
1 -> getTorchFlicker(baseLum)
2 -> (Terrarum.ingame!!.world).globalLight.cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // current global light
3 -> WeatherMixer.getGlobalLightOfTime(Terrarum.ingame!!.world, WorldTime.DAY_LENGTH / 2).cpy().mul(LightmapRenderer.DIV_FLOAT).getElem(chan) // daylight at noon
4 -> getSlowBreath(baseLum)
5 -> getPulsate(baseLum)
else -> baseLum
}
}
/**
* Darken or brighten colour by 'brighten' argument
*