From f014339dbc76a637bfc7e1427a0ad41c2d7847f4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 25 Dec 2020 21:51:25 -0500
Subject: [PATCH] Don't render weather in full map screenshots

---
 core/assets/shaders/buildbeam.frag    | 9 +--------
 core/src/mindustry/core/Renderer.java | 4 +++-
 core/src/mindustry/type/Weather.java  | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/core/assets/shaders/buildbeam.frag b/core/assets/shaders/buildbeam.frag
index a9a0659894..10801e5b18 100644
--- a/core/assets/shaders/buildbeam.frag
+++ b/core/assets/shaders/buildbeam.frag
@@ -6,20 +6,13 @@ uniform vec2 u_invsize;
 uniform float u_time;
 uniform float u_dp;
 uniform vec2 u_offset;
-
 varying vec2 v_texCoords;
 
-float triwave(float y){
-    return abs(2.*fract(y)-1.);
-}
-
 void main(){
     vec2 T = v_texCoords.xy;
     vec2 coords = (T * u_texsize) + u_offset;
-
-	vec4 color = texture2D(u_texture, T);
+    vec4 color = texture2D(u_texture, T);
 
     color.a *= (0.37 + abs(sin(u_time / 15.0)) * .05 + 0.2 * (step(mod(coords.x / u_dp + coords.y / u_dp + u_time / 4.0, 10.0), 3.0)));
-
     gl_FragColor = color;
 }
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 255e21695a..712f894155 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -30,7 +30,7 @@ public class Renderer implements ApplicationListener{
     public @Nullable Bloom bloom;
     public FrameBuffer effectBuffer = new FrameBuffer();
     public float laserOpacity = 1f;
-    public boolean animateShields;
+    public boolean animateShields, drawWeather = true;
     /** minZoom = zooming out, maxZoom = zooming in */
     public float minZoom = 1.5f, maxZoom = 6f;
 
@@ -351,6 +351,7 @@ public class Renderer implements ApplicationListener{
 
         FrameBuffer buffer = new FrameBuffer(w, h);
 
+        drawWeather = false;
         float vpW = camera.width, vpH = camera.height, px = camera.position.x, py = camera.position.y;
         disableUI = true;
         camera.width = w;
@@ -376,6 +377,7 @@ public class Renderer implements ApplicationListener{
         PixmapIO.writePNG(file, fullPixmap);
         fullPixmap.dispose();
         ui.showInfoFade(Core.bundle.format("screenshot", file.toString()));
+        drawWeather = true;
 
         buffer.dispose();
     }
diff --git a/core/src/mindustry/type/Weather.java b/core/src/mindustry/type/Weather.java
index c6ae657bc9..113b1a18af 100644
--- a/core/src/mindustry/type/Weather.java
+++ b/core/src/mindustry/type/Weather.java
@@ -321,7 +321,7 @@ public class Weather extends UnlockableContent{
 
         @Override
         public void draw(){
-            if(renderer.weatherAlpha() > 0.0001f && Core.settings.getBool("showweather")){
+            if(renderer.weatherAlpha() > 0.0001f && renderer.drawWeather && Core.settings.getBool("showweather")){
                 Draw.draw(Layer.weather, () -> {
                     weather.rand.setSeed(0);
                     Draw.alpha(renderer.weatherAlpha() * opacity * weather.opacityMultiplier);