From d61e387916cb911ab1221936581ecd91ed6a7553 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 31 Mar 2021 14:27:27 +0200 Subject: [PATCH] The least performant option - Fixed slow merging of collision shapes - Improved async handling of the collision shape merger - BBs far away from an entity now get skipped in the collision cycle --- .../AbstractContraptionEntity.java | 2 ++ .../structureMovement/Contraption.java | 33 +++++++++++-------- .../ContraptionCollider.java | 13 ++++++-- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java index 867d8d685..d50d90658 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java @@ -461,6 +461,8 @@ public abstract class AbstractContraptionEntity extends Entity implements IEntit if (!ticking) contraption.stop(world); } + if (contraption != null) + contraption.onEntityRemoved(this); super.remove(keepData); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java index 249377298..659c2f591 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/Contraption.java @@ -137,7 +137,7 @@ public abstract class Contraption { private Map initialPassengers; private List pendingSubContraptions; - private CompletableFuture> simplifiedEntityColliderProvider; + private CompletableFuture simplifiedEntityColliderProvider; // Client public Map presentTileEntities; @@ -193,6 +193,7 @@ public abstract class Contraption { String type = nbt.getString("Type"); Contraption contraption = ContraptionType.fromType(type); contraption.readNBT(world, nbt, spawnData); + contraption.world = new ContraptionWorld(world, contraption); contraption.gatherBBsOffThread(); return contraption; } @@ -260,6 +261,13 @@ public abstract class Contraption { gatherBBsOffThread(); } + public void onEntityRemoved(AbstractContraptionEntity entity) { + if (simplifiedEntityColliderProvider != null) { + simplifiedEntityColliderProvider.cancel(false); + simplifiedEntityColliderProvider = null; + } + } + public void onEntityInitialize(World world, AbstractContraptionEntity contraptionEntity) { if (world.isRemote) return; @@ -282,15 +290,6 @@ public abstract class Contraption { } public void onEntityTick(World world) { - if (simplifiedEntityColliderProvider != null && simplifiedEntityColliderProvider.isDone()) { - try { - simplifiedEntityColliders = Optional.of(simplifiedEntityColliderProvider.join()); - } catch (Exception e) { - e.printStackTrace(); - } - simplifiedEntityColliderProvider = null; - } - fluidStorage.forEach((pos, mfs) -> mfs.tick(entity, pos, world.isRemote)); } @@ -1182,19 +1181,25 @@ public abstract class Contraption { } private void gatherBBsOffThread() { + getContraptionWorld(); simplifiedEntityColliderProvider = CompletableFuture.supplyAsync(() -> { VoxelShape combinedShape = VoxelShapes.empty(); for (Entry entry : blocks.entrySet()) { BlockInfo info = entry.getValue(); BlockPos localPos = entry.getKey(); - VoxelShape collisionShape = info.state.getCollisionShape(this.world, localPos); + VoxelShape collisionShape = info.state.getCollisionShape(world, localPos); if (collisionShape.isEmpty()) continue; - combinedShape = VoxelShapes.combineAndSimplify(combinedShape, + combinedShape = VoxelShapes.combine(combinedShape, collisionShape.withOffset(localPos.getX(), localPos.getY(), localPos.getZ()), IBooleanFunction.OR); } - return combinedShape.toBoundingBoxList(); - }); + return combinedShape.simplify() + .toBoundingBoxList(); + }) + .thenAccept(r -> { + simplifiedEntityColliders = Optional.of(r); + simplifiedEntityColliderProvider = null; + }); } public static float getRadius(Set blocks, Direction.Axis axis) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index b95319e45..706805838 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -118,7 +118,6 @@ public class ContraptionCollider { motion = rotationMatrix.transform(motion); // Use simplified bbs when present - // TODO: is it worth filtering out far away bbs? final Vec3d motionCopy = motion; List collidableBBs = contraption.simplifiedEntityColliders.orElseGet(() -> { @@ -147,7 +146,17 @@ public class ContraptionCollider { for (AxisAlignedBB bb : collidableBBs) { Vec3d currentResponse = collisionResponse.getValue(); - obb.setCenter(obbCenter.add(currentResponse)); + Vec3d currentCenter = obbCenter.add(currentResponse); + + if (Math.abs(currentCenter.x - bb.getCenter().x) - entityBounds.getXSize() - 1 > bb.getXSize() / 2) + continue; + if (Math.abs((currentCenter.y + motion.y) - bb.getCenter().y) - entityBounds.getYSize() + - 1 > bb.getYSize() / 2) + continue; + if (Math.abs(currentCenter.z - bb.getCenter().z) - entityBounds.getZSize() - 1 > bb.getZSize() / 2) + continue; + + obb.setCenter(currentCenter); ContinuousSeparationManifold intersect = obb.intersect(bb, motion); if (intersect == null)