From 785c2e36c614ed06bbaf54009855ff78bf702562 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 13 Nov 2018 23:24:59 -0500
Subject: [PATCH] Fixed some things

---
 .../blocks/power/power-node-large.png         | Bin 1099 -> 1073 bytes
 core/assets/shaders/menu.fragment             |  10 +++++-----
 .../src/io/anuke/mindustry/core/Renderer.java |   8 ++++----
 .../anuke/mindustry/graphics/CacheLayer.java  |  13 ++++---------
 .../mindustry/graphics/FloorRenderer.java     |   1 +
 5 files changed, 14 insertions(+), 18 deletions(-)

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 c598fa0a081526e7fb98c389b237c4f1d2983d3f..0a76d7e1a7c52c171f9038116922703b997970b1 100644
GIT binary patch
delta 1002
zcmV<G0~P$s2(bu|Revu9U}q$-000BNNkl<Zc-rk-yJ{Oj6umRM`T`*$2@4EL<<u!m
z2nazMrAU<`waSGM@DHR>nNLuiFNjNHFd;?isIovHv)&-|1!5T&(Tdr}?7U~kWG@&j
zY3FgyJ@?M+>|L~2EP%FtzYj9j9gXRa1l$<P{@HKWwHKyoT7UaHE`E_Di3)h)5PWXD
zf&)qx1VQcZp@E4sX{4wKS*s)<QvoX+x}$N^z$@po->wl$1*}jA<2Z)la0o0SUcG+f
zlgG7)U@9PvV*mgq5xU^t556n4`|<cmhX_O`NR|pho3XA6yx3lm2+|#m5xr7m36UlO
zMNyP%MXTT_e}Cc{xM4*g)^eGqX;}e(cLx9fn9e4UY#vDe{H$@{nu;K-RU!z2>JXUD
zCUA3od-6Pw1lzz35J9@5F{)AluDY5AzgpcxvU%_ZyvEo>bRST<aJ9NGDWOT=s%q$t
z#-zAJ3hxAI5>&x2f4vpDZhm>EM1)F`%&h`Jr^n6s-+$(h)_|KJLWBfb1yc6{vfx#L
z7u(AaA*%#@^t_PwU4pmOSC$L1yGZo;%U7Y@o~ZXtPgXT71XO_NW$;;mml;DKQ4{7q
zzz3PS8Vj57zDw{jV~VH%H|34~`C0C-DJ5VX@2gCJ1z42`-W+%;2wh256kK*)-TjA2
z!?wMz>VH|8b~-A+K6u@BAJPi25&KQA3M>_1pS|xw1=uvxwk9mnr;0K${O8sZ;B)M|
z=(|-wOF&D2S+lu^x6ya2fR+GB6FHQ$Aytt+Rh}c@=Mb+p^GYQFSIdEMrfnN<POM{c
zt2w}g=WL%0F$plGf@Jfc1VW~rs`mjLo(X1Pcz^qOS7(7jAz&jHuso}(6dmsyQNaB2
zPU#@Rgr`j;V+@=!Q=ST%S`|db6nQ|3T~5fyu`&X*Rp5#Q(~rkd6h#npdH@0ikunt`
zrjO2L$Q7&*LHq6cp90du4${L8`6^S>%Gz(&r<y^j93UDB^u%>0uhL$&Qmj-fY^zdC
zCVwncNt3M*Qzk%%1Y35s9KglJOYTmSTPT?xc1VPTEF799f)2~7iq@*k&)o`7XA@*A
zFW3T4lfc+zBB30R*}D%Pb4AlWg@p*|g>YcLX2&ET==4fu^Gy>WtF|Kv=+Ez;r|*g{
zf-wouCBY;Ss$n*rO>*F?NT?-1Cmc)=p<|O@rn3pUxxR%Ly^cNsvP+}~c8d8b0%#(n
z&I7XTvadu`ZRg_{YTt_tbq4Z<2;O~6-FuOtA*qq3rLKD(pvpWw5#$&+D$IdvnG$Gw
Y0*JNRe_fKBrT_o{07*qoM6N<$f-$nmqW}N^

delta 1028
zcmV+f1pE832+IhNReuE<f&}Gl000BnNkl<Zc-rlozl$0{6vyAp>R%udl@kt3b*WQG
z2#Aoz6sc0Awp<8-`v=lk=1;KBUyv)00|_Zo$La(@*)xcLfh?OMu8g}gJ2P*7?3(!C
z;Lh9GnfH0$_hxpSC6mbnSZlRfpks}0kNq<NKSt7DcB@6<g@17z7yh4SKiF(G80Qm@
z&Y$#`2|&(*ASnEQ&B8#+v?QwtUE=~sRUk@-Mz>eC<J|G=Rtq9hfhZMfQ4~R^(*Y5P
z7cXB~kNDg6SMKNEo<2AQAyhyVMF0Ro5T?$H9F|>&1#$pE*a9h1LCs~Zt2!=gj|7o4
zx;?_q6lp<ZL4S}i3{P6IDmchL@$I<CkRXU?x{TvEuYlj%Jpcd<M+4X_*GcR8s&vN<
z6_JQ$i6990DKH!j;QsF67<m~4*N$5Nku<tJ!czg|UClZ_pFhH8xvq@!27M>0>ww&a
z^Z8>=31vEtRYRlOOR`g>@=B0}fOUTQ<F(Rt<Ngc<0)JB^PiBFj-jr7SFXJa?j@tmC
z0)bV5*0X@F^H|5T?R7xtDuEs%uM~Zs&bzu-S_{&rNb>R1XQkDiYV>Un7Mm6dDj@7M
zcoxp<^r29w6X80b3NrQ87qt<6pU&&_siFc}Ry11IS0_JZDS?_qA2R@v!&nfqG00R<
z^CekT=YP`cik?4g8g(6gY-DxXnW%tPA?mL0p{)QHxnK6IAW{LXa`b(ufZ8VQYQQS@
z#3+-(e{R&q^ZvOQuMW^E=f017UsB)#-~zy|xm?4$xOWb~?X>;RMw_=yc1Z!<1}dA9
zE~Kh*Pt5lS^c?clWnJL{kktVUY1bwjlW3dVX@3o{5jod8LqY(yRIpjDQBLTz!$u##
z<DOvZjBGvcYcEhK1zgkuQDm`7F^Rqv1&sSM)JBAjNZTmJ6ePz?RaS;&%nB-fs(e98
zeGaIKeWd`5Rp1MP?XSm47={qkn*a(2B6YUQY;T?Gz*RgULUyagUj@YbEyVjRsj5tE
zD}QUZS{%;|YSjSUN9A#UW;A$Ad)<>_xwFEqPKxQI1s0m_2{AMP69}&CcG`xUo9EJ%
zru3j>yx$TP2x&T$4T4Qe-icOT<(Dpnhob>;RTo@2&q5HaGKo?RNbSwL_a}#@tCSWh
z&@<^Ee9cY>AgDKU$L7lhp{uq71oG?W_kH7M*%!ft08Am+1c6Pn;b?H;JP$%40F!jE
z0m7ud3`YZUfA;{-nssvkx>F<;h{b|>%y}LF7K9c6+aPS4XgOc>I$+JDqpE<AJ;xNi
y7g@6;wX#4MKfqB#^6Wr}XU9oq3{p##z}g?2jp1Mq=_gSD0000<MNUMnLSTaV65)dY

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;