More map editor improvements, turret outline rendering

This commit is contained in:
Anuken
2018-03-21 16:45:05 -04:00
parent 23e6f89eef
commit 85988a2ff9
10 changed files with 476 additions and 438 deletions

View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Layer;
import io.anuke.mindustry.world.Tile;
@@ -120,8 +121,7 @@ public class BlockRenderer{
return requestidx;
}
public void drawBlocks(boolean top){
Layer stopAt = top ? Layer.laser : Layer.overlay;
public void drawBlocks(Layer stopAt){
for(; iterateidx < requestidx; iterateidx ++){
@@ -141,6 +141,36 @@ public class BlockRenderer{
}
}
}
public void drawTeamBlocks(Layer layer, Team team){
int iterateidx = this.iterateidx;
for(; iterateidx < requestidx; iterateidx ++){
if(iterateidx < requests.size - 1 && requests.get(iterateidx).layer.ordinal() > layer.ordinal()){
break;
}
BlockRequest req = requests.get(iterateidx);
if(req.tile.getTeam() != team) continue;
Block block = req.tile.block();
if(req.layer == block.layer){
block.drawLayer(req.tile);
}else if(req.layer == block.layer2){
block.drawLayer2(req.tile);
}
}
}
public void skipLayer(Layer stopAt){
for(; iterateidx < requestidx; iterateidx ++){
if(iterateidx < requests.size - 1 && requests.get(iterateidx).layer.ordinal() > stopAt.ordinal()){
break;
}
}
}
private void addRequest(Tile tile, Layer layer){
if(requestidx >= requests.size){