From 0650d5ae415a11f2594a4c990b22a060e1d4c51a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 19 Sep 2026 12:18:09 -0400 Subject: [PATCH] Animated surface setting cleanup --- core/src/mindustry/content/Fx.java | 2 +- core/src/mindustry/core/Renderer.java | 9 ++++----- core/src/mindustry/editor/EditorRenderer.java | 6 +++--- .../mindustry/entities/abilities/ForceFieldAbility.java | 2 +- .../mindustry/entities/abilities/ShieldArcAbility.java | 2 +- core/src/mindustry/graphics/CacheLayer.java | 4 ++-- core/src/mindustry/graphics/Drawf.java | 2 +- core/src/mindustry/world/blocks/defense/BaseShield.java | 2 +- .../mindustry/world/blocks/defense/ForceProjector.java | 2 +- core/src/mindustry/world/blocks/defense/ShieldWall.java | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 8908703f21..f354c7fb5f 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -1378,7 +1378,7 @@ public class Fx{ forceShrink = new Effect(20, e -> { color(e.color, e.fout()); - if(renderer.animateShields){ + if(renderer.animateSurfaces){ Fill.poly(e.x, e.y, 6, e.rotation * e.fout()); }else{ stroke(1.5f); diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index d7549ac411..64d51fb0d6 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -38,7 +38,7 @@ public class Renderer implements ApplicationListener{ public @Nullable Bloom bloom; public @Nullable FrameBuffer backgroundBuffer; public FrameBuffer effectBuffer = new FrameBuffer(); - public boolean animateShields, animateWater, drawWeather = true, drawStatus, enableEffects, drawDisplays = true, drawLight = true, pixelate = false, showPings = true, showOtherBuildPlans = true; + public boolean animateSurfaces, drawWeather = true, drawStatus, enableEffects, drawDisplays = true, drawLight = true, pixelate = false, showPings = true, showOtherBuildPlans = true; public float weatherAlpha; /** minZoom = zooming out, maxZoom = zooming in, used by cutscenes */ public float minZoom = 1.5f, maxZoom = 6f; @@ -164,8 +164,7 @@ public class Renderer implements ApplicationListener{ unitLaserOpacity = settings.getInt("unitlaseropacity") / 100f; laserOpacity = settings.getInt("lasersopacity") / 100f; bridgeOpacity = settings.getInt("bridgeopacity") / 100f; - animateWater = settings.getBool("animatedwater"); //TODO: rename to animatedSurfaces or something - animateShields = animateWater; //vestigial: TODO, remove + animateSurfaces = settings.getBool("animatedwater"); drawStatus = settings.getBool("blockstatus"); enableEffects = settings.getBool("effects"); drawDisplays = !settings.getBool("hidedisplays"); @@ -313,7 +312,7 @@ public class Renderer implements ApplicationListener{ graphics.clear(clearColor); Draw.reset(); - if(animateWater || animateShields){ + if(animateSurfaces || animateSurfaces){ effectBuffer.resize(graphics.getWidth(), graphics.getHeight()); } @@ -399,7 +398,7 @@ public class Renderer implements ApplicationListener{ Draw.draw(Layer.plans, overlays::drawBottom); - if(animateShields && Shaders.shield != null){ + if(animateSurfaces && Shaders.shield != null){ //TODO would be nice if there were a way to detect if any shields or build beams actually *exist* before beginning/ending buffers, otherwise you're just blitting and swapping shaders for nothing Draw.drawRange(Layer.shields, 1f, () -> effectBuffer.begin(Color.clear), () -> { effectBuffer.end(); diff --git a/core/src/mindustry/editor/EditorRenderer.java b/core/src/mindustry/editor/EditorRenderer.java index 426c6284c6..0658953d5d 100644 --- a/core/src/mindustry/editor/EditorRenderer.java +++ b/core/src/mindustry/editor/EditorRenderer.java @@ -91,8 +91,8 @@ public class EditorRenderer implements Disposable{ //don't process terrain updates every frame (helps with lag on low end devices) boolean doUpdate = Core.graphics.getFrameId() % 2 == 0; - boolean prev = renderer.animateWater; - renderer.animateWater = false; + boolean prev = renderer.animateSurfaces; + renderer.animateSurfaces = false; Tmp.m4.set(Draw.trans()); Draw.trans().idt(); @@ -128,7 +128,7 @@ public class EditorRenderer implements Disposable{ if(editor.showTerrain){ renderer.blocks.floor.drawLayer(CacheLayer.walls, doUpdate); } - renderer.animateWater = prev; + renderer.animateSurfaces = prev; if(chunks == null) return; diff --git a/core/src/mindustry/entities/abilities/ForceFieldAbility.java b/core/src/mindustry/entities/abilities/ForceFieldAbility.java index fab3c021c8..6addf39954 100644 --- a/core/src/mindustry/entities/abilities/ForceFieldAbility.java +++ b/core/src/mindustry/entities/abilities/ForceFieldAbility.java @@ -132,7 +132,7 @@ public class ForceFieldAbility extends Ability{ if(unit.shield > 0){ Draw.color(unit.type.shieldColor(unit), Color.white, Mathf.clamp(alpha)); - if(Vars.renderer.animateShields){ + if(Vars.renderer.animateSurfaces){ Draw.z(Layer.shields + 0.001f * alpha); Fill.poly(unit.x, unit.y, sides, realRad, rotation); }else{ diff --git a/core/src/mindustry/entities/abilities/ShieldArcAbility.java b/core/src/mindustry/entities/abilities/ShieldArcAbility.java index 7da8364473..225b57d165 100644 --- a/core/src/mindustry/entities/abilities/ShieldArcAbility.java +++ b/core/src/mindustry/entities/abilities/ShieldArcAbility.java @@ -220,7 +220,7 @@ public class ShieldArcAbility extends Ability{ Draw.color(color == null ? unit.type.shieldColor(unit) : color, Color.white, Mathf.clamp(alpha)); var pos = paramPos.set(x, y).rotate(unit.rotation - 90f).add(unit); - if(!Vars.renderer.animateShields){ + if(!Vars.renderer.animateSurfaces){ Draw.alpha(0.4f); } diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index 9c9b50f6ee..72644011e7 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -95,7 +95,7 @@ public class CacheLayer{ @Override public void begin(){ - if(!renderer.animateWater) return; + if(!renderer.animateSurfaces) return; renderer.effectBuffer.begin(Color.clear); renderer.blocks.floor.beginDraw(); @@ -103,7 +103,7 @@ public class CacheLayer{ @Override public void end(){ - if(!renderer.animateWater) return; + if(!renderer.animateSurfaces) return; renderer.effectBuffer.end(); renderer.effectBuffer.blit(shader); diff --git a/core/src/mindustry/graphics/Drawf.java b/core/src/mindustry/graphics/Drawf.java index 377b15c9e2..2af3b5ba74 100644 --- a/core/src/mindustry/graphics/Drawf.java +++ b/core/src/mindustry/graphics/Drawf.java @@ -144,7 +144,7 @@ public class Drawf{ x2 = close.x, y2 = close.y, x3 = vecs[1].x, y3 = vecs[1].y; - if(renderer.animateShields){ + if(renderer.animateSurfaces){ if(close != vecs[0] && close != vecs[1]){ Fill.tri(x, y, x1, y1, x2, y2); Fill.tri(x, y, x3, y3, x2, y2); diff --git a/core/src/mindustry/world/blocks/defense/BaseShield.java b/core/src/mindustry/world/blocks/defense/BaseShield.java index dd45463fcc..e3d9ae4a8e 100644 --- a/core/src/mindustry/world/blocks/defense/BaseShield.java +++ b/core/src/mindustry/world/blocks/defense/BaseShield.java @@ -130,7 +130,7 @@ public class BaseShield extends Block{ Draw.color(shieldColor == null ? team.color : shieldColor, Color.white, Mathf.clamp(hit)); - if(renderer.animateShields){ + if(renderer.animateSurfaces){ Fill.poly(x, y, sides, radius); }else{ Lines.stroke(1.5f); diff --git a/core/src/mindustry/world/blocks/defense/ForceProjector.java b/core/src/mindustry/world/blocks/defense/ForceProjector.java index b9d61cf8be..91567ee40b 100644 --- a/core/src/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/mindustry/world/blocks/defense/ForceProjector.java @@ -312,7 +312,7 @@ public class ForceProjector extends Block{ if(radius > 0.001f){ Draw.color(team.color, Color.white, Mathf.clamp(hit)); - if(renderer.animateShields){ + if(renderer.animateSurfaces){ Draw.z(Layer.shields + 0.001f * hit); Fill.poly(x, y, sides, radius, shieldRotation); }else{ diff --git a/core/src/mindustry/world/blocks/defense/ShieldWall.java b/core/src/mindustry/world/blocks/defense/ShieldWall.java index 019fe65134..807dc9a789 100644 --- a/core/src/mindustry/world/blocks/defense/ShieldWall.java +++ b/core/src/mindustry/world/blocks/defense/ShieldWall.java @@ -54,7 +54,7 @@ public class ShieldWall extends Wall{ Draw.color(team.color, Color.white, Mathf.clamp(hit)); - if(renderer.animateShields){ + if(renderer.animateSurfaces){ Fill.square(x, y, radius); }else{ Lines.stroke(1.5f);