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

Re-added old ingame editor UI, hid new UI behind a toggle

Browse Source
This commit is contained in:
Anuken
2025-01-28 21:59:40 -05:00
parent b5a6d7197c
commit 4cf9d54c3d
2 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -265,14 +265,7 @@ public class PlacementFragment{
public void build(Group parent){
parent.fill(full -> {
toggler = full;
full.bottom().right().visible(() -> {
if(state.rules.editor){
//force update the mouse picking, since it otherwise would not happen
updatePick(control.input);
}
return ui.hudfrag.shown && !state.rules.editor;
});
full.bottom().right().visible(() -> ui.hudfrag.shown);
full.table(frame -> {
@@ -750,12 +743,10 @@ public class PlacementFragment{
/** @return the thing being hovered over. */
public @Nullable Displayable hovered(){
if(!state.rules.editor){
Vec2 v = topTable.stageToLocalCoordinates(Core.input.mouse());
Vec2 v = topTable.stageToLocalCoordinates(Core.input.mouse());
//if the mouse intersects the table or the UI has the mouse, no hovering can occur
if(Core.scene.hasMouse() || topTable.hit(v.x, v.y, false) != null) return null;
}
//if the mouse intersects the table or the UI has the mouse, no hovering can occur
if(Core.scene.hasMouse() || topTable.hit(v.x, v.y, false) != null) return null;
//check for a unit
Unit unit = Units.closestOverlap(player.team(), Core.input.mouseWorldX(), Core.input.mouseWorldY(), 5f, u -> !u.isLocal() && u.displayable());