diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png index c598fa0a08..0a76d7e1a7 100644 Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png and b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png differ diff --git a/core/assets/shaders/menu.fragment b/core/assets/shaders/menu.fragment index 77acd0e031..8317549903 100644 --- a/core/assets/shaders/menu.fragment +++ b/core/assets/shaders/menu.fragment @@ -7,6 +7,7 @@ precision mediump int; #define p2 vec3(234.0,182.0,120.0)/255.0 #define p3 vec3(212.0,129.0,107.0)/255.0 #define p4 vec3(142.0,77.0,72.0)/255.0 +#define roundm 0.2 uniform sampler2D u_texture; uniform vec2 u_resolution; @@ -21,12 +22,11 @@ varying vec2 v_texCoord; void main() { ivec2 coords = ivec2((gl_FragCoord.xy - u_resolution/2.0)/u_scl); - int roundx = 8; - int roundy = roundx; - float roundm = 0.2; + //int roundx = 8; + //int roundy = roundx; - coords.x = (coords.x / roundx) * roundx; - coords.y = (coords.y / roundy) * roundy; + //coords.x = (coords.x / roundx) * roundx; + //coords.y = (coords.y / roundy) * roundy; float d = (abs(float(coords.x)) - abs(float(coords.y))); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index de5348af70..d19dabba45 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -268,8 +268,8 @@ public class Renderer extends RendererModule{ } private void drawFlyerShadows(){ - Graphics.surface(effectSurface, true, false); - + //Graphics.surface(effectSurface, true, false); + Draw.color(0, 0, 0, 0.15f); float trnsX = -12, trnsY = -13; @@ -283,8 +283,8 @@ public class Renderer extends RendererModule{ drawAndInterpolate(playerGroup, unit -> unit.isFlying() && !unit.isDead(), player -> player.drawShadow(trnsX, trnsY)); } - Draw.color(0, 0, 0, 0.15f); - Graphics.flushSurface(); + + //Graphics.flushSurface(); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/graphics/CacheLayer.java b/core/src/io/anuke/mindustry/graphics/CacheLayer.java index 6da19d5880..8fc3c9b148 100644 --- a/core/src/io/anuke/mindustry/graphics/CacheLayer.java +++ b/core/src/io/anuke/mindustry/graphics/CacheLayer.java @@ -1,13 +1,7 @@ package io.anuke.mindustry.graphics; -import com.badlogic.gdx.graphics.Color; -import io.anuke.ucore.core.Core; -import io.anuke.ucore.core.Graphics; -import io.anuke.ucore.graphics.Draw; import io.anuke.ucore.graphics.Shader; -import static io.anuke.mindustry.Vars.renderer; - public enum CacheLayer{ water{ @Override @@ -65,12 +59,13 @@ public enum CacheLayer{ protected void beginShader(){ //renderer.getBlocks().endFloor(); - renderer.effectSurface.getBuffer().begin(); - Graphics.clear(Color.CLEAR); + // renderer.effectSurface.getBuffer().begin(); + //Graphics.clear(Color.CLEAR); //renderer.getBlocks().beginFloor(); } public void endShader(Shader shader){ + /* renderer.blocks.floor.endDraw(); renderer.effectSurface.getBuffer().end(); @@ -82,6 +77,6 @@ public enum CacheLayer{ Core.camera.viewportWidth * Core.camera.zoom, -Core.camera.viewportHeight * Core.camera.zoom); Graphics.end(); Graphics.shader(); - renderer.blocks.floor.beginDraw(); + renderer.blocks.floor.beginDraw();*/ } } diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java index 324b9cc0f6..62c51b33fb 100644 --- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java @@ -24,6 +24,7 @@ import java.util.Arrays; import static io.anuke.mindustry.Vars.*; +//TODO point shader mesh public class FloorRenderer{ private final static int chunksize = 64;