From 70507258ae5af23512c6e7eae6dfb5b488ca25f4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 25 Nov 2018 22:55:13 -0500 Subject: [PATCH] Cleanup --- build.gradle | 2 +- core/src/io/anuke/mindustry/graphics/CacheLayer.java | 2 +- core/src/io/anuke/mindustry/graphics/Shaders.java | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ac74bf324b..6367e64024 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.9' roboVMVersion = '2.3.0' - uCoreVersion = '7610a9e20ebb0db62256b70f97e1783f5416e71d' + uCoreVersion = 'f73e538757ac66ff62d7f25d93011142b6abb8df' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index e5afc2fcf5..4a13487541 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java @@ -73,7 +73,7 @@ public enum CacheLayer{ public void endShader(Shader shader){ renderer.blocks.endFloor(); - renderer.effectSurface.getBuffer().end(); + //renderer.effectSurface.getBuffer().end(); renderer.pixelSurface.getBuffer().begin(); diff --git a/core/src/io/anuke/mindustry/graphics/Shaders.java b/core/src/io/anuke/mindustry/graphics/Shaders.java index 2bec569e2c..254234f419 100644 --- a/core/src/io/anuke/mindustry/graphics/Shaders.java +++ b/core/src/io/anuke/mindustry/graphics/Shaders.java @@ -157,17 +157,14 @@ public class Shaders{ @Override public void apply(){ - // shader.setUniformf("u_progress", progress); shader.setUniformf("u_color", color); shader.setUniformf("u_uv", region.getU(), region.getV()); shader.setUniformf("u_uv2", region.getU2(), region.getV2()); - //shader.setUniformf("u_time", Timers.time()); shader.setUniformf("u_texsize", region.getTexture().getWidth(), region.getTexture().getHeight()); } } public static class Shield extends Shader{ - //public Color color = new Color(); public Shield(){ super("shield", "default");