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

Crash fixes, additional controller support

Browse Source
This commit is contained in:
Anuken
2018-01-10 14:43:29 -05:00
parent d6532c26bb
commit a9546de894
16 changed files with 63 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/input/AndroidInput.java
View File

@@ -56,7 +56,10 @@ public class AndroidInput extends InputHandler{
@Override
public boolean touchDown(int screenX, int screenY, int pointer, int button){
if(ui.hasMouse()) return false;
if(ui.hasMouse()){
brokeBlock = true;
return false;
}
lmousex = screenX;
lmousey = screenY;

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

@@ -10,6 +10,8 @@ import io.anuke.mindustry.resource.Weapon;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Inputs;
import io.anuke.ucore.core.Inputs.DeviceType;
import io.anuke.ucore.core.KeyBinds;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.utils.Cursors;
import io.anuke.ucore.util.Mathf;
@@ -21,7 +23,7 @@ public class DesktopInput extends InputHandler{
int endx, endy;
private boolean enableHold = false;
private boolean beganBreak;
private boolean rotated = false, rotatedAlt;
private boolean rotated = false, rotatedAlt, zoomed;
@Override public float getCursorEndX(){ return endx; }
@Override public float getCursorEndY(){ return endy; }
@@ -54,9 +56,17 @@ public class DesktopInput extends InputHandler{
endx = Gdx.input.getX();
endy = Gdx.input.getY();
boolean controller = KeyBinds.getSection("default").device.type == DeviceType.controller;
if(Inputs.getAxisActive("zoom") && Inputs.keyDown("zoom_hold") && !GameState.is(State.menu) && !ui.hasDialog()){
renderer.scaleCamera((int)Inputs.getAxis("zoom"));
if(Inputs.getAxisActive("zoom") && (Inputs.keyDown("zoom_hold") || controller)
&& !GameState.is(State.menu) && !ui.hasDialog()){
if((!zoomed || !controller)) {
renderer.scaleCamera((int) Inputs.getAxis("zoom"));
}
zoomed = true;
}else{
zoomed = false;
}
if(!rotated) {