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

make input fields public

Browse Source
This commit is contained in:
DeltaNedas
2020-08-24 11:30:27 +01:00
parent 521b4fb4d7
commit 3d18b7f4e3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,19 +27,19 @@ import static mindustry.Vars.*;
import static mindustry.input.PlaceMode.*; import static mindustry.input.PlaceMode.*;
public class DesktopInput extends InputHandler{ public class DesktopInput extends InputHandler{
private Vec2 movement = new Vec2(); public Vec2 movement = new Vec2();
/** Current cursor type. */ /** Current cursor type. */
private Cursor cursorType = SystemCursor.arrow; public Cursor cursorType = SystemCursor.arrow;
/** Position where the player started dragging a line. */ /** Position where the player started dragging a line. */
private int selectX, selectY, schemX, schemY; private int selectX, selectY, schemX, schemY;
/** Last known line positions.*/ /** Last known line positions.*/
private int lastLineX, lastLineY, schematicX, schematicY; private int lastLineX, lastLineY, schematicX, schematicY;
/** Whether selecting mode is active. */ /** Whether selecting mode is active. */
private PlaceMode mode; public PlaceMode mode;
/** Animation scale for line. */ /** Animation scale for line. */
private float selectScale; private float selectScale;
/** Selected build request for movement. */ /** Selected build request for movement. */
private @Nullable BuildPlan sreq; public @Nullable BuildPlan sreq;
/** Whether player is currently deleting removal requests. */ /** Whether player is currently deleting removal requests. */
private boolean deleting = false, shouldShoot = false; private boolean deleting = false, shouldShoot = false;

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

@@ -34,8 +34,8 @@ public class MobileInput extends InputHandler implements GestureListener{
private final float edgePan = Scl.scl(60f); private final float edgePan = Scl.scl(60f);
//gesture data //gesture data
private Vec2 vector = new Vec2(), movement = new Vec2(), targetPos = new Vec2(); public Vec2 vector = new Vec2(), movement = new Vec2(), targetPos = new Vec2();
private float lastZoom = -1; public float lastZoom = -1;
/** Position where the player started dragging a line. */ /** Position where the player started dragging a line. */
private int lineStartX, lineStartY, lastLineX, lastLineY; private int lineStartX, lineStartY, lastLineX, lastLineY;
@@ -44,7 +44,7 @@ public class MobileInput extends InputHandler implements GestureListener{
private float lineScale; private float lineScale;
/** Animation data for crosshair. */ /** Animation data for crosshair. */
private float crosshairScale; private float crosshairScale;
private Teamc lastTarget; public Teamc lastTarget;
/** Used for shifting build requests. */ /** Used for shifting build requests. */
private float shiftDeltaX, shiftDeltaY; private float shiftDeltaX, shiftDeltaY;
@@ -55,15 +55,15 @@ public class MobileInput extends InputHandler implements GestureListener{
/** Whether the player is currently in line-place mode. */ /** Whether the player is currently in line-place mode. */
private boolean lineMode, schematicMode; private boolean lineMode, schematicMode;
/** Current place mode. */ /** Current place mode. */
private PlaceMode mode = none; public PlaceMode mode = none;
/** Whether no recipe was available when switching to break mode. */ /** Whether no recipe was available when switching to break mode. */
private Block lastBlock; public Block lastBlock;
/** Last placed request. Used for drawing block overlay. */ /** Last placed request. Used for drawing block overlay. */
private BuildPlan lastPlaced; public BuildPlan lastPlaced;
/** Down tracking for panning.*/ /** Down tracking for panning.*/
private boolean down = false; private boolean down = false;
private Teamc target, moveTarget; public Teamc target, moveTarget;
//region utility methods //region utility methods