Skip to content

Fix for #2597 #2599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Decencies wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

Fix for #2597 #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0164035
Temporary fix for #2597
Decencies Jul 14, 2024
bc56c2f
Remove abstract modifier
Decencies Jul 14, 2024
39c58dd
Move if-statement to render method (fix poseStack)
Decencies Jul 15, 2024
98b208f
Fog shader war-crimes
Decencies Jul 15, 2024
44085fe
Merge branch 'CaffeineMC:dev' into fix-issue-2597
Decencies Jul 15, 2024
175ebb6
Temporary fix for #2597
Decencies Jul 14, 2024
17c0475
Remove abstract modifier
Decencies Jul 14, 2024
912bf3a
Move if-statement to render method (fix poseStack)
Decencies Jul 15, 2024
4514388
Merge remote-tracking branch 'self/fix-issue-2597' into fix-issue-2597
Decencies Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/net/caffeinemc/mods/sodium/client/render/immediate/CloudRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.server.packs.resources.ResourceProvider;
import net.minecraft.util.Mth;
import net.minecraft.world.level.material.FogType;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -63,6 +64,10 @@ public void render(Camera camera,
return;
}

if (camera.getFluidInCamera() == FogType.LAVA) {
return;
}

Vec3 pos = camera.getPosition();

double cloudTime = (ticks + tickDelta) * 0.03F;
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/assets/minecraft/shaders/core/clouds.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ void main() {

float width = FogEnd - FogStart;
float newWidth = width * 4.0;

float fade = linear_fog_fade(vertexDistance, FogStart, FogStart + newWidth) * FogColor.a;
fragColor = vec4(mix(FogColor.rgb, color.rgb, 0.7), clamp(color.a * fade, 0.0, 1.0));
vec4 finalColor = vec4(mix(FogColor.rgb, color.rgb, 0.7), clamp(color.a * fade, 0.0, 1.0));
fragColor = linear_fog(finalColor, vertexDistance, FogStart, FogEnd, FogColor);
}