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

fix sky color and block color when fog color is set

Browse Source
This commit is contained in:
Moritz Zwerger 2024-03-01 00:14:30 +01:00
parent 51993e1646
commit 3fada12014
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/rendering/camera/fog/FogManager.kt
View File

@ -31,7 +31,7 @@ class FogManager(
private val player = context.connection.player private val player = context.connection.player
private var interpolation = FogInterpolationStart() private var interpolation = FogInterpolationStart()
private val state = FogState() val state = FogState()
private var options: FogOptions? = null private var options: FogOptions? = null

3
src/main/java/de/bixilon/minosoft/gui/rendering/sky/box/SkyboxColor.kt
View File

@ -1,6 +1,6 @@
/* /*
* Minosoft * 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. * 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? { fun calculate(): RGBColor? {
sky.context.camera.fogManager.state.color?.let { return it }
val properties = sky.effects val properties = sky.effects
val time = sky.time val time = sky.time
if (properties.fixedTexture != null) { if (properties.fixedTexture != null) {

2
src/main/resources/assets/minosoft/rendering/shader/chunk/chunk.fsh
View File

@ -25,6 +25,6 @@ out vec4 foutColor;
#include "minosoft:animation" #include "minosoft:animation"
void main() { void main() {
applyTexel();
applyTint(); applyTint();
applyTexel();
} }

2
src/main/resources/assets/minosoft/rendering/shader/entities/features/text/text.fsh
View File

@ -25,6 +25,6 @@ out vec4 foutColor;
#include "minosoft:animation" #include "minosoft:animation"
void main() { void main() {
applyTexel();
applyTint(); applyTint();
applyTexel();
} }