Fixed most world rendering

This commit is contained in:
Anuken
2018-12-28 13:01:35 -05:00
parent 1e8b844eac
commit bc9110b344
8 changed files with 26 additions and 87 deletions
@@ -22,7 +22,7 @@ public class BlockRenderer{
private final static int initialRequests = 32 * 32;
private final static int expandr = 6;
private FloorRenderer floorRenderer;
public final FloorRenderer floor;
private Array<BlockRequest> requests = new Array<>(true, initialRequests, BlockRequest.class);
private IntSet teamChecks = new IntSet();
@@ -33,7 +33,7 @@ public class BlockRenderer{
private FrameBuffer shadows = new FrameBuffer(1, 1);
public BlockRenderer(){
floorRenderer = new FloorRenderer();
floor = new FloorRenderer();
for(int i = 0; i < requests.size; i++){
requests.set(i, new BlockRequest());
@@ -163,12 +163,6 @@ public class BlockRenderer{
}
BlockRequest req = requests.get(iterateidx);
if(req.layer != lastLayer){
if(lastLayer != null) layerEnds(lastLayer);
layerBegins(req.layer);
}
Block block = req.tile.block();
if(req.layer == Layer.block){
@@ -217,24 +211,6 @@ public class BlockRenderer{
}
}
public void beginFloor(){
floorRenderer.beginDraw();
}
public void endFloor(){
floorRenderer.endDraw();
}
public void drawFloor(){
floorRenderer.drawFloor();
}
private void layerBegins(Layer layer){
}
private void layerEnds(Layer layer){
}
private void addRequest(Tile tile, Layer layer){
if(requestidx >= requests.size){
requests.add(new BlockRequest());
@@ -16,7 +16,6 @@ import io.anuke.arc.util.Log;
import io.anuke.arc.util.Structs;
import io.anuke.arc.util.Time;
import io.anuke.mindustry.game.EventType.WorldLoadEvent;
import io.anuke.mindustry.maps.Sector;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor;
@@ -148,8 +147,6 @@ public class FloorRenderer{
ObjectSet<CacheLayer> used = new ObjectSet<>();
Sector sector = world.getSector();
for(int tilex = cx * chunksize; tilex < (cx + 1) * chunksize; tilex++){
for(int tiley = cy * chunksize; tiley < (cy + 1) * chunksize; tiley++){
Tile tile = world.tile(tilex, tiley);