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

More description changes, changed profiler, core refactoring

Browse Source
This commit is contained in:
Anuken
2017-11-21 22:07:36 -05:00
parent a71a82c10b
commit f0e5477346
41 changed files with 147 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/LoadDialog.java
View File

@@ -4,9 +4,9 @@ import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.utils.Timer.Task;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.ucore.scene.ui.Label;
import io.anuke.ucore.scene.ui.TextButton;

4
core/src/io/anuke/mindustry/ui/MenuDialog.java
View File

@@ -5,9 +5,9 @@ import static io.anuke.mindustry.Vars.ui;
import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Gdx;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.ucore.scene.ui.ConfirmDialog;
import io.anuke.ucore.scene.ui.layout.Cell;
import io.anuke.ucore.scene.ui.layout.Unit;

4
core/src/io/anuke/mindustry/ui/UpgradeDialog.java
View File

@@ -4,9 +4,9 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.graphics.Color;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.ucore.core.Draw;

4
core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
View File

@@ -7,8 +7,8 @@ import com.badlogic.gdx.graphics.Colors;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.resource.ItemStack;
import io.anuke.mindustry.resource.Recipe;
import io.anuke.mindustry.resource.Section;

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

@@ -4,22 +4,33 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.Mindustry;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.resource.Item;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.function.StringSupplier;
import io.anuke.ucore.scene.actions.Actions;
import io.anuke.ucore.scene.builders.imagebutton;
import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.Label;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Profiler;
public class HudFragment implements Fragment{
private Table itemtable, respawntable;
private Array<Item> tempItems = new Array<>();
public void build(){
//menu at top left
new table(){{
atop();
aleft();
@@ -122,5 +133,50 @@ public class HudFragment implements Fragment{
}}.end();
}}.end();
//profiling table
if(debug){
new table(){{
abottom();
aleft();
new label((StringSupplier)()->"[purple]entities: " + Entities.amount()).left();
row();
new label("[red]DEBUG MODE").scale(0.5f).left();
}}.end();
new table(){{
atop();
new table("button"){{
defaults().left().growX();
atop();
aleft();
new label((StringSupplier)()->Profiler.formatDisplayTimes());
}}.width(400f).end();
}}.end();
}
}
public void updateItems(){
itemtable.clear();
itemtable.left();
tempItems.clear();
for(Item item : control.getItems().keys()){
tempItems.add(item);
}
tempItems.sort();
for(Item stack : tempItems){
Image image = new Image(Draw.region("icon-" + stack.name()));
Label label = new Label("" + Mindustry.formatter.format(control.getAmount(stack)));
label.setFontScale(fontscale*1.5f);
itemtable.add(image).size(8*3).units(Unit.dp);
itemtable.add(label).left();
itemtable.row();
}
}
public void fadeRespawn(boolean in){
respawntable.addAction(Actions.color(in ? new Color(0, 0, 0, 0.3f) : Color.CLEAR, 0.3f));
}
}

4
core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
View File

@@ -4,8 +4,8 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.Gdx;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.ui.MenuButton;
import io.anuke.mindustry.world.Map;
import io.anuke.ucore.scene.builders.imagebutton;

4
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -4,8 +4,8 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.input.AndroidInput;
import io.anuke.mindustry.input.PlaceMode;
import io.anuke.ucore.scene.builders.imagebutton;

48
core/src/io/anuke/mindustry/ui/fragments/ProfilerFragment.java
View File

@@ -1,48 +0,0 @@
package io.anuke.mindustry.ui.fragments;
import static io.anuke.mindustry.Vars.debug;
import io.anuke.mindustry.Profiler;
import io.anuke.ucore.entities.Entities;
import io.anuke.ucore.function.StringSupplier;
import io.anuke.ucore.scene.builders.label;
import io.anuke.ucore.scene.builders.table;
public class ProfilerFragment implements Fragment{
public void build(){
if(debug){
new table(){{
abottom();
aleft();
new label((StringSupplier)()->"[purple]entities: " + Entities.amount()).left();
row();
new label("[red]DEBUG MODE").scale(0.5f).left();
}}.end();
new table(){{
atop();
new table("button"){{
defaults().left().growX();
atop();
aleft();
new label((StringSupplier)()->"[red]total: "
+ String.format("%.1f", (float)Profiler.total/Profiler.total*100f)+ "% - " + Profiler.total).left();
row();
new label((StringSupplier)()->"[yellow]draw: "
+ String.format("%.1f", (float)Profiler.draw/Profiler.total*100f)+ "% - " + Profiler.draw).left();
row();
new label((StringSupplier)()->"[green]blockDraw: "
+ String.format("%.1f", (float)Profiler.blockDraw/Profiler.total*100f)+ "% - " + Profiler.blockDraw).left();
row();
new label((StringSupplier)()->"[blue]entityDraw: "
+ String.format("%.1f", (float)Profiler.entityDraw/Profiler.total*100f)+ "% - " + Profiler.entityDraw).left();
row();
new label((StringSupplier)()->"[purple]entityUpdate: "
+ String.format("%.1f", (float)Profiler.entityUpdate/Profiler.total*100f)+ "% - " + Profiler.entityUpdate).left();
row();
}}.width(400f).end();
}}.end();
}
}
}

4
core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java
View File

@@ -5,8 +5,8 @@ import static io.anuke.mindustry.Vars.*;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.input.AndroidInput;
import io.anuke.mindustry.input.PlaceMode;
import io.anuke.ucore.core.Core;

4
core/src/io/anuke/mindustry/ui/fragments/WeaponFragment.java
View File

@@ -2,8 +2,8 @@ package io.anuke.mindustry.ui.fragments;
import static io.anuke.mindustry.Vars.*;
import io.anuke.mindustry.GameState;
import io.anuke.mindustry.GameState.State;
import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.resource.Weapon;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Draw;