interpolate fog linear

This commit is contained in:
Bixilon 2022-08-19 22:16:54 +02:00
parent 9301d60f6f
commit 8abb76de78
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4

View File

@ -13,7 +13,7 @@
package de.bixilon.minosoft.gui.rendering.camera package de.bixilon.minosoft.gui.rendering.camera
import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateSine import de.bixilon.kutil.math.interpolation.FloatInterpolation.interpolateLinear
import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.time.TimeUtil
import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects import de.bixilon.minosoft.data.registries.effects.DefaultStatusEffects
import de.bixilon.minosoft.data.registries.fluid.lava.LavaFluid import de.bixilon.minosoft.data.registries.fluid.lava.LavaFluid
@ -113,8 +113,8 @@ class FogManager(
return return
} }
val progress = delta / FOG_INTERPOLATION_TIME.toFloat() val progress = delta / FOG_INTERPOLATION_TIME.toFloat()
this.interpolatedFogStart = interpolateSine(progress, _fogStart, fogStart) this.interpolatedFogStart = interpolateLinear(progress, _fogStart, fogStart)
this.interpolatedFogEnd = interpolateSine(progress, _fogEnd, fogEnd) this.interpolatedFogEnd = interpolateLinear(progress, _fogEnd, fogEnd)
var color: RGBColor? = interpolateSine(progress, _fogColor ?: Colors.TRANSPARENT, fogColor ?: Colors.TRANSPARENT) var color: RGBColor? = interpolateSine(progress, _fogColor ?: Colors.TRANSPARENT, fogColor ?: Colors.TRANSPARENT)
if (color == Colors.TRANSPARENT) { if (color == Colors.TRANSPARENT) {
color = null color = null