Optimise line thickness calculations

EngineHub · Oct 9, 2023 · 2a09aaf · 2a09aaf
1 parent 58e9156
commit 2a09aaf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java b/worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
@@ -2587,7 +2587,7 @@ public int drawLine(Pattern pattern, List<BlockVector3> vectors, double radius,
 
         Set<BlockVector3> vset = new HashSet<>();
 
-        for (int i = 0; vectors.size() != 0 && i < vectors.size() - 1; i++) {
+        for (int i = 0; !vectors.isEmpty() && i < vectors.size() - 1; i++) {
             BlockVector3 pos1 = vectors.get(i);
             BlockVector3 pos2 = vectors.get(i + 1);
 
@@ -2691,17 +2691,18 @@ public int drawSpline(Pattern pattern, List<BlockVector3> nodevectors, double te
         return setBlocks(vset, pattern);
     }
 
-    private static double hypot(double... pars) {
+    private static double hypotSquare(double... pars) {
         double sum = 0;
         for (double d : pars) {
             sum += Math.pow(d, 2);
         }
-        return Math.sqrt(sum);
+        return sum;
     }
 
     private static Set<BlockVector3> getBallooned(Set<BlockVector3> vset, double radius) {
         Set<BlockVector3> returnset = new HashSet<>();
         int ceilrad = (int) Math.ceil(radius);
+        double radiusSquare = Math.pow(radius, 2);
 
         for (BlockVector3 v : vset) {
             int tipx = v.getBlockX();
@@ -2711,7 +2712,7 @@ private static Set<BlockVector3> getBallooned(Set<BlockVector3> vset, double rad
             for (int loopx = tipx - ceilrad; loopx <= tipx + ceilrad; loopx++) {
                 for (int loopy = tipy - ceilrad; loopy <= tipy + ceilrad; loopy++) {
                     for (int loopz = tipz - ceilrad; loopz <= tipz + ceilrad; loopz++) {
-                        if (hypot(loopx - tipx, loopy - tipy, loopz - tipz) <= radius) {
+                        if (hypotSquare(loopx - tipx, loopy - tipy, loopz - tipz) <= radiusSquare) {
                             returnset.add(BlockVector3.at(loopx, loopy, loopz));
                         }
                     }

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
@@ -139,8 +139,7 @@ public int line(Actor actor, EditSession editSession,
 
         List<BlockVector3> vectors;
 
-        if (region instanceof CuboidRegion) {
-            CuboidRegion cuboidRegion = (CuboidRegion) region;
+        if (region instanceof CuboidRegion cuboidRegion) {
             vectors = ImmutableList.of(cuboidRegion.getPos1(), cuboidRegion.getPos2());
         } else {
             ConvexPolyhedralRegion convexRegion = (ConvexPolyhedralRegion) region;