Skip to content
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

Enhancements for block face & liquid occlusion & Fixes for water Z-fighting with transparent blocks #892

Merged
merged 4 commits into from
Nov 22, 2021
Merged

Enhancements for block face & liquid occlusion & Fixes for water Z-fighting with transparent blocks #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c74b794
fix #858 #859
Altirix Sep 10, 2021
e2320f0
few comments & enhancement #89
Altirix Sep 11, 2021
b92a869
changes to comments, affects more than just potted plants
Altirix Sep 11, 2021
c833051
FluidRenderer changes
Altirix Sep 11, 2021
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
8 changes: 7 additions & 1 deletion src/main/java/me/jellysquid/mods/sodium/client/render/occlusion/BlockOcclusionCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import it.unimi.dsi.fastutil.objects.Object2ByteLinkedOpenHashMap;
import net.minecraft.block.BlockState;
import net.minecraft.block.SideShapeType;
import net.minecraft.util.function.BooleanBiFunction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
Expand Down Expand Up @@ -45,7 +46,12 @@ public boolean shouldDrawSide(BlockState selfState, BlockView view, BlockPos pos
}

if (selfShape.isEmpty()) {
return true;
if (adjShape.isEmpty()){
return true; //example: top face of potted plants if top slab is placed above
}
else if (!adjState.isSideSolid(view,pos,facing.getOpposite(), SideShapeType.FULL)){
return true; //example: face of potted plants rendered if top stair placed above
}
}

return this.calculate(selfShape, adjShape);
Expand Down
65 changes: 31 additions & 34 deletions src/main/java/me/jellysquid/mods/sodium/client/render/pipeline/FluidRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,22 @@
import me.jellysquid.mods.sodium.client.model.light.LightPipelineProvider;
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuad;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadColorProvider;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadView;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadViewMutable;
import me.jellysquid.mods.sodium.client.model.quad.blender.BiomeColorBlender;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFacing;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadFlags;
import me.jellysquid.mods.sodium.client.model.quad.properties.ModelQuadWinding;
import me.jellysquid.mods.sodium.client.model.quad.ModelQuadColorProvider;
import me.jellysquid.mods.sodium.client.render.chunk.compile.buffers.ChunkModelBuilder;
import me.jellysquid.mods.sodium.client.render.chunk.format.ModelVertexSink;
import me.jellysquid.mods.sodium.client.util.Norm3b;
import me.jellysquid.mods.sodium.client.util.color.ColorABGR;
import me.jellysquid.mods.sodium.common.util.DirectionUtil;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler;
import net.fabricmc.fabric.impl.client.rendering.fluid.FluidRenderHandlerRegistryImpl;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.StainedGlassBlock;
import net.minecraft.block.SideShapeType;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.texture.Sprite;
Expand Down Expand Up @@ -71,19 +69,16 @@ public FluidRenderer(LightPipelineProvider lighters, BiomeColorBlender biomeColo
this.biomeColorBlender = biomeColorBlender;
}

