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

physics: move the player with the correct speed

Browse Source
This commit is contained in:
Lukas 2021-04-24 22:00:39 +02:00
parent 360b3bd47a
commit f934ed2027
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/de/bixilon/minosoft/gui/input/camera/Camera.kt
View File

@ -48,7 +48,8 @@ class Camera(
val renderWindow: RenderWindow, val renderWindow: RenderWindow,
) : ScreenResizeCallback { ) : ScreenResizeCallback {
private var mouseSensitivity = Minosoft.getConfig().config.game.camera.moseSensitivity private var mouseSensitivity = Minosoft.getConfig().config.game.camera.moseSensitivity
private var movementSpeed = 7 private val walkingSpeed get() = connection.player.baseAbilities.walkingSpeed * ProtocolDefinition.TICKS_PER_SECOND
private val flyingSpeed get() = connection.player.baseAbilities.flyingSpeed * ProtocolDefinition.TICKS_PER_SECOND
var cameraPosition = Vec3(0.0f, 0.0f, 0.0f) var cameraPosition = Vec3(0.0f, 0.0f, 0.0f)
private var lastMouseX = 0.0 private var lastMouseX = 0.0
private var lastMouseY = 0.0 private var lastMouseY = 0.0
@ -134,7 +135,11 @@ class Camera(
if (renderWindow.inputHandler.currentKeyConsumer != null) { // ToDo if (renderWindow.inputHandler.currentKeyConsumer != null) { // ToDo
return return
} }
var cameraSpeed = movementSpeed * deltaTime var cameraSpeed = if (connection.player.entity.isFlying) {
flyingSpeed
} else {
walkingSpeed
} * deltaTime
val movementFront = Vec3(cameraFront) val movementFront = Vec3(cameraFront)
if (!Minosoft.getConfig().config.game.camera.noCipMovement) { if (!Minosoft.getConfig().config.game.camera.noCipMovement) {
movementFront.y = 0.0f movementFront.y = 0.0f
@ -171,6 +176,7 @@ class Camera(
} ?: run { } ?: run {
playerEntity.velocity = Vec3(0, -0.75f * ProtocolDefinition.GRAVITY, 0) playerEntity.velocity = Vec3(0, -0.75f * ProtocolDefinition.GRAVITY, 0)
} }
playerEntity.onGround = false
} }
} }
if (deltaMovement != VecUtil.EMPTY_VEC3) { if (deltaMovement != VecUtil.EMPTY_VEC3) {