From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Tue, 1 Mar 2022 18:40:09 +0000 Subject: [PATCH] Optimise explosion raytracing diff --git a/src/main/java/net/minecraft/world/level/BlockGetter.java b/src/main/java/net/minecraft/world/level/BlockGetter.java index 5cb899dd7ab92552605e74b2840d57a40f4c1434..da60f48e50ecffd5bdd87badaaa7a51593f138b5 100644 --- a/src/main/java/net/minecraft/world/level/BlockGetter.java +++ b/src/main/java/net/minecraft/world/level/BlockGetter.java @@ -75,11 +75,11 @@ public interface BlockGetter extends LevelHeightAccessor { // Airplane start - broken down variant of below rayTraceBlock, used by World#rayTraceDirect default net.minecraft.world.phys.BlockHitResult.Type rayTraceBlockDirect(Vec3 vec3d, Vec3 vec3d1, BlockPos blockposition, BlockState iblockdata, net.minecraft.world.phys.shapes.CollisionContext voxelshapecoll) { - if (iblockdata.isAir()) return null; // Tuinity - optimise air cases + // Sakura start - optimise explosion raytracing + if (iblockdata.isAir() || iblockdata.isLiquid()) return null; // Tuinity - optimise air cases VoxelShape voxelshape = ClipContext.Block.COLLIDER.get(iblockdata, this, blockposition, voxelshapecoll); - net.minecraft.world.phys.BlockHitResult movingobjectpositionblock = this.clipWithInteractionOverride(vec3d, vec3d1, blockposition, voxelshape, iblockdata); - - return movingobjectpositionblock == null ? null : movingobjectpositionblock.getType(); + return voxelshape.clipDirect(vec3d, vec3d1, blockposition) ? BlockHitResult.Type.BLOCK : null; + // Sakura end - optimise explosion raytracing } // Airplane end diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java index 43cca0134a6f609f88b6aab96a150543353bf1b6..9b58f58ff40dc6952a8f32b6c1226f82a98fc6b8 100644 --- a/src/main/java/net/minecraft/world/level/Explosion.java +++ b/src/main/java/net/minecraft/world/level/Explosion.java @@ -381,6 +381,8 @@ public class Explosion { // Sakura start - physics version api } else if (entity.physics().before(1_14_0)) { hitResult = entity.level.rayTrace(vec3d1, source); + } else if (entity.physics().afterOrEqual(1_16_0)) { + hitResult = entity.level.rayTraceDirect(vec3d1, source, net.minecraft.world.phys.shapes.CollisionContext.of(entity)); } else { ClipContext.Block context = entity.physics().afterOrEqual(1_16_0) ? ClipContext.Block.COLLIDER : ClipContext.Block.OUTLINE; hitResult = entity.level.clip(new ClipContext(vec3d1, source, context, ClipContext.Fluid.NONE, entity)).getType(); diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java index da7b4783da35bc08f48f2fe31c4d06f9fb5e160f..f678238897402c7fc919b881f49df5d465fdb012 100644 --- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java +++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java @@ -697,6 +697,7 @@ public abstract class BlockBehaviour { this.hasPostProcess = blockbase_info.hasPostProcess; this.emissiveRendering = blockbase_info.emissiveRendering; this.conditionallyFullOpaque = this.isOpaque() & this.isTransparentOnSomeFaces(); // Paper + this.liquidBlock = block instanceof net.minecraft.world.level.block.LiquidBlock; // Sakura - optimise explosion raytracing } // Paper start - impl cached craft block data, lazy load to fix issue with loading at the wrong time private org.bukkit.craftbukkit.block.data.CraftBlockData cachedCraftBlockData; @@ -736,6 +737,12 @@ public abstract class BlockBehaviour { return this.blockCollisionBehavior; } // Paper end + // Sakura start - optimise explosion raytracing + private final boolean liquidBlock; + public final boolean isLiquid() { + return this.liquidBlock; + } + // Sakura end - optimise explosion raytracing public void initCache() { this.fluid = this.getBlock().getFluidState(this.asState()); // Paper - moved from getFluid() diff --git a/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java b/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java index 2182afd1b95acf14c55bddfeec17dae0a63e1f00..5ef1748014ed4f9334fccc5f1344d676a19a2432 100644 --- a/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java +++ b/src/main/java/net/minecraft/world/phys/shapes/VoxelShape.java @@ -132,6 +132,98 @@ public abstract class VoxelShape { } } + // Sakura start - optimise explosion raytracing + public final boolean clipDirect(Vec3 start, Vec3 end, BlockPos pos) { + if (this == Shapes.empty() || this.isEmpty()) { + return false; + } + + double vec3_x = end.x - start.x; + double vec3_y = end.y - start.y; + double vec3_z = end.z - start.z; + double vec3_lengthSqr = (vec3_x * vec3_x) + (vec3_y * vec3_y) + (vec3_z * vec3_z); + if (vec3_lengthSqr < 1.0E-7D) { + return false; + } else if (this instanceof io.papermc.paper.voxel.AABBVoxelShape aabbVoxelShape) { + return this.clipWithBBDirect(aabbVoxelShape.aabb, vec3_x, vec3_y, vec3_z, start, pos); + } else { + return this.clipWithBBsDirect(vec3_x, vec3_y, vec3_z, start, pos); + } + } + + protected boolean clipWithBBDirect(AABB single, double deltaX, double deltaY, double deltaZ, Vec3 from, BlockPos pos) { + double posX = pos.getX(); + double posY = pos.getY(); + double posZ = pos.getZ(); + + return clipPointBB(single, from, posX, posY, posZ, deltaX, deltaY, deltaZ) + || this.clipInsideDirectBB(single, deltaX, deltaY, deltaZ, from, pos); + } + + protected boolean clipWithBBsDirect(double deltaX, double deltaY, double deltaZ, Vec3 from, BlockPos pos) { + double posX = pos.getX(); + double posY = pos.getY(); + double posZ = pos.getZ(); + + for (AABB bb : this.toAabbs()) { // err + if (clipPointBB(bb, from, posX, posY, posZ, deltaX, deltaY, deltaZ)) { + return true; + } + } + + return this.clipInsideDirectBBs(deltaX, deltaY, deltaZ, from, pos); + } + + @SuppressWarnings("SuspiciousNameCombination") + protected static boolean clipPointBB(AABB box, Vec3 p, double posX, double posY, double posZ, double deltaX, double deltaY, double deltaZ) { + double minX = box.minX + posX; + double minY = box.minY + posY; + double minZ = box.minZ + posZ; + double maxX = box.maxX + posX; + double maxY = box.maxY + posY; + double maxZ = box.maxZ + posZ; + + double closestX = deltaX > 1.0E-7D ? minX : maxX; + double closestY = deltaY > 1.0E-7D ? minY : maxY; + double closestZ = deltaZ > 1.0E-7D ? minZ : maxZ; + + return clipPoint(deltaX, deltaY, deltaZ, closestX, minY, maxY, minZ, maxZ, p.x, p.y, p.z) + || clipPoint(deltaY, deltaZ, deltaX, closestY, minZ, maxZ, minX, maxX, p.y, p.z, p.x) + || clipPoint(deltaZ, deltaX, deltaY, closestZ, minX, maxX, minY, maxY, p.z, p.x, p.y); + } + + private static boolean clipPoint(double deltaX, double deltaY, double deltaZ, double begin, double minX, double maxX, double minZ, double maxZ, double startX, double startY, double startZ) { + double d = (begin - startX) / deltaX; + double e = startY + d * deltaY; + double f = startZ + d * deltaZ; + return (d > 0.0D && d < 1.0) && (minX - 1.0E-7D < e && maxX + 1.0E-7D > e) && (minZ - 1.0E-7D < f && maxZ + 1.0E-7D > f); + } + + protected boolean clipInsideDirectBB(AABB single, double vec3_x, double vec3_y, double vec3_z, Vec3 start, BlockPos pos) { + double fromBehindX = start.x + (vec3_x * 0.001D); + double fromBehindY = start.y + (vec3_y * 0.001D); + double fromBehindZ = start.z + (vec3_z * 0.001D); + + double fromBehindOffsetX = fromBehindX - (double) pos.getX(); + double fromBehindOffsetY = fromBehindY - (double) pos.getY(); + double fromBehindOffsetZ = fromBehindZ - (double) pos.getZ(); + + return single.contains(fromBehindOffsetX, fromBehindOffsetY, fromBehindOffsetZ); + } + + protected boolean clipInsideDirectBBs(double vec3_x, double vec3_y, double vec3_z, Vec3 start, BlockPos pos) { + double fromBehindX = start.x + (vec3_x * 0.001D); + double fromBehindY = start.y + (vec3_y * 0.001D); + double fromBehindZ = start.z + (vec3_z * 0.001D); + + int indexX = this.findIndex(Direction.Axis.X, fromBehindX - (double) pos.getX()); + int indexY = this.findIndex(Direction.Axis.Y, fromBehindY - (double) pos.getY()); + int indexZ = this.findIndex(Direction.Axis.Z, fromBehindZ - (double) pos.getZ()); + + return this.shape.isFullWide(indexX, indexY, indexZ); + } + // Sakura end + public Optional closestPointTo(Vec3 target) { if (this.isEmpty()) { return Optional.empty();