mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor UI changes for pause button

Browse Source
This commit is contained in:
Anuken 2018-01-04 15:18:38 -05:00
parent 226ad16242
commit 4d44fc3855
5 changed files with 202 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/ui/icons/icon-chat.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 194 B

365
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 80 KiB

5
core/src/io/anuke/mindustry/net/Syncable.java
View File

@ -10,7 +10,7 @@ import io.anuke.ucore.entities.Entity;
import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Mathf;
//TODO clean up this giant mess //TODO clean up this mess
public interface Syncable { public interface Syncable {
public Interpolator<?> getInterpolator(); public Interpolator<?> getInterpolator();
@ -20,6 +20,7 @@ public interface Syncable {
public abstract void read(T entity, float[] data); public abstract void read(T entity, float[] data);
public abstract void update(T entity, Interpolator interpolator); public abstract void update(T entity, Interpolator interpolator);
//TODO write dashing state so particles appear
public static final SyncType<Player> player = new SyncType<Player>() { public static final SyncType<Player> player = new SyncType<Player>() {
@Override @Override
public float[] write(Player entity) { public float[] write(Player entity) {
@ -78,7 +79,7 @@ public interface Syncable {
}; };
} }
public static class Interpolator<T extends Entity> { class Interpolator<T extends Entity> {
public SyncType<T> type; public SyncType<T> type;
public Vector2 target = new Vector2(); public Vector2 target = new Vector2();
public Vector2 last = new Vector2(); public Vector2 last = new Vector2();

16
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@ -65,9 +65,19 @@ public class HudFragment implements Fragment{
}).get(); }).get();
pause = new imagebutton("icon-pause", isize, ()->{ pause = new imagebutton("icon-pause", isize, ()->{
GameState.set(GameState.is(State.paused) ? State.playing : State.paused); if(Net.active() && Vars.android){
}).update(i -> i.getStyle().imageUp = Core.skin.getDrawable(GameState.is(State.paused) ? "icon-play" : "icon-pause")).cell //TODO open android chat
.disabled(b -> Net.active()).get(); }else {
GameState.set(GameState.is(State.paused) ? State.playing : State.paused);
}
}).update(i ->{
if(Net.active() && Vars.android){
i.getStyle().imageUp = Core.skin.getDrawable("icon-chat");
}else {
i.setDisabled(Net.active());
i.getStyle().imageUp = Core.skin.getDrawable(GameState.is(State.paused) ? "icon-play" : "icon-pause");
}
}).get();
}}.end(); }}.end();