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

Misc cleanup & fixes

Browse Source
This commit is contained in:
Anuken
2021-01-19 15:13:41 -05:00
parent 40908589b9
commit e3f388692f
11 changed files with 78 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/graphics/BlockRenderer.java
View File

@@ -39,7 +39,6 @@ public class BlockRenderer implements Disposable{
private Seq<Building> outArray2 = new Seq<>();
private Seq<Tile> shadowEvents = new Seq<>();
private IntSet procEntities = new IntSet(), procLinks = new IntSet(), procLights = new IntSet();
private boolean displayStatus = false;
public BlockRenderer(){
@@ -177,7 +176,6 @@ public class BlockRenderer implements Disposable{
/** Process all blocks to draw. */
public void processBlocks(){
displayStatus = Core.settings.getBool("blockstatus");
int avgx = (int)(camera.position.x / tilesize);
int avgy = (int)(camera.position.y / tilesize);
@@ -275,7 +273,7 @@ public class BlockRenderer implements Disposable{
Draw.z(Layer.block);
}
if(displayStatus && block.consumes.any()){
if(renderer.drawStatus && block.consumes.any()){
entity.drawStatus();
}
}

16
core/src/mindustry/graphics/Drawf.java
View File

@@ -17,6 +17,22 @@ import static mindustry.Vars.*;
public class Drawf{
public static void target(float x, float y, float rad, Color color){
target(x, y, rad, 1, color);
}
public static void target(float x, float y, float rad, float alpha, Color color){
Lines.stroke(3f);
Draw.color(Pal.gray, alpha);
Lines.poly(x, y, 4, rad, Time.time * 1.5f);
Lines.spikes(x, y, 3f/7f * rad, 6f/7f * rad, 4, Time.time * 1.5f);
Lines.stroke(1f);
Draw.color(color, alpha);
Lines.poly(x, y, 4, rad, Time.time * 1.5f);
Lines.spikes(x, y, 3f/7f * rad, 6f/7f * rad, 4, Time.time * 1.5f);
Draw.reset();
}
public static float text(){
float z = Draw.z();
if(renderer.pixelator.enabled()){