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

Enable double-click to play sector

Browse Source
This commit is contained in:
Joshua Fan
2020-12-05 00:58:56 -08:00
parent 6570d23512
commit 6ececea004
1 changed files with 62 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/dialogs/PlanetDialog.java
+34 -25
View File
@@ -412,6 +412,10 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
public void tap(InputEvent event, float x, float y, int count, KeyCode button){
if(showing()) return;
if(selected == hovered){
playSelected();
}
if(hovered != null && (canSelect(hovered) || debugSelect)){
selected = hovered;
}
@@ -761,7 +765,36 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
sector.isBeingPlayed() ? "@sectors.resume" :
sector.hasBase() ? "@sectors.go" :
locked ? "@locked" : "@sectors.launch",
locked ? Icon.lock :Icon.play, () -> {
locked ? Icon.lock : Icon.play, () -> {
playSelected();
}).growX().height(54f).minWidth(170f).padTop(4).disabled(locked);
}
stable.pack();
stable.setPosition(x, y, Align.center);
stable.update(() -> {
if(selected != null){
if(launching){
stable.color.sub(0, 0, 0, 0.05f * Time.delta);
}else{
//fade out UI when not facing selected sector
Tmp.v31.set(selected.tile.v).rotate(Vec3.Y, -planets.planet.getRotation()).scl(-1f).nor();
float dot = planets.cam.direction.dot(Tmp.v31);
stable.color.a = Math.max(dot, 0f)*2f;
if(dot*2f <= -0.1f){
selected = null;
updateSelected();
}
}
}
});
stable.act(0f);
}
void playSelected(){
Sector sector = selected;
if(sector.isBeingPlayed()){
//already at this sector
@@ -814,30 +847,6 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
}
if(shouldHide) hide();
}).growX().height(54f).minWidth(170f).padTop(4).disabled(locked);
}
stable.pack();
stable.setPosition(x, y, Align.center);
stable.update(() -> {
if(selected != null){
if(launching){
stable.color.sub(0, 0, 0, 0.05f * Time.delta);
}else{
//fade out UI when not facing selected sector
Tmp.v31.set(selected.tile.v).rotate(Vec3.Y, -planets.planet.getRotation()).scl(-1f).nor();
float dot = planets.cam.direction.dot(Tmp.v31);
stable.color.a = Math.max(dot, 0f)*2f;
if(dot*2f <= -0.1f){
selected = null;
updateSelected();
}
}
}
});
stable.act(0f);
}
public enum Mode{