Skip to content

Commit

Permalink
Clean up BlockFaceUtils
Browse files Browse the repository at this point in the history
  • Loading branch information
@hlysine
hlysine committed Jul 22, 2024
1 parent 5993c84 commit 6ba27f1
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 39 deletions.
3 changes: 1 addition & 2 deletions common/src/main/java/com/copycatsplus/copycats/foundation/copycat/ICopycatBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.*;
Expand Down Expand Up @@ -510,7 +509,7 @@ static boolean hidesNeighborFace(BlockGetter level,
Direction dir) {
BlockPos toPos = pos.relative(dir);
if (getMaterial(level, pos).skipRendering(getMaterial(level, toPos), dir.getOpposite())) {
return BlockFaceUtils.facesMatch(level, neighborState, toPos, state, pos, dir.getOpposite());
return BlockFaceUtils.canShapeOcclude(level, neighborState, toPos, state, pos, dir.getOpposite());
}
return false;
}
Expand Down
5 changes: 2 additions & 3 deletions ...java/com/copycatsplus/copycats/foundation/copycat/multistate/IMultiStateCopycatBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
Expand Down Expand Up @@ -495,7 +494,7 @@ default boolean canOcclude(String property, BlockGetter level, BlockState state,
@Override
default Optional<Boolean> shapeCanOccludeNeighbor(BlockGetter level, BlockPos pos, BlockState state, BlockPos neighborPos, Direction dir) {
BlockState neighborState = level.getBlockState(neighborPos);
return Optional.of(BlockFaceUtils.facesMatch(level, neighborState, neighborPos, state, pos, dir.getOpposite()));
return Optional.of(BlockFaceUtils.canShapeOcclude(level, neighborState, neighborPos, state, pos, dir.getOpposite()));
}

/**
Expand All @@ -520,7 +519,7 @@ static boolean hidesNeighborFace(BlockGetter level,
? getMaterial(level, toPos, scaledWorld.getPropertyForRender(neighborState, toPos))
: neighborState;
if (material.skipRendering(neighborMaterial, dir.getOpposite())) {
return BlockFaceUtils.facesMatch(level, neighborState, toPos, state, pos, dir.getOpposite());
return BlockFaceUtils.canShapeOcclude(level, neighborState, toPos, state, pos, dir.getOpposite());
}
return false;
}
Expand Down
68 changes: 34 additions & 34 deletions common/src/main/java/com/copycatsplus/copycats/utility/BlockFaceUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,63 +25,63 @@ protected void rehash(int i) {
return cacheMap;
});

public static boolean facesMatch(BlockGetter level, BlockState fromState, BlockPos fromPos, BlockState toState, BlockPos toPos, Direction fromFace) {
public static boolean canShapeOcclude(BlockGetter level, BlockState occludedState, BlockPos occludedPos, BlockState occludingState, BlockPos occludingPos, Direction occludedFace) {
if (level instanceof ScaledBlockAndTintGetter scaledWorld) {
Vec3i scale = scaledWorld.getScale();
VoxelShape fromShape;
BlockPos truePos = scaledWorld.getTruePos(fromPos);
if (fromState.getBlock() instanceof IMultiStateCopycatBlock copycatBlock && copycatBlock.vectorScale(fromState).equals(scale)) {
String property = scaledWorld.getPropertyForRender(fromState, fromPos);
if (!copycatBlock.partExists(fromState, property))
VoxelShape occludedShape;
BlockPos trueOccludedPos = scaledWorld.getTruePos(occludedPos);
if (occludedState.getBlock() instanceof IMultiStateCopycatBlock copycatBlock && copycatBlock.vectorScale(occludedState).equals(scale)) {
String occludedProperty = scaledWorld.getPropertyForRender(occludedState, occludedPos);
if (!copycatBlock.partExists(occludedState, occludedProperty))
return false;
Vec3i inner = copycatBlock.getVectorFromProperty(fromState, property);
fromShape = getPartialFaceShape(fromState.getOcclusionShape(scaledWorld.getWrapped(), truePos),
fromFace,
inner.getX() / (double) scale.getX(),
inner.getY() / (double) scale.getY(),
inner.getZ() / (double) scale.getZ(),
Vec3i occludedInner = copycatBlock.getVectorFromProperty(occludedState, occludedProperty);
occludedShape = getPartialFaceShape(occludedState.getOcclusionShape(scaledWorld.getWrapped(), trueOccludedPos),
occludedFace,
occludedInner.getX() / (double) scale.getX(),
occludedInner.getY() / (double) scale.getY(),
occludedInner.getZ() / (double) scale.getZ(),
1.0 / scale.getX(),
1.0 / scale.getY(),
1.0 / scale.getZ()
);
} else {
fromShape = fromState.getFaceOcclusionShape(scaledWorld.getWrapped(), truePos, fromFace);
occludedShape = occludedState.getFaceOcclusionShape(scaledWorld.getWrapped(), trueOccludedPos, occludedFace);
}
if (fromShape.isEmpty()) {
if (occludedShape.isEmpty()) {
return false;
}
VoxelShape toShape;
BlockPos toTruePos = scaledWorld.getTruePos(toPos);
if (toState.getBlock() instanceof IMultiStateCopycatBlock copycatBlock2 && copycatBlock2.vectorScale(toState).equals(scaledWorld.getScale())) {
String toProperty = scaledWorld.getPropertyForRender(toState, toPos);
Vec3i toInner = copycatBlock2.getVectorFromProperty(toState, toProperty);
toShape = getPartialFaceShape(toState.getOcclusionShape(scaledWorld.getWrapped(), toTruePos),
fromFace.getOpposite(),
toInner.getX() / (double) scale.getX(),
toInner.getY() / (double) scale.getY(),
toInner.getZ() / (double) scale.getZ(),
VoxelShape occludingShape;
BlockPos trueOccludingPos = scaledWorld.getTruePos(occludingPos);
if (occludingState.getBlock() instanceof IMultiStateCopycatBlock copycatBlock2 && copycatBlock2.vectorScale(occludingState).equals(scaledWorld.getScale())) {
String occludingProperty = scaledWorld.getPropertyForRender(occludingState, occludingPos);
Vec3i occludingInner = copycatBlock2.getVectorFromProperty(occludingState, occludingProperty);
occludingShape = getPartialFaceShape(occludingState.getOcclusionShape(scaledWorld.getWrapped(), trueOccludingPos),
occludedFace.getOpposite(),
occludingInner.getX() / (double) scale.getX(),
occludingInner.getY() / (double) scale.getY(),
occludingInner.getZ() / (double) scale.getZ(),
1.0 / scale.getX(),
1.0 / scale.getY(),
1.0 / scale.getZ()
);
} else {
toShape = toState.getFaceOcclusionShape(scaledWorld.getWrapped(), toTruePos, fromFace.getOpposite());
occludingShape = occludingState.getFaceOcclusionShape(scaledWorld.getWrapped(), trueOccludingPos, occludedFace.getOpposite());
}
return !Shapes.joinIsNotEmpty(fromShape, toShape, BooleanOp.ONLY_FIRST);
return !Shapes.joinIsNotEmpty(occludedShape, occludingShape, BooleanOp.ONLY_FIRST);
}

Block.BlockStatePairKey blockStatePair = new Block.BlockStatePairKey(fromState, toState, fromFace);
Block.BlockStatePairKey blockStatePair = new Block.BlockStatePairKey(occludedState, occludingState, occludedFace);
Object2ByteLinkedOpenHashMap<Block.BlockStatePairKey> occlusionMap = FACE_MATCH_CACHE.get();
byte b0 = occlusionMap.getAndMoveToFirst(blockStatePair);
if (b0 != 127) {
return b0 == 0;
byte cached = occlusionMap.getAndMoveToFirst(blockStatePair);
if (cached != 127) {
return cached == 0;
}
VoxelShape fromShape = fromState.getFaceOcclusionShape(level, fromPos, fromFace);
if (fromShape.isEmpty()) {
VoxelShape occludedShape = occludedState.getFaceOcclusionShape(level, occludedPos, occludedFace);
if (occludedShape.isEmpty()) {
return false;
}
VoxelShape toShape = toState.getFaceOcclusionShape(level, toPos, fromFace.getOpposite());
boolean mismatch = Shapes.joinIsNotEmpty(fromShape, toShape, BooleanOp.ONLY_FIRST);
VoxelShape occludingShape = occludingState.getFaceOcclusionShape(level, occludingPos, occludedFace.getOpposite());
boolean mismatch = Shapes.joinIsNotEmpty(occludedShape, occludingShape, BooleanOp.ONLY_FIRST);
if (occlusionMap.size() == 2048) {
occlusionMap.removeLastByte();
}
Expand Down

0 comments on commit 6ba27f1

Please sign in to comment.