//brush deform: Use SimpleTransform in everything using WorldEditExpressionEnvironment

Author: TomyLobo

worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java

@@ -32,9 +32,8 @@
 import com.sk89q.worldedit.function.operation.RunContext;
 import com.sk89q.worldedit.internal.expression.Expression;
 import com.sk89q.worldedit.internal.expression.ExpressionException;
+import com.sk89q.worldedit.internal.util.TransformUtil;
 import com.sk89q.worldedit.math.Vector3;
-import com.sk89q.worldedit.math.transform.Identity;
-import com.sk89q.worldedit.math.transform.SimpleTransform;
 import com.sk89q.worldedit.math.transform.Transform;
 import com.sk89q.worldedit.regions.NullRegion;
 import com.sk89q.worldedit.regions.Region;
@@ -123,37 +122,10 @@ public String toString() {
     public Operation createFromContext(final EditContext context) {
 
         Region region = firstNonNull(context.getRegion(), this.region);
+        final Vector3 min = region.getMinimumPoint().toVector3();
+        final Vector3 max = region.getMaximumPoint().toVector3();
 
-        final Transform transform;
-        switch (mode) {
-            case UNIT_CUBE:
-                final Vector3 min = region.getMinimumPoint().toVector3();
-                final Vector3 max = region.getMaximumPoint().toVector3();
-                final Vector3 zero = max.add(min).multiply(0.5);
-                Vector3 unit = max.subtract(zero);
-
-                if (unit.x() == 0) {
-                    unit = unit.withX(1.0);
-                }
-                if (unit.y() == 0) {
-                    unit = unit.withY(1.0);
-                }
-                if (unit.z() == 0) {
-                    unit = unit.withZ(1.0);
-                }
-
-                transform = new SimpleTransform(zero, unit);
-                break;
-
-            case RAW_COORD:
-                transform = new Identity();
-                break;
-
-            case OFFSET:
-            default:
-                transform = new SimpleTransform(offset, Vector3.ONE);
-                break;
-        }
+        final Transform transform = TransformUtil.createTransformForExpressionCommand(mode, min, max, offset);
         LocalSession session = context.getSession();
         return new DeformOperation(context.getDestination(), region, transform, expression,
                 session == null ? WorldEdit.getInstance().getConfiguration().calculationTimeout : session.getTimeout());

worldedit-core/src/main/java/com/sk89q/worldedit/internal/util/TransformUtil.java

@@ -22,6 +22,7 @@
 import com.sk89q.worldedit.IncompleteRegionException;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.function.factory.Deform;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.math.transform.Identity;
 import com.sk89q.worldedit.math.transform.SimpleTransform;
@@ -94,4 +95,27 @@ public static Transform createTransformForExpressionCommand(boolean useRawCoords
         }
         return new SimpleTransform(center, scale);
     }
+
+    /**
+     * Creates a {@link Transform} for the //deform command with clipboard support.
+     *
+     * @param mode            The coordinate mode to use
+     * @param min             Minimum of the selection/clipboard
+     * @param max             Maximum of the selection/clipboard
+     * @param placement       Placement position
+     * @return                A transform from the expression coordinate system to the world/clipboard coordinate system
+     */
+    public static Transform createTransformForExpressionCommand(Deform.Mode mode, Vector3 min, Vector3 max, Vector3 placement) {
+        switch (mode) {
+            case UNIT_CUBE:
+                return createTransformForExpressionCommand(false, false, false, min, max, placement);
+
+            case RAW_COORD:
+                return createTransformForExpressionCommand(true, false, false, min, max, placement);
+
+            case OFFSET:
+            default:
+                return createTransformForExpressionCommand(false, true, false, min, max, placement);
+        }
+    }
 }