From 1dc4fd0800c3f2b4db6d66ed6dbeb0a2e772d3b6 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 8 Mar 2020 22:45:32 -0400
Subject: [PATCH] FX cleanup and installation

---
 core/src/mindustry/core/Renderer.java | 25 +++++++++++++++++++++++++
 gradle.properties                     |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index ae4baea52a..30b03ade64 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -2,6 +2,7 @@ package mindustry.core;
 
 import arc.*;
 import arc.files.*;
+import arc.fx.*;
 import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.graphics.gl.*;
@@ -26,6 +27,7 @@ public class Renderer implements ApplicationListener{
 
     public FrameBuffer effectBuffer = new FrameBuffer(2, 2);
     private Bloom bloom;
+    private FxProcessor fx = new FxProcessor();
     private Color clearColor = new Color(0f, 0f, 0f, 1f);
     private float targetscale = Scl.scl(4);
     private float camerascale = targetscale;
@@ -99,6 +101,8 @@ public class Renderer implements ApplicationListener{
         if(settings.getBool("bloom")){
             setupBloom();
         }
+
+        fx.resize(width, height);
     }
 
     @Override
@@ -137,6 +141,23 @@ public class Renderer implements ApplicationListener{
         }
     }
 
+    void beginFx(){
+        if(!fx.hasEnabledEffects()) return;
+
+        Draw.flush();
+        fx.clear();
+        fx.begin();
+    }
+
+    void endFx(){
+        if(!fx.hasEnabledEffects()) return;
+
+        Draw.flush();
+        fx.end();
+        fx.applyEffects();
+        fx.render(0, 0, fx.getWidth(), fx.getHeight());
+    }
+
     void updateShake(float scale){
         if(shaketime > 0){
             float intensity = shakeIntensity * (settings.getInt("screenshake", 4) / 4f) * scale;
@@ -164,6 +185,8 @@ public class Renderer implements ApplicationListener{
 
         Draw.proj(camera.projection());
 
+        beginFx();
+
         drawBackground();
 
         blocks.floor.checkChanges();
@@ -226,6 +249,8 @@ public class Renderer implements ApplicationListener{
 
         overlays.drawTop();
 
+        endFx();
+
         if(!pixelator.enabled()){
             Groups.drawNames();
         }
diff --git a/gradle.properties b/gradle.properties
index 79495ee591..40becb1f40 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=c1eab295b1a55397957fd54bec2f37daee0e8b4b
+archash=a67ae66be8a09f292d0beccbebda424fca6801d3