Final(?) logo sprites, removed drawing of overlay

This commit is contained in:
Anuken
2017-09-20 18:27:23 -04:00
parent 8b22ef2691
commit d3b613feb2
10 changed files with 79 additions and 86 deletions

View File

@@ -392,11 +392,6 @@ public class Control extends ControlModule{
drawDefault();
batch.setProjectionMatrix(control.camera.combined);
batch.begin();
Renderer.renderOverlay();
batch.end();
camera.position.set(lastx - deltax, lasty - deltay, 0);
if(Vars.debug){

View File

@@ -201,16 +201,6 @@ public class Renderer{
}
}
public static void renderOverlay(){
Tile tile = World.cursorTile();
if(tile != null && tile.block() != Blocks.air){
tile.block().drawOverlay(tile);
}
}
public static void drawHealth(float x, float y, float health, float maxhealth){
drawBar(Color.RED, x, y, health/maxhealth);
}

View File

@@ -1,16 +1,12 @@
package io.anuke.mindustry.world.blocks.types;
import static io.anuke.mindustry.Vars.tilesize;
import com.badlogic.gdx.graphics.Color;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.resource.Item;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile;
import io.anuke.ucore.core.Draw;
import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Mathf;
public class Drill extends Block{
protected Block resource;
@@ -42,15 +38,13 @@ public class Drill extends Block{
}
@Override
public void drawOverlay(Tile tile){
public void drawOver(Tile tile){
if(tile.floor() != resource && resource != null){
Draw.tcolor(Color.SCARLET);
Draw.tscl(1 / 8f);
Draw.text("Not on " + resource.name + " block!", tile.worldx(), tile.worldy() + tilesize);
Draw.colorl(0.85f + Mathf.absin(Timers.time(), 6f, 0.15f));
Draw.rect("cross", tile.worldx(), tile.worldy());
Draw.color();
}
Draw.tscl(Vars.fontscale);
}
}