Skip to content

Commit dca803b

Browse files
committed
Use SimpleTransform in WorldEditExpressionEnvironment
1 parent 2f5fb94 commit dca803b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

worldedit-core/src/main/java/com/sk89q/worldedit/regions/shape/WorldEditExpressionEnvironment.java

+10-5
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,28 @@
2323
import com.sk89q.worldedit.internal.expression.ExpressionEnvironment;
2424
import com.sk89q.worldedit.math.BlockVector3;
2525
import com.sk89q.worldedit.math.Vector3;
26+
import com.sk89q.worldedit.math.transform.SimpleTransform;
27+
import com.sk89q.worldedit.math.transform.Transform;
2628
import com.sk89q.worldedit.world.registry.LegacyMapper;
2729

2830
public class WorldEditExpressionEnvironment implements ExpressionEnvironment {
2931

30-
private final Vector3 unit;
31-
private final Vector3 zero2;
32+
private final Transform transform;
3233
private Vector3 current = Vector3.ZERO;
3334
private final Extent extent;
3435

36+
@Deprecated
3537
public WorldEditExpressionEnvironment(Extent extent, Vector3 unit, Vector3 zero) {
38+
this(extent, new SimpleTransform(zero, unit));
39+
}
40+
41+
public WorldEditExpressionEnvironment(Extent extent, Transform transform) {
3642
this.extent = extent;
37-
this.unit = unit;
38-
this.zero2 = zero.add(0.5, 0.5, 0.5);
43+
this.transform = transform;
3944
}
4045

4146
public BlockVector3 toWorld(double x, double y, double z) {
42-
return Vector3.at(x, y, z).multiply(unit).add(zero2).toBlockPoint();
47+
return transform.apply(Vector3.at(x, y, z)).add(0.5, 0.5, 0.5).toBlockPoint();
4348
}
4449

4550
public Vector3 toWorldRel(double x, double y, double z) {

0 commit comments

Comments
 (0)