chylex/Hardcore-Ender-Expansion-2
1
0
Fork 0
mirror of https://github.com/chylex/Hardcore-Ender-Expansion-2.git synced 2025-04-11 03:15:44 +02:00
Code

Update Forgotten Tombs environment (skylight, custom lightmap, fog tweaks)

Browse Source
This commit is contained in:
chylex 2019-07-19 11:43:05 +02:00
parent 6f1b12109c
commit 8463037663
1 changed files with 48 additions and 6 deletions

54
src/main/java/chylex/hee/game/world/territory/descriptions/Territory_ForgottenTombs.kt
View File

@ -1,17 +1,24 @@
package chylex.hee.game.world.territory.descriptions
import chylex.hee.client.render.territory.lightmaps.ILightmap
import chylex.hee.client.render.territory.lightmaps.ILightmap.Companion.calcLightFactor
import chylex.hee.client.util.MC
import chylex.hee.game.world.territory.ITerritoryDescription
import chylex.hee.game.world.territory.properties.TerritoryColors
import chylex.hee.game.world.territory.properties.TerritoryEnvironment
import chylex.hee.system.util.Pos
import chylex.hee.system.util.allInCenteredBoxMutable
import chylex.hee.system.util.color.RGB
import chylex.hee.system.util.lookPosVec
import chylex.hee.system.util.math.LerpedFloat
import chylex.hee.system.util.nextFloat
import net.minecraft.init.MobEffects
import net.minecraft.util.math.Vec3d
import net.minecraft.world.EnumSkyBlock.BLOCK
import net.minecraft.world.EnumSkyBlock.SKY
import net.minecraftforge.fml.relauncher.Side
import net.minecraftforge.fml.relauncher.SideOnly
import java.util.Random
import kotlin.math.max
import kotlin.math.pow
object Territory_ForgottenTombs : ITerritoryDescription{
@ -33,35 +40,70 @@ object Territory_ForgottenTombs : ITerritoryDescription{
}
}
private const val MAX_FOG_DENSITY = 0.087F
private const val MAX_FOG_DENSITY = 0.069F
override val environment = object : TerritoryEnvironment(){
override val fogColor
get() = (fogDensity / 0.275F).let { Vec3d(0.14 + it, 0.11 + it, 0.02) }
get() = (fogDensity / 0.275F).let { Vec3d(0.15 + it, 0.08 + it, 0.03) }
override val fogDensity
get() = currentFogDensity.get(MC.partialTicks)
override val voidRadiusMpXZ = 0.975F
override val skyLight = 15
override val voidRadiusMpXZ = 1.35F
override val voidRadiusMpY = 0.975F
override val voidCenterOffset = Vec3d(0.0, -8.0, 0.0)
override val lightmap = object : ILightmap{
override fun update(colors: FloatArray, sunBrightness: Float, skyLight: Float, blockLight: Float, partialTicks: Float){
val blockFactor = calcLightFactor(blockLight)
colors[0] = (blockLight * 0.9F) + skyLight + 0.12F
colors[1] = (blockFactor * 0.7F) + (skyLight * 0.8F) + 0.08F
colors[2] = (blockFactor * 0.5F) + (skyLight * 1.2F) + (0.09F * nightVisionFactor)
}
}
private val currentFogDensity = LerpedFloat(MAX_FOG_DENSITY)
private var nightVisionFactor = 0F
@SideOnly(Side.CLIENT)
override fun setupClient(){
tickClient()
currentFogDensity.updateImmediately(currentFogDensity.currentValue)
currentFogDensity.updateImmediately(MAX_FOG_DENSITY * 0.8F)
}
@SideOnly(Side.CLIENT)
override fun tickClient(){
val light = (MC.player?.let { it.world.getLight(Pos(it.lookPosVec)) } ?: 15) / 15F // TODO skylight
val player = MC.player
val pos = player?.lookPosVec?.let(::Pos)
val light: Float
if (pos == null){
light = 1F
}
else{
val world = player.world
var levelBlock = 0
var levelSky = 0
for(offset in pos.allInCenteredBoxMutable(1, 1, 1)){
levelBlock = max(levelBlock, world.getLightFor(BLOCK, offset))
levelSky = max(levelSky, world.getLightFor(SKY, offset))
}
light = max(levelBlock / 15F, levelSky / 12F)
}
val prev = currentFogDensity.currentValue
val next = MAX_FOG_DENSITY - (light.pow(0.2F) * 0.85F * MAX_FOG_DENSITY)
val speed = if (next > prev) 0.025F else 0.055F
currentFogDensity.update(prev + (next - prev) * 0.05F)
currentFogDensity.update(prev + (next - prev) * speed)
nightVisionFactor = if (player?.isPotionActive(MobEffects.NIGHT_VISION) == true) 1F else 0F
}
}
}