Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to rotate each block in a line (#688)

Browse Source 
* Add ability to rotate each block in a line

* New behavior only when placing straight lines

* Code style
This commit is contained in:
Synray
2019-09-21 15:03:05 -07:00
committed by Anuken
parent c45805e703
commit 7f299869c5
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -236,6 +236,15 @@ public class DesktopInput extends InputHandler{
selectY = tileY(Core.input.mouseY()); selectY = tileY(Core.input.mouseY());
} }
if (mode == placing && block != null){
if (!overrideLineRotation && !Core.input.keyDown(Binding.diagonal_placement) && (selectX != cursorX || selectY != cursorY) && ((int) Core.input.axisTap(Binding.rotate) != 0)){
rotation = ((int)((Angles.angle(selectX, selectY, cursorX, cursorY) + 45) / 90f)) % 4;
overrideLineRotation = true;
}
}else{
overrideLineRotation = false;
}
if(Core.input.keyRelease(Binding.break_block) || Core.input.keyRelease(Binding.select)){ if(Core.input.keyRelease(Binding.break_block) || Core.input.keyRelease(Binding.select)){
if(mode == placing && block != null){ //touch up while placing, place everything in selection if(mode == placing && block != null){ //touch up while placing, place everything in selection

12
core/src/io/anuke/mindustry/input/InputHandler.java
View File

@@ -38,6 +38,7 @@ public abstract class InputHandler implements InputProcessor{
public final OverlayFragment frag = new OverlayFragment(); public final OverlayFragment frag = new OverlayFragment();
public Block block; public Block block;
public boolean overrideLineRotation;
public int rotation; public int rotation;
public boolean droppingItem; public boolean droppingItem;
@@ -380,7 +381,10 @@ public abstract class InputHandler implements InputProcessor{
} }
float angle = Angles.angle(startX, startY, endX, endY); float angle = Angles.angle(startX, startY, endX, endY);
int baseRotation = (startX == endX && startY == endY) ? rotation : ((int)((angle + 45) / 90f)) % 4; int baseRotation = rotation;
if (!overrideLineRotation || diagonal){
baseRotation = (startX == endX && startY == endY) ? rotation : ((int)((angle + 45) / 90f)) % 4;
}
Tmp.r3.set(-1, -1, 0, 0); Tmp.r3.set(-1, -1, 0, 0);
@@ -394,7 +398,11 @@ public abstract class InputHandler implements InputProcessor{
Point2 next = i == points.size - 1 ? null : points.get(i + 1); Point2 next = i == points.size - 1 ? null : points.get(i + 1);
line.x = point.x; line.x = point.x;
line.y = point.y; line.y = point.y;
line.rotation = next != null ? Tile.relativeTo(point.x, point.y, next.x, next.y) : baseRotation; if (!overrideLineRotation || diagonal){
line.rotation = next != null ? Tile.relativeTo(point.x, point.y, next.x, next.y) : baseRotation;
}else{
line.rotation = rotation;
}
line.last = next == null; line.last = next == null;
cons.accept(line); cons.accept(line);