private boolean isFluidExposed(BlockRenderView world, int x, int y, int z, Direction dir, Fluid fluid) {
// Up direction is hard to test since it doesnt fill the block
if(dir != Direction.UP) {
BlockPos pos = this.scratchPos.set(x, y, z);
BlockState blockState = world.getBlockState(pos);
VoxelShape shape = blockState.getCullingShape(world, pos);
if (blockState.isOpaque() && VoxelShapes.isSideCovered(VoxelShapes.fullCube(), shape, dir.getOpposite())) {
return false; // Fluid is in waterlogged block that self occludes
}
}
private boolean isFluidOccluded(BlockRenderView world, int x, int y, int z, Direction dir, Fluid fluid) {
BlockPos pos = this.scratchPos.set(x, y, z);
BlockState blockState = world.getBlockState(pos);
BlockPos adjPos = this.scratchPos.set(x + dir.getOffsetX(), y + dir.getOffsetY(), z + dir.getOffsetZ());

BlockPos pos = this.scratchPos.set(x + dir.getOffsetX(), y + dir.getOffsetY(), z + dir.getOffsetZ());
return !world.getFluidState(pos).getFluid().matchesType(fluid);
if (blockState.isOpaque()) {
return world.getFluidState(adjPos).getFluid().matchesType(fluid) || blockState.isSideSolid(world,pos,dir, SideShapeType.FULL);
// fluidlogged or next to water, occlude sides that are solid or the same liquid
}
return world.getFluidState(adjPos).getFluid().matchesType(fluid);
}

private boolean isSideExposed(BlockRenderView world, int x, int y, int z, Direction dir, float height) {
Expand Down Expand Up @@ -116,15 +111,15 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos

Fluid fluid = fluidState.getFluid();

boolean sfUp = this.isFluidExposed(world, posX, posY, posZ, Direction.UP, fluid);
boolean sfDown = this.isFluidExposed(world, posX, posY, posZ, Direction.DOWN, fluid) &&
this.isSideExposed(world, posX, posY, posZ, Direction.DOWN, 0.8888889F);
boolean sfNorth = this.isFluidExposed(world, posX, posY, posZ, Direction.NORTH, fluid);
boolean sfSouth = this.isFluidExposed(world, posX, posY, posZ, Direction.SOUTH, fluid);
boolean sfWest = this.isFluidExposed(world, posX, posY, posZ, Direction.WEST, fluid);
boolean sfEast = this.isFluidExposed(world, posX, posY, posZ, Direction.EAST, fluid);
boolean sfUp = this.isFluidOccluded(world, posX, posY, posZ, Direction.UP, fluid);
boolean sfDown = this.isFluidOccluded(world, posX, posY, posZ, Direction.DOWN, fluid) ||
!this.isSideExposed(world, posX, posY, posZ, Direction.DOWN, 0.8888889F);
boolean sfNorth = this.isFluidOccluded(world, posX, posY, posZ, Direction.NORTH, fluid);
boolean sfSouth = this.isFluidOccluded(world, posX, posY, posZ, Direction.SOUTH, fluid);
boolean sfWest = this.isFluidOccluded(world, posX, posY, posZ, Direction.WEST, fluid);
boolean sfEast = this.isFluidOccluded(world, posX, posY, posZ, Direction.EAST, fluid);

if (!sfUp && !sfDown && !sfEast && !sfWest && !sfNorth && !sfSouth) {
if (sfUp && sfDown && sfEast && sfWest && sfNorth && sfSouth) {
return false;
}

Expand All @@ -142,7 +137,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
float h3 = this.getCornerHeight(world, posX + 1, posY, posZ + 1, fluidState.getFluid());
float h4 = this.getCornerHeight(world, posX + 1, posY, posZ, fluidState.getFluid());

float yOffset = sfDown ? EPSILON : 0.0F;
float yOffset = sfDown ? 0.0F : EPSILON;

final ModelQuadViewMutable quad = this.quad;

Expand All @@ -151,7 +146,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos

quad.setFlags(0);

if (sfUp && this.isSideExposed(world, posX, posY, posZ, Direction.UP, Math.min(Math.min(h1, h2), Math.min(h3, h4)))) {
if (!sfUp && this.isSideExposed(world, posX, posY, posZ, Direction.UP, Math.min(Math.min(h1, h2), Math.min(h3, h4)))) {
h1 -= EPSILON;
h2 -= EPSILON;
h3 -= EPSILON;
Expand Down Expand Up @@ -228,7 +223,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
rendered = true;
}

if (sfDown) {
if (!sfDown) {
Sprite sprite = sprites[0];

float minU = sprite.getMinU();
Expand Down Expand Up @@ -264,7 +259,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos

switch (dir) {
case NORTH:
if (!sfNorth) {
if (sfNorth) {
continue;
}

Expand All @@ -276,7 +271,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
z2 = z1;
break;
case SOUTH:
if (!sfSouth) {
if (sfSouth) {
continue;
}

Expand All @@ -288,7 +283,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
z2 = z1;
break;
case WEST:
if (!sfWest) {
if (sfWest) {
continue;
}

Expand All @@ -300,7 +295,7 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
z2 = 0.0f;
break;
case EAST:
if (!sfEast) {
if (sfEast) {
continue;
}

Expand All @@ -323,11 +318,13 @@ public boolean render(BlockRenderView world, FluidState fluidState, BlockPos pos
Sprite sprite = sprites[1];

if (isWater) {
BlockPos posAdj = this.scratchPos.set(adjX, adjY, adjZ);
Block block = world.getBlockState(posAdj).getBlock();
BlockPos adjPos = this.scratchPos.set(adjX, adjY, adjZ);
BlockState adjBlock = world.getBlockState(adjPos);

if (block == Blocks.GLASS || block instanceof StainedGlassBlock) {
if (!adjBlock.isOpaque() && !adjBlock.isAir()) {
// ice, glass, stained glass, tinted glass
sprite = this.waterOverlaySprite;

}
}

Expand Down