From 8598b0a23a83afc2d4d485e54cea380b3681f523 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 31 May 2020 16:45:03 -0400
Subject: [PATCH] Fixed bizzare planet render bugs

---
 core/assets-raw/sprites/units/cix-foot.png    | Bin 375 -> 367 bytes
 core/src/mindustry/core/NetServer.java        |   2 +-
 core/src/mindustry/core/Renderer.java         |   1 -
 .../mindustry/ui/dialogs/PlanetDialog.java    |  48 ++++++++----------
 4 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/core/assets-raw/sprites/units/cix-foot.png b/core/assets-raw/sprites/units/cix-foot.png
index d198d789df397bc7dda560e1f025cc1fc763f010..511b23a177ae9d81b57cfbfe1499535768382a16 100644
GIT binary patch
delta 327
zcmey)^qy&gVZElOi(^Pc>)ROzd7BM*81Ale4&j+5SP>@MD7ebbnyGnVo@4yFOIHq-
zB{4hg)MwP|OO|1f>dm!`wEs{h|Lo4z=g9&4&xaIv@?G?rce=E0;)$sVN-tE|6E+-?
z+IhA3LNwn3rvhHfhC?z}PV8O2@`-4?UTC@Tf*6j!_gjvARPCzI3S?0Ye0VJ2lE|w&
z9r87At%`cmB6oVMVp$ove3Gf9`^m297UDZ2R+KphFbcQ^D5ZPKc$zhNTTVai=zYX{
z&g75NOkSt$5#WCI>8v)tV3>j5jgVu}d=7!^m(L2FPLzw{SiZI3d+V==`Bo||b<a+9
zy98ajC^A*j^X=nf9=CO`JJbo7PY!8Yq|r1>Y~MHU;ycd5n_efYKhn&+q;o|^+w#mV
kN&S;||JP-kY<tF>9XV}Xl2|4u0|Nttr>mdKI;Vst05WTku>b%7

delta 335
zcmaFQ^qpyfVZEWJi(^Pc>)RP;c@G)zxbX%r;F~5`<<fIOP{7^oMMCIy4RvMVr^n0Q
zY;&p<a^jd`vu{UUP=nv|2)%2}_v9~6`~B|goFkuSa!q?8u<}Xh`p?|%e$AZ=rpq)O
z6!Lyjw%#${vVrZO?GuJ6rWzBYr@I;-72mwtg7s9ZLEeu({dW@et6n%uY`<-=;fdFo
z&%3SmTR8stzSi6QxR#=qfoZ~=l<o?xz_O;0KCi%q*Fu6BHwZmB5$QB}joOUK-nHKv
z_8zg6%=f%*m%$iq5S|}b+7ZH<dGMIgy&{GtJBfIm5Wd$JoGjk8F3-R6sJd|F+khR5
zw*KDuL+co$?yc_AX^ai(;vWCirae5tsIfiz60df+TC0}hNwIxfMgD!i&@$)Ojm`?M
uSvg`+eN#=(lo`iOT3-L>+Dn<U?Ae~POYOg%oX)_&z~JfX=d#Wzp$PyDb(@U<

diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index e36f61829f..6c3f51e803 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -862,7 +862,7 @@ public class NetServer implements ApplicationListener{
 
         StringBuilder result = new StringBuilder();
         int curChar = 0;
-        while(curChar < name.length() && result.toString().getBytes().length < maxNameLength){
+        while(curChar < name.length() && result.toString().getBytes(Strings.utf8).length < maxNameLength){
             result.append(name.charAt(curChar++));
         }
         return result.toString();
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index e91ae289d4..bfca715bce 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -126,7 +126,6 @@ public class Renderer implements ApplicationListener{
                 bloom = null;
             }
             bloom = new Bloom(true);
-            bloom.setClearColor(0f, 0f, 0f, 0f);
         }catch(Throwable e){
             e.printStackTrace();
             settings.put("bloom", false);
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index dec25c616a..52fbb2cea0 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -52,7 +52,10 @@ public class PlanetDialog extends BaseDialog{
     private final ResourcesDialog resources = new ResourcesDialog();
 
     private float zoom = 1f, smoothZoom = 1f, selectAlpha = 1f;
-    private Bloom bloom;
+    private Bloom bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false){{
+        setThreshold(0.8f);
+        blurPasses = 6;
+    }};
     private Planet planet = Planets.starter;
     private @Nullable Sector selected, hovered;
     private Table stable;
@@ -64,8 +67,6 @@ public class PlanetDialog extends BaseDialog{
     public PlanetDialog(){
         super("", Styles.fullDialog);
 
-        makeBloom();
-
         Events.on(DisposeEvent.class, () -> {
             skybox.dispose();
             batch.dispose();
@@ -79,7 +80,7 @@ public class PlanetDialog extends BaseDialog{
         });
 
         Events.on(ResizeEvent.class, e -> {
-            makeBloom();
+            bloom.resize(Core.graphics.getWidth() / 4, Core.graphics.getHeight() / 4);
         });
 
         TextButtonStyle style = Styles.cleart;
@@ -164,19 +165,6 @@ public class PlanetDialog extends BaseDialog{
         //TODO
     }
 
-    void makeBloom(){
-        if(bloom != null){
-            bloom.dispose();
-            bloom = null;
-        }
-
-        bloom = new Bloom(Core.graphics.getWidth()/4, Core.graphics.getHeight()/4, true, false, true){{
-            setClearColor(0, 0, 0, 0);
-            setThreshold(0.8f);
-            blurPasses = 6;
-        }};
-    }
-
     void setup(){
         cont.clear();
         titleTable.remove();
@@ -188,6 +176,7 @@ public class PlanetDialog extends BaseDialog{
         Draw.flush();
         Gl.clear(Gl.depthBufferBit);
         Gl.enable(Gl.depthTest);
+        Gl.depthMask(true);
 
         Gl.enable(Gl.cullFace);
         Gl.cullFace(Gl.back);
@@ -248,7 +237,7 @@ public class PlanetDialog extends BaseDialog{
     }
 
     private void beginBloom(){
-        bloom.capture();
+       bloom.capture();
     }
 
     private void endBloom(){
@@ -438,18 +427,25 @@ public class PlanetDialog extends BaseDialog{
 
         //stored resources
         if(selected.hasBase() && selected.save.meta.secinfo.coreItems.size > 0){
-            stable.add("Stored Resources:").row();
+            stable.add("Stored:").row();
             stable.table(t -> {
                 t.left();
 
-                for(Item item : content.items()){
-                    int amount = selected.save.meta.secinfo.coreItems.get(item);
-                    if(amount > 0){
-                        t.image(item.icon(Cicon.small)).padRight(3);
-                        t.add(ui.formatAmount(amount)).color(Color.lightGray);
-                        t.row();
+                t.table(res -> {
+                    int i = 0;
+                    for(Item item : content.items()){
+                        int amount = selected.save.meta.secinfo.coreItems.get(item);
+                        if(amount > 0){
+                            res.image(item.icon(Cicon.small)).padRight(3);
+                            res.add(ui.formatAmount(amount)).color(Color.lightGray);
+                            if(++i % 2 == 0){
+                                res.row();
+                            }
+                        }
                     }
-                }
+                });
+
+
             }).row();
         }