Clearer names for shaders

MEEPofFaith · Feb 8, 2024 · fa421dd · fa421dd
1 parent 449da39
commit fa421dd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/assets/shaders/drunk.frag → assets/shaders/colorHallucination.frag b/assets/shaders/drunk.frag → assets/shaders/colorHallucination.frag
diff --git a/assets/shaders/drunkWaves.frag → assets/shaders/distortion.frag b/assets/shaders/drunkWaves.frag → assets/shaders/distortion.frag
diff --git a/src/drunkustry/audio/DrunkSound.java b/src/drunkustry/audio/DrunkSound.java
@@ -8,7 +8,7 @@
 
 public class DrunkSound{
     public static final FlangerFilter filter = new FlangerFilter(){{
-        set(0.2f, 0.4f);
+        set(0.1f, 0.3f);
     }};
 
     public static void init(){

diff --git a/src/drunkustry/graphics/DrunkColors.java b/src/drunkustry/graphics/DrunkColors.java
@@ -15,13 +15,13 @@ public class DrunkColors{
     public static void init(){
         drunkBuffer = new FrameBuffer();
 
-        Events.run(Trigger.drawOver, () -> {
+        Events.run(Trigger.draw, () -> {
             drunkBuffer.resize(graphics.getWidth(), graphics.getHeight());
-            Draw.draw(Layer.endPixeled + 2, () -> {
+            Draw.draw(Layer.endPixeled + 1, () -> {
                 drunkBuffer.begin(Color.clear);
                 Draw.rect();
                 drunkBuffer.end();
-                drunkBuffer.blit(DrunkShaders.drunkShader);
+                drunkBuffer.blit(DrunkShaders.colorHallucination);
             });
         });
     }

diff --git a/src/drunkustry/graphics/DrunkShaders.java b/src/drunkustry/graphics/DrunkShaders.java
@@ -8,17 +8,16 @@
 import arc.util.*;
 import mindustry.graphics.Shaders.*;
 
-import static arc.Core.files;
-import static mindustry.Vars.renderer;
-import static mindustry.Vars.tree;
+import static arc.Core.*;
+import static mindustry.Vars.*;
 
 public class DrunkShaders{
-    public static DrunkShader drunkShader;
-    public static DrunkShader drunkWaves;
+    public static DrunkShader colorHallucination;
+    public static DrunkShader distortion;
 
     public static void init(){
-        drunkShader = new DrunkShader("drunk");
-        drunkWaves = new DrunkShader("drunkWaves");
+        colorHallucination = new DrunkShader("colorHallucination");
+        distortion = new DrunkShader("distortion");
     }
 
     /** Copy of {@link SurfaceShader} that's able to get my shader. */

diff --git a/src/drunkustry/graphics/DrunkWaves.java b/src/drunkustry/graphics/DrunkWaves.java
@@ -15,12 +15,12 @@ public class DrunkWaves{
     public static void init(){
         wavesBuffer = new FrameBuffer();
 
-        Events.run(Trigger.drawOver, () -> {
+        Events.run(Trigger.draw, () -> {
             wavesBuffer.resize(graphics.getWidth(), graphics.getHeight());
             Draw.draw(Layer.background - 0.01f, () -> wavesBuffer.begin(Color.clear));
-            Draw.draw(Layer.endPixeled + 4, () -> {
+            Draw.draw(Layer.endPixeled + 2, () -> {
                 wavesBuffer.end();
-                wavesBuffer.blit(DrunkShaders.drunkWaves);
+                wavesBuffer.blit(DrunkShaders.distortion);
             });
         });
     }