From 8598b0a23a83afc2d4d485e54cea380b3681f523 Mon Sep 17 00:00:00 2001 From: Anuken 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 zcmV-N0l5D60`CHlF@GsZL_t(oh3%NZ4TCTY0NtuXR1B68cvc;O5vo2r0)wG$L0_)Y z)WLRQ146kk0WOYX8~_@PZ8=##@OB^O+_mRpP`}Sqa7hl)N}kJgev!zPU?S)x2Vk(o z8oAYT&|40mLU0W^fWjQq$i1hjTnPQ&gvRkDihpWR1SL`7#!%7}>fDGQ zeC;}NjAmK6NU8*>S*MaUIY-HgmpB)>Sg3YGPyrA{P$FkZ97#5UOF5UzK}*C-oRjgE zH0x%(5DVt=%_|QPRxnQ3RK{BlKv4(N%@WID9$E;ewQ%=^`dFVjB!qtE%8Nu&($N%^ z8A0f;wfp;EYut;In25lFUj5ierq(g Z<^yY4mabwJX$b%T002ovPDHLkV1hDhkg)&& delta 335 zcmV-V0kHn>0`~%tF@G^hL_t(oh3%Nl4Z<)CMh#P-4weymM2yf85JyJnU{$v$CnFQ( z$9C+tLU|HG2$Vd&xNcH_PUl!I)&t%j)0X@0^_;}>nF^NV5UJ!PJ@Y{mmGk> z5=-QEuR(7)fCj-mM2`7=NnhLm0Q)FtFrG%=5cC zzc@ks_pM7u$0{L8Fg0MDWQ%wzQFekKmguoC3RSwfSnCYX~;efEI8#5oyn zN!LDT0b4LvZ(enXR0V0l#xmY=0D?XkUo2D(>(D|t?uDms)Z%+_sqIj>qP6?6_$tN$ zE!vCAW&waF7fAmmmf^?&D7RbE4J%hBg(^YG7QVF<{`b&?och>_cuJaV7Fv##HOzK1 hUXrJO{MP9l%?E2qn{_|-$(H~C002ovPDHLkV1f;Gn~eYf 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(); }