diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index 73ae26a0bf..aded2c2199 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -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(){ diff --git a/gradle.properties b/gradle.properties index 93c8f8de2a..5c6fdbdabf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=704ec7111c02545ef1ea7b73b72d815a7bc85147 +archash=29e322768aa47aa4b4c796ae998766b769da224b