From 67d87f023b74055777e27dae68e9f9f950b9cbf8 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 22 Apr 2020 14:22:33 -0400 Subject: [PATCH] Cleanup --- core/src/mindustry/graphics/CacheLayer.java | 11 +++++------ core/src/mindustry/graphics/LightRenderer.java | 2 +- core/src/mindustry/graphics/Pixelator.java | 2 +- gradle.properties | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/graphics/CacheLayer.java b/core/src/mindustry/graphics/CacheLayer.java index 05be5fc355..6363efae98 100644 --- a/core/src/mindustry/graphics/CacheLayer.java +++ b/core/src/mindustry/graphics/CacheLayer.java @@ -1,11 +1,10 @@ package mindustry.graphics; -import arc.Core; -import arc.graphics.Color; -import arc.graphics.g2d.Draw; -import arc.graphics.gl.Shader; +import arc.*; +import arc.graphics.*; +import arc.graphics.g2d.*; +import arc.graphics.gl.*; -import static arc.Core.camera; import static mindustry.Vars.renderer; public enum CacheLayer{ @@ -81,7 +80,7 @@ public enum CacheLayer{ renderer.effectBuffer.end(); Draw.shader(shader); - Draw.rect(Draw.wrap(renderer.effectBuffer.getTexture()), camera.position.x, camera.position.y, camera.width, -camera.height); + Draw.rect(renderer.effectBuffer); Draw.shader(); renderer.blocks.floor.beginc(); diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java index bb2c411ea8..a95c9489a2 100644 --- a/core/src/mindustry/graphics/LightRenderer.java +++ b/core/src/mindustry/graphics/LightRenderer.java @@ -203,7 +203,7 @@ public class LightRenderer{ Draw.color(); Shaders.light.ambient.set(state.rules.ambientLight); Draw.shader(Shaders.light); - Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height); + Draw.rect(buffer); Draw.shader(); lights.clear(); diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index 438839f44f..acaa6bebca 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -43,7 +43,7 @@ public class Pixelator implements Disposable{ buffer.end(); Draw.blend(Blending.disabled); - Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height); + Draw.rect(buffer); Draw.blend(); Groups.drawNames(); diff --git a/gradle.properties b/gradle.properties index a7774805df..ffc60341fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=5d18d56ba056bbbdf51025c22a651fbc2f7cd45f +archash=5796def2ff3d03c280655ebf60b98aaf66de5422