AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 11:24:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

world border: set intensity depending to distance

Browse Source
This commit is contained in:
Bixilon 2022-04-26 21:01:12 +02:00
parent aecfc9229c
commit 9807128c5b
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/de/bixilon/minosoft/data/world/border/WorldBorder.kt
View File

@ -22,6 +22,7 @@ import de.bixilon.kutil.math.interpolation.DoubleInterpolation.interpolateLinear
import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.time.TimeUtil
import de.bixilon.minosoft.data.world.World import de.bixilon.minosoft.data.world.World
import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2dUtil.EMPTY import de.bixilon.minosoft.gui.rendering.util.vec.vec2.Vec2dUtil.EMPTY
import kotlin.math.abs
class WorldBorder { class WorldBorder {
var center = Vec2d.EMPTY var center = Vec2d.EMPTY
@ -33,8 +34,8 @@ class WorldBorder {
var state = WorldBorderState.STATIC var state = WorldBorderState.STATIC
private set private set
private var lerpStart = -1L private var interpolationStart = -1L
private var lerpEnd = -1L private var interpolationEnd = -1L
private var oldDiameter = DEFAULT_DIAMETER private var oldDiameter = DEFAULT_DIAMETER
private var newDiameter = DEFAULT_DIAMETER private var newDiameter = DEFAULT_DIAMETER
@ -60,9 +61,25 @@ class WorldBorder {
return !inside return !inside
} }
fun getDistanceTo(position: Vec3d): Double {
return getDistanceTo(position.x, position.z)
}
fun getDistanceTo(x: Double, z: Double): Double {
lock.acquire()
val radius = diameter / 2
val closestDistance = minOf(
radius - abs(x) - abs(center.x),
radius - abs(z) - abs(center.y),
)
lock.release()
return closestDistance
}
fun stopInterpolating() { fun stopInterpolating() {
lock.lock() lock.lock()
lerpStart = -1L interpolationStart = -1L
lock.unlock() lock.unlock()
} }
@ -73,8 +90,8 @@ class WorldBorder {
} }
lock.lock() lock.lock()
val time = TimeUtil.millis val time = TimeUtil.millis
lerpStart = time interpolationStart = time
lerpEnd = time + millis interpolationEnd = time + millis
this.oldDiameter = oldDiameter this.oldDiameter = oldDiameter
this.newDiameter = newDiameter this.newDiameter = newDiameter
lock.unlock() lock.unlock()
@ -82,21 +99,21 @@ class WorldBorder {
fun tick() { fun tick() {
lock.lock() lock.lock()
if (lerpStart < 0L) { if (interpolationStart < 0L) {
lock.unlock() lock.unlock()
return return
} }
val time = TimeUtil.millis val time = TimeUtil.millis
if (lerpEnd <= time) { if (interpolationEnd <= time) {
state = WorldBorderState.STATIC state = WorldBorderState.STATIC
lerpStart = -1L interpolationStart = -1L
lock.unlock() lock.unlock()
return return
} }
val oldDiameter = diameter val oldDiameter = diameter
val remaining = lerpEnd - time val remaining = interpolationEnd - time
val totalTime = (lerpEnd - lerpStart) val totalTime = (interpolationEnd - interpolationStart)
val diameter = interpolateLinear(remaining.toDouble() / totalTime.toDouble(), this.newDiameter, this.oldDiameter) val diameter = interpolateLinear(remaining.toDouble() / totalTime.toDouble(), this.newDiameter, this.oldDiameter)
this.diameter = diameter this.diameter = diameter
@ -105,7 +122,7 @@ class WorldBorder {
} else if (oldDiameter < diameter) { } else if (oldDiameter < diameter) {
WorldBorderState.GROWING WorldBorderState.GROWING
} else { } else {
lerpStart = -1L interpolationStart = -1L
WorldBorderState.STATIC WorldBorderState.STATIC
} }
lock.unlock() lock.unlock()
@ -114,7 +131,7 @@ class WorldBorder {
fun reset() { fun reset() {
lock.lock() lock.lock()
diameter = DEFAULT_DIAMETER diameter = DEFAULT_DIAMETER
lerpStart = -1L interpolationStart = -1L
lock.unlock() lock.unlock()
} }

6
src/main/java/de/bixilon/minosoft/gui/rendering/world/border/WorldBorderRenderer.kt
View File

@ -13,6 +13,7 @@
package de.bixilon.minosoft.gui.rendering.world.border package de.bixilon.minosoft.gui.rendering.world.border
import de.bixilon.kotlinglm.func.common.clamp
import de.bixilon.kotlinglm.vec2.Vec2 import de.bixilon.kotlinglm.vec2.Vec2
import de.bixilon.kutil.latch.CountUpAndDownLatch import de.bixilon.kutil.latch.CountUpAndDownLatch
import de.bixilon.kutil.time.TimeUtil import de.bixilon.kutil.time.TimeUtil
@ -74,11 +75,14 @@ class WorldBorderRenderer(
shader.setFloat("uTextureOffset", 1.0f - textureOffset) shader.setFloat("uTextureOffset", 1.0f - textureOffset)
shader.setFloat("uCameraHeight", renderWindow.camera.matrixHandler.eyePosition.y) shader.setFloat("uCameraHeight", renderWindow.camera.matrixHandler.eyePosition.y)
val color = when (border.state) { val distance = border.getDistanceTo(renderWindow.connection.player.position)
val strength = 1.0f - (distance.toFloat().clamp(0.0f, 100.0f) / 100.0f)
var color = when (border.state) {
WorldBorderState.GROWING -> GROWING_COLOR WorldBorderState.GROWING -> GROWING_COLOR
WorldBorderState.SHRINKING -> SHRINKING_COLOR WorldBorderState.SHRINKING -> SHRINKING_COLOR
WorldBorderState.STATIC -> STATIC_COLOR WorldBorderState.STATIC -> STATIC_COLOR
} }
color = color.with(alpha = (strength * strength))
shader.setRGBColor("uTintColor", color) shader.setRGBColor("uTintColor", color)
shader.setFloat("uRadius", border.diameter.toFloat() / 2.0f) shader.setFloat("uRadius", border.diameter.toFloat() / 2.0f)
shader.setVec2("uCenter", Vec2(border.center)) shader.setVec2("uCenter", Vec2(border.center))