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
zcmX@jv5{j!XuUpbLb}QZ1_tJRo-U3d6}R3-@6M8T6xnOM`xld<5+^s0*V8MSJ{%m5
zQcFFiDs4U0D)51SN#IQXfVuh|-pK}vuCG>Xa!}ZOPvHw|lBD>>uA9f->`6bKqA#J7
z`MmI)?e}wU-o$Q+&}rCKx1ZnWnr!dOewI5Dr~ci{zrIy`S!PuIZ)?4}i7K636^{gJ
z^7b?_dx^0)zJ0&2vC|}T$qJ6h)hY_XjM_5078hPVp#6OF{dI!gtZM=|9$U0MEa1>l
zirZWFc=GYB9SK?reaQ?AYJ$5S+~?n?z4iCUAD-<TF6tiBxSVEhT*tNNM%+Y>OR~L!
zdxKIqC#o^I22RO#UHw3#zW$Najzm|5Yeh4cWkxdAm$Nf4%s8huAxF;R|DQF54`y{K
ztO-@(XnG|u<D6PSac%V{n|_wt2Y3Y>cP%zt6~wr1*DSXEQFom;ReoUGbL@soiG0AW
zf~~vsH5Yn5Se5mn@7R(ZE?n<fGKE48>eufT-IZ5Yx!k42YtosuOpeQspZ#&a{#pOE
zhS>^EEi6&2LEo7+JqT?SzkOOjaWzZLmpv1{$2M)h8a|DC({7J1KTn4*ygP5jcVGW7
zQyrF&h8L+HA{(YlIx7SUKeIc)K6958_v{b*ygwKvcdcMBf7<)+XXLx}nyLx1?^pXY
zutrSfxF=Jg#S!ZnCK6K?d-rd<=izO8*T1TdoLOe2b-=FTZkhZgt_^~}eb;m8h$hV6
z``(H5hRNk^YC4yecNrP}d45gkLGhd2FLsAIcsqDEL~h>MzWrkP>V|0yp2C(>wkU>9
zv<sc5{NTC3db7`7s*K^M8w;1^O6U8nNiJG#d7$Na&U_w2PJ^XQDW4axI4zsI>N}&%
zJkGR)iu&J`;pvS|iV4c%8*Emu5|Mo`9eCi+C%=~phgz2VswDHwF$$i?H7iQg<(NpN
zLszWdiQ^lMn6`vI=wi9te>_mcRiLDbfr)jZk*LzL{&T4(MAry7{(k#wKGUVce3uUM
z{nQG+eCk&I_2si1SIQ_zaeX;bs<!@8+_s=KA=){sgM8HLbwWHRuN4SZb7*IYF54<|
z;OJ5BcYc$jHD=0{d9<|X$jnk};yb;n>)NU_=kId)rwgZO>)&AVpM2m(s?tK42{(81
z%NM&|wrg$Wc-dNzurKYnio%O8Ua6mbg%wwCQ|5ee{{8&r@4NJy3^^~T9#j!rm1s8C
zx9GuYj}@v8>M}k83zH|uFWbzyYv;aJ@x6U^jGMfdu$OiH)MCm|T5^tg)7wq!T|#o7
zKbFY4-_29X_NkTQUaimF>WK>#S592EbX~RFf>SoOf=?tYw9YhU&lJk2X6o2_t3Gzp
S>}3oL3=E#GelF{r5}E)pvdN<W

delta 1028
zcmdnUahhX7Xg#Y`6U)<F1_tIEo-U3d6}R5b-rp_dD02M%nOE@&LQ{qLd`edadvJ72
zI3}_(Xvwx1j>g~Ymm;3|Z#Wk}LA#%sQ#0uJD;CF_#vS#II<uA5_3SpbHqNhmGwa8L
z2j_0zocX=-{`a)9IjWOSvP5KWjarc0o7ex>n9<(tQheEJ*N3h3g)-v*=BL@;$T5?6
zF5G`^{+H>T4(FN_H2&0|J>+m|i^^(_*vCvBp$cB@Zrj7RJ-+ktO&GUQP@{%uR-lOE
z^2>~Z9pd`&k^Mhze+z&2{Qf*U3s%Jt2N72W1}A}K=elL4#kR8+F*x2}(hPDuo4Rhb
zm0or~%S4l1wujD%WICoe)=x0t@sHZ5WpTp(<J%o4CMa}d?CN=JvA*H{ZCeHg9(U#&
zI@dj4|5{aYoL6*WM_Q)>#}7>d8Qur~-aVA4lw`Ty7tH`REtv6X>{%=O`Syp>cCPFB
z%vP(u>UG1N*3Una{Ww#t`a+!--}c@VyyTPDgw}@Ax?hjCUMhY3kB611K3K&+t#QG<
zDPe!~AFHSL-DX(G)EL@$ZF9rA&k@Hrzb$omq17m-v|glk{<+<|!lSq^E%*5J@pAgo
ztMjtH<noKn7UR-Vcw<r_cJB3;g#jysA6hNoGWvQ|e5+vX{By6rtX#wt6=o83JzU*B
zRkLxHi@Y(z#KRE+n+#8c1bkMF41HdI>2=pU`y8oK+1i|x(pxiEG=wR>TK9h8S_bi*
z@!!@c1Tn5H`ck{1;g;IltOHu#k7!IjRG)X{*yn#cCD!v@(0abFzdAnX0n-Df1M7Ci
z9NxX7obSNfEq~9u&ED=?=E-=MO>6cfy(O!P{Lg&n_#*S^YHI95rU_RWc`~o7Nl(t0
zeJ8V?cY~nib!%rQhHW7mBG(1_z1VWtP5!{+c?qw2a%|sc>j!AE##~_vOxfsV*tt)X
zwdc3-6}OgNkJ}o@L{yIZgod@Hp5fA}T~*`gRm-=ct9B_vPv`^grnl>ldrGtkT$#<l
z#jaGk?Q~B5+}8&}Z4{l#Rv(RLJ@Q-k$Zy@1t9){`>$A5<$(-lOy2^0Z{b^x+nn{IE
z_1(!yJ2xL%=hyXe39HzwcbtYM48k1i-jv;Hn?3varK!ulEJ)dNUr3ZA(`pKDldt!^
z&ak+r)Ad^07c&-yipN-<cM@1*)EUI<@%HTQ@9OQ#R!<Srx?ucLq2{a~hr$Z;;^WUw
zvn^b`jhW@s>*wEVAE)0GKiI<Hqj-a*(RcI1jDklt{7#AtlS?)*9$K=G$DO&T{yW3@
zS*67cyMk53I*v9~ovD;#5Ni=*xUG;gJHs;mi&eteC5u-zOt3vJvR6EEv&z;@4ifeU
r0-Zm-ap*`t?wQ6D<URGkE%`aU4-@!bss}PKFfe$!`njxgN@xNA`4ZuS

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;