From d68ef73407ae5055e076339f162e3b769b4222c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 31 Oct 2020 11:01:39 -0400 Subject: [PATCH] Fixed bloom resizing improperly --- core/src/mindustry/core/Renderer.java | 7 ++----- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index c30b526aa7..30a6c5db70 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -54,7 +54,7 @@ public class Renderer implements ApplicationListener{ public void init(){ planets = new PlanetRenderer(); - if(settings.getBool("bloom")){ + if(settings.getBool("bloom", !ios)){ setupBloom(); } } @@ -121,10 +121,6 @@ public class Renderer implements ApplicationListener{ @Override public void resize(int width, int height){ - if(settings.getBool("bloom")){ - setupBloom(); - } - fx.resize(width, height); } @@ -240,6 +236,7 @@ public class Renderer implements ApplicationListener{ } if(bloom != null){ + bloom.resize(graphics.getWidth() / 4, graphics.getHeight() / 4); Draw.draw(Layer.bullet - 0.01f, bloom::capture); Draw.draw(Layer.effect + 0.01f, bloom::render); } diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index 6b6771819d..2e66d333bd 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -381,14 +381,13 @@ public class SettingsMenuDialog extends SettingsDialog{ if(Shaders.shield != null){ graphics.checkPref("animatedshields", !mobile); } + if(!ios){ graphics.checkPref("bloom", true, val -> renderer.toggleBloom(val)); }else{ Core.settings.put("bloom", false); } - - graphics.checkPref("pixelate", false, val -> { if(val){ Events.fire(Trigger.enablePixelation);