Skip to content

Cache pipe shapes by connection mask #5327

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
Marsietiss wants to merge 1 commit into
base: 1.20.1
Choose a base branch
from
Open

Cache pipe shapes by connection mask #5327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.gregtechceu.gtceu.api.pipenet.IPipeNode;
import com.gregtechceu.gtceu.api.pipenet.IPipeType;
import com.gregtechceu.gtceu.api.pipenet.LevelPipeNet;
import com.gregtechceu.gtceu.api.pipenet.Node;
import com.gregtechceu.gtceu.api.pipenet.PipeNet;
import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider;
import com.gregtechceu.gtceu.api.sync_system.managed.ManagedSyncEntityBlock;
Expand Down Expand Up @@ -65,6 +66,7 @@
import org.joml.Vector3f;

import java.util.*;
import java.util.concurrent.atomic.AtomicReferenceArray;

import javax.annotation.ParametersAreNonnullByDefault;

Expand All @@ -78,6 +80,7 @@ public abstract class PipeBlock<PipeType extends Enum<PipeType> & IPipeType<Node
public final PipeType pipeType;

protected final Map<Direction, VoxelShape> shapes = new IdentityHashMap<>();
private final AtomicReferenceArray<VoxelShape> shapeCache = new AtomicReferenceArray<>(Node.ALL_OPENED + 1);

public PipeBlock(Properties properties, PipeType pipeType) {
super(properties);
Expand Down Expand Up @@ -474,9 +477,15 @@ public GTToolType getPipeTuneTool() {
}

public VoxelShape getShapes(int connections) {
return this.shapes.entrySet().stream()
.filter(entry -> entry.getKey() == null || PipeBlockEntity.isConnected(connections, entry.getKey()))
int connectionMask = connections & Node.ALL_OPENED;
VoxelShape cachedShape = shapeCache.get(connectionMask);
if (cachedShape != null) return cachedShape;

VoxelShape shape = this.shapes.entrySet().stream()
.filter(entry -> entry.getKey() == null || PipeBlockEntity.isConnected(connectionMask, entry.getKey()))
.map(Map.Entry::getValue)
.reduce(Shapes.empty(), Shapes::or);
if (shapeCache.compareAndSet(connectionMask, null, shape)) return shape;
return shapeCache.get(connectionMask);
}
}
Loading