mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-15 15:20:57 -08:00
Code Issues Projects Releases Wiki Activity

Better allowRectanglePlacement

Browse source
This commit is contained in:
Anuken 2024-01-22 22:12:24 -05:00
parent bd4ae0639d
commit 76e83c1516
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/mindustry/input/InputHandler.java
View file

@ -1978,7 +1978,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}else{ }else{
points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY); points = Placement.pathfindLine(block != null && block.conveyorPlacement, startX, startY, endX, endY);
} }
}else if(block != null && block.size == 1 && block.allowRectanglePlacement){ }else if(block != null && block.allowRectanglePlacement){
points = Placement.normalizeRectangle(startX, startY, endX, endY, block.size); points = Placement.normalizeRectangle(startX, startY, endX, endY, block.size);
}else{ }else{
points = Placement.normalizeLine(startX, startY, endX, endY); points = Placement.normalizeLine(startX, startY, endX, endY);

6
core/src/mindustry/input/Placement.java
View file

@ -65,9 +65,9 @@ public class Placement{
int minX = Math.min(startX, endX), minY = Math.min(startY, endY), maxX = Math.max(startX, endX), maxY = Math.max(startY, endY); int minX = Math.min(startX, endX), minY = Math.min(startY, endY), maxX = Math.max(startX, endX), maxY = Math.max(startY, endY);
for(int y = minY; y <= maxY; y += blockSize){ for(int y = 0; y <= maxY - minY; y += blockSize){
for(int x = minX; x <= maxX; x += blockSize){ for(int x = 0; x <= maxX - minX; x += blockSize){
points.add(Pools.obtain(Point2.class, Point2::new).set(x, y)); points.add(Pools.obtain(Point2.class, Point2::new).set(startX + x * Mathf.sign(endX - startX), startY + y * Mathf.sign(endY - startY)));
} }
} }

2
core/src/mindustry/world/Block.java
View file

@ -245,7 +245,7 @@ public class Block extends UnlockableContent implements Senseable{
public boolean allowDiagonal = true; public boolean allowDiagonal = true;
/** Whether to swap the diagonal placement modes. */ /** Whether to swap the diagonal placement modes. */
public boolean swapDiagonalPlacement; public boolean swapDiagonalPlacement;
/** Whether to allow rectangular placement, as opposed to a line. Only supported for 1x1 blocks currently! */ /** Whether to allow rectangular placement, as opposed to a line. */
public boolean allowRectanglePlacement = false; public boolean allowRectanglePlacement = false;
/** Build queue priority in schematics. */ /** Build queue priority in schematics. */
public int schematicPriority = 0; public int schematicPriority = 0;