mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merged in sprite sorting

Browse Source
This commit is contained in:
Anuken 2020-04-23 14:00:55 -04:00
parent cec5c24d69
commit 2aa05f989b
2 changed files with 3 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
core/src/mindustry/core/Renderer.java
View File

@ -181,7 +181,7 @@ public class Renderer implements ApplicationListener{
graphics.clear(clearColor);
//TODO 'animated water' is a bad name for this etting
//TODO 'animated water' is a bad name for this setting
if(Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")){
effectBuffer.resize(graphics.getWidth(), graphics.getHeight());
}
@ -193,7 +193,7 @@ public class Renderer implements ApplicationListener{
Draw.sort(true);
//beginFx();
//TODO fx
Draw.draw(Layer.background, this::drawBackground);
Draw.draw(Layer.floor, blocks.floor::drawFloor);
@ -231,69 +231,6 @@ public class Renderer implements ApplicationListener{
Draw.flush();
Draw.sort(false);
/*
blocks.drawBlocks(Layer.block);
if(state.rules.drawFog){
blocks.drawFog();
}
blocks.drawDestroyed();
Draw.shader(Shaders.blockbuild, true);
blocks.drawBlocks(Layer.placement);
Draw.shader();
blocks.drawBlocks(Layer.overlay);
Groups.drawGroundShadows();
Groups.drawGroundUnder();
Groups.drawGround();
blocks.drawBlocks(Layer.turret);
blocks.drawBlocks(Layer.power);
blocks.drawBlocks(Layer.lights);
overlays.drawBottom();
Groups.drawFlyingShadows();
Groups.drawFlying();
Draw.flush();
if(bloom != null){
bloom.capture();
}
Groups.drawBullets();
Groups.drawEffects();
Draw.flush();
if(bloom != null){
bloom.render();
}
Groups.drawOverlays();
overlays.drawTop();
Groups.drawWeather();
endFx();
if(!pixelator.enabled()){
Groups.drawNames();
}
if(state.rules.lighting){
lights.draw();
}
drawLanding();
Draw.color();
Draw.flush();*/
}
private void drawBackground(){

2
gradle.properties
View File

@ -1,3 +1,3 @@
org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=704ec7111c02545ef1ea7b73b72d815a7bc85147
archash=29e322768aa47aa4b4c796ae998766b769da224b