Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-25 02:27:38 +01:00
Code Issues Projects Releases Wiki Activity

Avoid boxing and streams

Browse Source
This commit is contained in:
themode 2022-03-09 19:45:05 +01:00
parent 6891a530f5
commit d3432011d9
1 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/java/net/minestom/server/collision/ShapeImpl.java
View File

@ -1,21 +1,21 @@
package net.minestom.server.collision; package net.minestom.server.collision;
import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
import it.unimi.dsi.fastutil.doubles.DoubleList;
import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Point;
import net.minestom.server.coordinate.Vec; import net.minestom.server.coordinate.Vec;
import net.minestom.server.item.Material; import net.minestom.server.item.Material;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
final class ShapeImpl implements Shape { final class ShapeImpl implements Shape {
private final List<BoundingBox> blockSections; private final BoundingBox[] blockSections;
private final Supplier<Material> block; private final Supplier<Material> block;
ShapeImpl(List<BoundingBox> boundingBoxes, Supplier<Material> block) { private ShapeImpl(BoundingBox[] boundingBoxes, Supplier<Material> block) {
this.blockSections = boundingBoxes; this.blockSections = boundingBoxes;
this.block = block; this.block = block;
} }
@ -25,30 +25,29 @@ final class ShapeImpl implements Shape {
final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE);
final Matcher matcher = pattern.matcher(str); final Matcher matcher = pattern.matcher(str);
ArrayList<Double> vals = new ArrayList<>(); DoubleList vals = new DoubleArrayList();
while (matcher.find()) { while (matcher.find()) {
double newVal = Double.parseDouble(matcher.group()); double newVal = Double.parseDouble(matcher.group());
vals.add(newVal); vals.add(newVal);
} }
List<BoundingBox> boundingBoxes = new ArrayList<>();
final int count = vals.size() / 6; final int count = vals.size() / 6;
BoundingBox[] boundingBoxes = new BoundingBox[count];
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
final double boundXSize = vals.get(3 + 6 * i) - vals.get(0 + 6 * i); final double minX = vals.getDouble(0 + 6 * i);
final double boundYSize = vals.get(4 + 6 * i) - vals.get(1 + 6 * i); final double minY = vals.getDouble(1 + 6 * i);
final double boundZSize = vals.get(5 + 6 * i) - vals.get(2 + 6 * i); final double minZ = vals.getDouble(2 + 6 * i);
final double boundXSize = vals.getDouble(3 + 6 * i) - minX;
final double boundYSize = vals.getDouble(4 + 6 * i) - minY;
final double boundZSize = vals.getDouble(5 + 6 * i) - minZ;
final double minX, minY, minZ;
minX = vals.get(0 + 6 * i);
minY = vals.get(1 + 6 * i);
minZ = vals.get(2 + 6 * i);
final BoundingBox bb = new BoundingBox(boundXSize, boundYSize, boundZSize, new Vec(minX, minY, minZ)); final BoundingBox bb = new BoundingBox(boundXSize, boundYSize, boundZSize, new Vec(minX, minY, minZ));
assert bb.minX() == minX; assert bb.minX() == minX;
assert bb.minY() == minY; assert bb.minY() == minY;
assert bb.minZ() == minZ; assert bb.minZ() == minZ;
boundingBoxes.add(bb); boundingBoxes[i] = bb;
} }
return new ShapeImpl(boundingBoxes, block); return new ShapeImpl(boundingBoxes, block);
} }
@ -76,27 +75,23 @@ final class ShapeImpl implements Shape {
@Override @Override
public boolean intersectBox(@NotNull Point position, @NotNull BoundingBox boundingBox) { public boolean intersectBox(@NotNull Point position, @NotNull BoundingBox boundingBox) {
return blockSections.stream().anyMatch(section -> boundingBox.intersectBox(position, section)); for (BoundingBox blockSection : blockSections) {
if (boundingBox.intersectBox(position, blockSection)) return true;
}
return false;
} }
@Override @Override
public boolean intersectBoxSwept(@NotNull Point rayStart, @NotNull Point rayDirection, @NotNull Point shapePos, @NotNull BoundingBox moving, @NotNull SweepResult finalResult) { public boolean intersectBoxSwept(@NotNull Point rayStart, @NotNull Point rayDirection, @NotNull Point shapePos, @NotNull BoundingBox moving, @NotNull SweepResult finalResult) {
List<BoundingBox> collidables = blockSections.stream().filter(blockSection -> {
// Fast check to see if a collision happens
// Uses minkowski sum
return RayUtils.BoundingBoxIntersectionCheck(
moving, rayStart, rayDirection,
blockSection,
shapePos
);
}).toList();
boolean hitBlock = false; boolean hitBlock = false;
SweepResult tempResult = new SweepResult(1, 0, 0, 0, null); SweepResult tempResult = new SweepResult(1, 0, 0, 0, null);
for (BoundingBox blockSection : blockSections) {
for (BoundingBox bb : collidables) { // Fast check to see if a collision happens
// Uses minkowski sum
if (!RayUtils.BoundingBoxIntersectionCheck(moving, rayStart, rayDirection, blockSection, shapePos))
continue;
// Longer check to get result of collision // Longer check to get result of collision
RayUtils.SweptAABB(moving, rayStart, rayDirection, bb, shapePos, tempResult); RayUtils.SweptAABB(moving, rayStart, rayDirection, blockSection, shapePos, tempResult);
// Update final result if the temp result collision is sooner than the current final result // Update final result if the temp result collision is sooner than the current final result
if (tempResult.res < finalResult.res) { if (tempResult.res < finalResult.res) {
finalResult.res = tempResult.res; finalResult.res = tempResult.res;