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

rendering: make camera height at players head, not feet's

Browse Source
This commit is contained in:
Bixilon 2021-02-25 20:03:34 +01:00
parent 4fc8e425ce
commit a39fabcbe2
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt
View File

@ -54,7 +54,9 @@ class Camera(
private var cameraRight = Vec3(0.0f, 0.0f, -1.0f)
private var cameraUp = Vec3(0.0f, 1.0f, 0.0f)
var location: Location = Location(0.0, 0.0, 0.0)
var feetLocation: Location = Location(0.0, 0.0, 0.0)
private set
var headLocation: Location = Location(0.0, 0.0, 0.0)
private set
var blockPosition: BlockPosition = BlockPosition(0, 0, 0)
private set
@ -195,8 +197,9 @@ class Camera(
}
private fun positionChangeCallback() {
location = Location(cameraPosition)
blockPosition = location.toBlockPosition()
headLocation = Location(cameraPosition)
feetLocation = Location(headLocation.x, headLocation.y - PLAYER_HEIGHT, headLocation.z)
blockPosition = feetLocation.toBlockPosition()
currentBiome = connection.player.world.getChunk(blockPosition.getChunkLocation())?.biomeAccessor?.getBiome(blockPosition)
chunkLocation = blockPosition.getChunkLocation()
sectionHeight = blockPosition.getSectionHeight()
@ -246,7 +249,7 @@ class Camera(
private fun sendPositionToServer() {
if (System.currentTimeMillis() - lastPositionChange > ProtocolDefinition.TICK_TIME) {
// ToDo: Replace this with proper movement and only send it, when our position changed
connection.sendPacket(PacketPlayerPositionAndRotationSending(Location(cameraPosition), EntityRotation(yaw, pitch), false))
connection.sendPacket(PacketPlayerPositionAndRotationSending(feetLocation, EntityRotation(yaw, pitch), false))
lastPositionChange = System.currentTimeMillis()
currentPositionSent = true
return
@ -254,7 +257,14 @@ class Camera(
currentPositionSent = false
}
fun setPosition(location: Location) {
feetLocation = location
headLocation = Location(location.x, location.y + PLAYER_HEIGHT, location.z)
cameraPosition = headLocation.toVec3()
}
companion object {
private val CAMERA_UP_VEC3 = Vec3(0.0f, 1.0f, 0.0f)
private const val PLAYER_HEIGHT = 1.3 // player is 1.8 blocks high, the camera is normally at 0.5. 1.8 - 0.5 = 1.13
}
}

2
src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
View File

@ -84,7 +84,7 @@ class RenderWindow(private val connection: Connection, val rendering: Rendering)
latch.countDown()
}
renderQueue.add {
camera.cameraPosition = packet.location.toVec3()
camera.setPosition(packet.location)
camera.setRotation(packet.rotation.yaw.toDouble(), packet.rotation.pitch.toDouble())
}
})

2
src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/text/HUDDebugScreenElement.kt
View File

@ -144,7 +144,7 @@ class HUDDebugScreenElement(private val hudTextElement: HUDTextElement) : HUDTex
}
private fun getLocation(): String {
return "${formatCoordinate(camera.location.x)} / ${formatCoordinate(camera.location.y)} / ${formatCoordinate(camera.location.z)}"
return "${formatCoordinate(camera.feetLocation.x)} / ${formatCoordinate(camera.feetLocation.y)} / ${formatCoordinate(camera.feetLocation.z)}"
}
private fun getBlockPosition(): String {

2
src/main/java/de/bixilon/minosoft/gui/rendering/hud/elements/text/HUDTextElement.kt
View File

@ -162,7 +162,7 @@ class HUDTextElement(val connection: Connection, val hudRenderer: HUDRenderer, v
private const val TEXT_BACKGROUND_Z = -0.995f
private val TEXT_BACKGROUND_ATLAS_COORDINATES = Vec2()
private val TEXT_BACKGROUND_ATLAS_INDEX = 0
private const val TEXT_BACKGROUND_ATLAS_INDEX = 0
private val TEXT_BACKGROUND_COLOR = RGBColor(0, 0, 0, 80)
}