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

fix fluid height calculation, water fog

Browse Source
This commit is contained in:
Bixilon 2021-07-08 00:39:13 +02:00
parent af5518b4b5
commit 48d9142d4c
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/de/bixilon/minosoft/data/registries/fluid/Fluid.kt
View File

@ -63,7 +63,11 @@ open class Fluid(
}
fun getHeight(blockState: BlockState): Float {
return (8 - ((blockState.properties[BlockProperties.FLUID_LEVEL]?.unsafeCast<Int>()) ?: 8)) / 9.0f
val level = blockState.properties[BlockProperties.FLUID_LEVEL]?.unsafeCast<Int>() ?: 8
if (level < 0 || level >= 8) {
return 1.0f
}
return (8 - level) / 9.0f
}
open fun travel(entity: LocalPlayerEntity, sidewaysSpeed: Float, forwardSpeed: Float, gravity: Double, falling: Boolean) {

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

@ -19,6 +19,7 @@ import de.bixilon.minosoft.data.entities.EntityRotation
import de.bixilon.minosoft.data.player.LocalPlayerEntity
import de.bixilon.minosoft.data.registries.VoxelShape
import de.bixilon.minosoft.data.registries.blocks.types.FluidBlock
import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
import de.bixilon.minosoft.data.text.ChatColors
import de.bixilon.minosoft.gui.rendering.RenderConstants
import de.bixilon.minosoft.gui.rendering.RenderWindow
@ -55,7 +56,7 @@ class Camera(
val renderWindow: RenderWindow,
) {
var fogColor = Previous(ChatColors.GREEN)
private var fogStart = 100.0f
var fogStart = 100.0f
private var mouseSensitivity = Minosoft.getConfig().config.game.camera.moseSensitivity
val entity: LocalPlayerEntity
get() = connection.player
@ -122,8 +123,13 @@ class Camera(
fogStart = Float.MAX_VALUE
return
}
val renderDistance = 10 // ToDo: Calculate correct, get real render distance
fogStart = (renderDistance * ProtocolDefinition.SECTION_WIDTH_X).toFloat()
fogStart = if (connection.player.submgergedFluid?.resourceLocation == DefaultFluids.WATER) {
10.0f
} else {
val renderDistance = 10 // ToDo: Calculate correct, get real render distance
(renderDistance * ProtocolDefinition.SECTION_WIDTH_X).toFloat()
}
}
private fun applyFog() {
@ -142,7 +148,6 @@ class Camera(
}
fun init(renderWindow: RenderWindow) {
calculateFogDistance()
renderWindow.inputHandler.registerCheckCallback(
KeyBindingsNames.MOVE_SPRINT,
KeyBindingsNames.MOVE_FORWARD,
@ -240,6 +245,7 @@ class Camera(
}
fun draw() {
calculateFogDistance()
if (!fogColor.equals()) {
applyFog()
}

7
src/main/java/de/bixilon/minosoft/gui/rendering/sky/SkyRenderer.kt
View File

@ -14,6 +14,7 @@
package de.bixilon.minosoft.gui.rendering.sky
import de.bixilon.minosoft.data.registries.ResourceLocation
import de.bixilon.minosoft.data.registries.fluid.DefaultFluids
import de.bixilon.minosoft.data.text.ChatColors
import de.bixilon.minosoft.data.text.RGBColor
import de.bixilon.minosoft.gui.rendering.RenderConstants
@ -117,7 +118,11 @@ class SkyRenderer(
val brightness = 1.0f
val skyColor = RGBColor((baseColor.red * brightness).toInt(), (baseColor.green * brightness).toInt(), (baseColor.blue * brightness).toInt())
renderWindow.inputHandler.camera.fogColor.value = skyColor
renderWindow.inputHandler.camera.fogColor.value = if (connection.player.submgergedFluid?.resourceLocation == DefaultFluids.WATER) {
connection.player.positionInfo.biome?.waterFogColor ?: skyColor
} else {
skyColor
}
for (shader in renderWindow.renderSystem.shaders) {