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

Fixed misaligned desktop placing and breaking

Browse Source
This commit is contained in:
Anuken
2018-03-13 11:44:22 -04:00
parent a0f85a8e4b
commit 8fffc1cf9c
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/assets/version.properties
View File

@@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Sun Mar 11 10:07:56 EDT 2018 #Tue Mar 13 11:43:39 EDT 2018
version=release version=release
androidBuildCode=367 androidBuildCode=369
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=custom build build=custom build

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

@@ -17,16 +17,16 @@ import io.anuke.ucore.util.Mathf;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
public class DesktopInput extends InputHandler{ public class DesktopInput extends InputHandler{
int mousex, mousey; float mousex, mousey;
int endx, endy; float endx, endy;
private boolean enableHold = false; private boolean enableHold = false;
private boolean beganBreak; private boolean beganBreak;
private boolean rotated = false, rotatedAlt, zoomed; private boolean rotated = false, rotatedAlt, zoomed;
@Override public float getCursorEndX(){ return select() ? getCursorX() : endx; } @Override public float getCursorEndX(){ return endx; }
@Override public float getCursorEndY(){ return select() ? getCursorY() : endy; } @Override public float getCursorEndY(){ return endy; }
@Override public float getCursorX(){ return (int)(Graphics.screen(mousex, mousey).x); } @Override public float getCursorX(){ return (Graphics.screen(mousex, mousey).x); }
@Override public float getCursorY(){ return (int)(Gdx.graphics.getHeight() - Graphics.screen(mousex, mousey).y); } @Override public float getCursorY(){ return (Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y); }
@Override public boolean drawPlace(){ return !beganBreak; } @Override public boolean drawPlace(){ return !beganBreak; }
@Override @Override
@@ -48,8 +48,8 @@ public class DesktopInput extends InputHandler{
} }
if(!Inputs.keyDown("select") && !Inputs.keyDown("break")){ if(!Inputs.keyDown("select") && !Inputs.keyDown("break")){
mousex = (int)Graphics.mouseWorld().x; mousex = Graphics.mouseWorld().x;
mousey = (int)Graphics.mouseWorld().y; mousey = Graphics.mouseWorld().y;
} }
endx = Gdx.input.getX(); endx = Gdx.input.getX();
@@ -156,11 +156,6 @@ public class DesktopInput extends InputHandler{
} }
boolean select(){
return !Inputs.keyDown("select") && !Inputs.keyRelease("select") &&
!Inputs.keyDown("break") && !Inputs.keyRelease("break");
}
public int tilex(){ public int tilex(){
return (recipe != null && recipe.result.isMultiblock() && return (recipe != null && recipe.result.isMultiblock() &&
recipe.result.width % 2 == 0) ? recipe.result.width % 2 == 0) ?