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

Initial setup

Browse Source
This commit is contained in:
Anuken
2019-11-02 10:49:21 -04:00
parent 51d08c6f42
commit b8ea0f3aa6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -804,12 +804,12 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
void iterateLine(int startX, int startY, int endX, int endY, Cons<PlaceLine> cons){ void iterateLine(int startX, int startY, int endX, int endY, Cons<PlaceLine> cons){
Array<Point2> points; Array<Point2> points;
boolean diagonal = Core.input.keyDown(Binding.diagonal_placement); boolean diagonal = Core.input.keyDown(Binding.diagonal_placement);
if(Core.settings.getBool("swapdiagonal")){ if(Core.settings.getBool("swapdiagonal") && mobile){
diagonal = !diagonal; diagonal = !diagonal;
} }
if(diagonal){ if(diagonal){
points = PlaceUtils.normalizeDiagonal(startX, startY, endX, endY); points = PlaceUtils.pathfindLine(startX, startY, endX, endY);
}else{ }else{
points = PlaceUtils.normalizeLine(startX, startY, endX, endY); points = PlaceUtils.normalizeLine(startX, startY, endX, endY);
} }

2
core/src/io/anuke/mindustry/input/PlaceUtils.java
View File

@@ -16,7 +16,7 @@ public class PlaceUtils{
private static Array<Point2> points = new Array<>(); private static Array<Point2> points = new Array<>();
/** Normalize a diagonal line into points. */ /** Normalize a diagonal line into points. */
public static Array<Point2> normalizeDiagonal(int startX, int startY, int endX, int endY){ public static Array<Point2> pathfindLine(int startX, int startY, int endX, int endY){
Pools.freeAll(points); Pools.freeAll(points);
points.clear(); points.clear();
return bres.lineNoDiagonal(startX, startY, endX, endY, Pools.get(Point2.class, Point2::new), points); return bres.lineNoDiagonal(startX, startY, endX, endY, Pools.get(Point2.class, Point2::new), points);