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

Fix input visuals

Browse Source
This commit is contained in:
MEEP of Faith
2023-04-23 10:53:36 -07:00
parent 8f6bfa1e0f
commit 3adc3a8b2e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -199,9 +199,10 @@ public class DesktopInput extends InputHandler{
drawArrow(block, cursorX, cursorY, rotation); drawArrow(block, cursorX, cursorY, rotation);
} }
Draw.color(); Draw.color();
boolean valid = validPlace(cursorX, cursorY, block, rotation); int rot = !block.rotate && block.lockRotation ? 0 : rotation;
drawPlan(cursorX, cursorY, block, rotation); boolean valid = validPlace(cursorX, cursorY, block, rot);
block.drawPlace(cursorX, cursorY, rotation, valid); drawPlan(cursorX, cursorY, block, rot);
block.drawPlace(cursorX, cursorY, rot, valid);
if(block.saveConfig){ if(block.saveConfig){
Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f)); Draw.mixcol(!valid ? Pal.breakInvalid : Color.white, (!valid ? 0.4f : 0.24f) + Mathf.absin(Time.globalTime, 6f, 0.28f));

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

@@ -404,9 +404,10 @@ public class MobileInput extends InputHandler implements GestureListener{
//draw last placed plan //draw last placed plan
if(!plan.breaking && plan == lastPlaced && plan.block != null){ if(!plan.breaking && plan == lastPlaced && plan.block != null){
boolean valid = validPlace(tile.x, tile.y, plan.block, rotation); int rot = !block.rotate && block.lockRotation ? 0 : rotation;
boolean valid = validPlace(tile.x, tile.y, plan.block, rot);
Draw.mixcol(); Draw.mixcol();
plan.block.drawPlace(tile.x, tile.y, rotation, valid); plan.block.drawPlace(tile.x, tile.y, rot, valid);
drawOverlapCheck(plan.block, tile.x, tile.y, valid); drawOverlapCheck(plan.block, tile.x, tile.y, valid);
} }