diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/fog/FogManager.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/fog/FogManager.kt index 4ae06faa6..1b1c3fd94 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/fog/FogManager.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/fog/FogManager.kt @@ -31,7 +31,7 @@ class FogManager( private val player = context.connection.player private var interpolation = FogInterpolationStart() - private val state = FogState() + val state = FogState() private var options: FogOptions? = null diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt index 13139bd0c..af9799ed1 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt @@ -1,6 +1,6 @@ /* * Minosoft - * Copyright (C) 2020-2023 Moritz Zwerger + * Copyright (C) 2020-2024 Moritz Zwerger * * This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * @@ -202,6 +202,7 @@ class SkyboxColor( fun calculate(): RGBColor? { + sky.context.camera.fogManager.state.color?.let { return it } val properties = sky.effects val time = sky.time if (properties.fixedTexture != null) { diff --git a/src/main/resources/assets/minosoft/rendering/shader/chunk/chunk.fsh b/src/main/resources/assets/minosoft/rendering/shader/chunk/chunk.fsh index f187f8070..5efaf2b41 100644 --- a/src/main/resources/assets/minosoft/rendering/shader/chunk/chunk.fsh +++ b/src/main/resources/assets/minosoft/rendering/shader/chunk/chunk.fsh @@ -25,6 +25,6 @@ out vec4 foutColor; #include "minosoft:animation" void main() { - applyTexel(); applyTint(); + applyTexel(); } diff --git a/src/main/resources/assets/minosoft/rendering/shader/entities/features/text/text.fsh b/src/main/resources/assets/minosoft/rendering/shader/entities/features/text/text.fsh index bedf821f3..0dd95e038 100644 --- a/src/main/resources/assets/minosoft/rendering/shader/entities/features/text/text.fsh +++ b/src/main/resources/assets/minosoft/rendering/shader/entities/features/text/text.fsh @@ -25,6 +25,6 @@ out vec4 foutColor; #include "minosoft:animation" void main() { - applyTexel(); applyTint(); + applyTexel(); }