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

More cleanup

Browse Source
This commit is contained in:
Anuken
2019-12-25 11:16:54 -05:00
parent 514d4817c8
commit 475794640d
47 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/input/InputHandler.java
View File

@@ -43,7 +43,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
final static float playerSelectRange = mobile ? 17f : 11f;
/** Maximum line length. */
final static int maxLength = 100;
final static Vector2 stackTrns = new Vector2();
final static Vec2 stackTrns = new Vec2();
final static Rectangle r1 = new Rectangle(), r2 = new Rectangle();
/** Distance on the back from where items originate. */
final static float backTrns = 3f;
@@ -120,7 +120,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
ItemTransfer.create(item,
player.x + Angles.trnsx(player.rotation + 180f, backTrns), player.y + Angles.trnsy(player.rotation + 180f, backTrns),
new Vector2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
new Vec2(tile.drawx() + stackTrns.x, tile.drawy() + stackTrns.y), () -> {
if(tile.block() != block || tile.entity == null || tile.entity.items == null) return;
tile.block().handleStack(item, removed, tile, player);
@@ -639,7 +639,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
int tileX(float cursorX){
Vector2 vec = Core.input.mouseWorld(cursorX, 0);
Vec2 vec = Core.input.mouseWorld(cursorX, 0);
if(selectedBlock()){
vec.sub(block.offset(), block.offset());
}
@@ -647,7 +647,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}
int tileY(float cursorY){
Vector2 vec = Core.input.mouseWorld(0, cursorY);
Vec2 vec = Core.input.mouseWorld(0, cursorY);
if(selectedBlock()){
vec.sub(block.offset(), block.offset());
}

2
core/src/mindustry/input/MobileInput.java
View File

@@ -36,7 +36,7 @@ public class MobileInput extends InputHandler implements GestureListener{
private final float edgePan = Scl.scl(60f);
//gesture data
private Vector2 vector = new Vector2();
private Vec2 vector = new Vec2();
private float lastZoom = -1;
/** Position where the player started dragging a line. */