made clonestamp brush clone blocks only above the target block (but i…

…ncluding the target itself) (#242) * made clonestamp brush clone blocks only above the target block (but including the target itself) * Small optimization * imports
KevinDaGame · Sep 18, 2024 · fa74a77 · fa74a77
1 parent 575f416
commit fa74a77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/VoxelSniperCore/src/main/java/com/github/kevindagame/brush/CloneStampBrush.java b/VoxelSniperCore/src/main/java/com/github/kevindagame/brush/CloneStampBrush.java
@@ -7,11 +7,9 @@
 import com.github.kevindagame.util.Shapes;
 import com.github.kevindagame.util.Utils;
 import com.github.kevindagame.util.VoxelMessage;
-import com.github.kevindagame.voxelsniper.location.BaseLocation;
 import com.github.kevindagame.voxelsniper.location.VoxelLocation;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,9 +20,6 @@
  */
 public class CloneStampBrush extends StampBrush {
 
-    private BaseLocation startingPoint;
-
-
     /**
      * The clone method is used to grab a snapshot of the selected area dictated blockPositionY targetBlock.x y z v.brushSize v.voxelHeight and v.cCen.
      * <p/>
@@ -34,10 +29,9 @@ public class CloneStampBrush extends StampBrush {
      * @param v the caller
      */
     private void clone(final SnipeData v) {
-        VoxelLocation point = getTargetBlock().getLocation().makeMutable();
-        point.add(0, v.getcCen(), 0);
-        this.startingPoint = point.makeImmutable();
-        var positions = Shapes.cylinder(startingPoint, RotationAxis.Y, v.getBrushSize(), v.getVoxelHeight(), 0, false);
+        VoxelLocation startingPoint = getTargetBlock().getLocation().makeMutable();
+        startingPoint.add(0, v.getcCen(), 0);
+        var positions = Shapes.cylinder(startingPoint, RotationAxis.Y, v.getBrushSize(), v.getVoxelHeight(), (v.getVoxelHeight() / 2.0) - 1, false);
         this.clone.clear();
         this.toStamp.clear();
         this.sorted = false;

diff --git a/VoxelSniperCore/src/main/java/com/github/kevindagame/util/Shapes.java b/VoxelSniperCore/src/main/java/com/github/kevindagame/util/Shapes.java
@@ -1,6 +1,5 @@
 package com.github.kevindagame.util;
 
-import com.github.kevindagame.snipe.Undo;
 import com.github.kevindagame.voxelsniper.block.BlockFace;
 import com.github.kevindagame.voxelsniper.block.IBlock;
 import com.github.kevindagame.voxelsniper.location.BaseLocation;
@@ -81,7 +80,7 @@ public static List<BaseLocation> voxelDisc(BaseLocation location, int brushSize)
         return positions;
     }
 
-    public static List<BaseLocation> cylinder(BaseLocation centerPoint, RotationAxis axis, int brushSize, int height, int shift, boolean smooth) {
+    public static List<BaseLocation> cylinder(BaseLocation centerPoint, RotationAxis axis, int brushSize, int height, double shift, boolean smooth) {
         List<BaseLocation> positions = new ArrayList<>();
         for (int y = 0; y < height; y++) {
             var pos = axis.getLocationTranslator().invoke(centerPoint.getWorld(), 0, (int) (y - (height / 2.0) + 1 + shift), 0);
@@ -121,8 +120,6 @@ public static List<BaseLocation> dome(BaseLocation location, int brushSize, int
         final int absoluteHeight = Math.abs(height);
         final boolean negative = height < 0;
 
-        final Undo undo = new Undo();
-
         final int brushSizeTimesVoxelHeight = brushSize * absoluteHeight;
         final double stepScale = ((brushSize * brushSize) + brushSizeTimesVoxelHeight + brushSizeTimesVoxelHeight) / 5.0;