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

Death to unit.dp

Browse Source
This commit is contained in:
Anuken
2017-12-19 20:51:46 -05:00
parent 9e298bde03
commit e529cabfb1
35 changed files with 150 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,7 @@ public class AndroidInput extends InputHandler{
public void update(){
enableHold = player.breakMode == PlaceMode.holdDelete;
if(enableHold && player.recipe != null && Gdx.input.isTouched(0) && Mathf.near2d(lmousex, lmousey, Gdx.input.getX(0), Gdx.input.getY(0), Unit.dp.inPixels(50))
if(enableHold && Gdx.input.isTouched(0) && Mathf.near2d(lmousex, lmousey, Gdx.input.getX(0), Gdx.input.getY(0), Unit.dp.scl(50))
&& !ui.hasMouse()){
warmup += Timers.delta();

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

@@ -83,9 +83,9 @@ public class GestureHandler extends GestureAdapter{
initzoom = initialDistance;
}
if(Math.abs(distance - initzoom) > Unit.dp.inPixels(100f) && !zoomed){
if(Math.abs(distance - initzoom) > Unit.dp.scl(100f) && !zoomed){
int amount = (distance > initzoom ? 1 : -1);
renderer.scaleCamera(Math.round(Unit.dp.inPixels(amount)));
renderer.scaleCamera(Math.round(Unit.dp.scl(amount)));
initzoom = distance;
zoomed = true;
return true;