From 9173b03a8bb4040a2b4eff5b2182f41bfd54b4d7 Mon Sep 17 00:00:00 2001 From: fgnm Date: Sat, 2 Jul 2022 20:07:11 +0200 Subject: [PATCH] [editor only] Fix performance panel --- assets/plugins/plugin-performance-0.1.1.jar | Bin 6050 -> 6110 bytes assets/plugins/plugin-tiled-0.1.1.jar | Bin 103015 -> 103011 bytes .../plugin/performance/PerformancePanel.java | 10 +++++++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/plugins/plugin-performance-0.1.1.jar b/assets/plugins/plugin-performance-0.1.1.jar index fda638c8ce1a5ba1189635720c41f580cd444c60..41434069a14871c235eced23aaeac9d34ad15be2 100644 GIT binary patch delta 3013 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 delta 2934 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 delta 3527 zcmZuz3sh9s6}^}F3IoglLIjboLoyBo4FvfpOcrB;)B!7r0tplmNsWS_@=*qzK|Ue~ z)2H4fM$u%#YR!s(6B$#~VvJU)ADX6XRiz1CrZGjQ%Cae~O-t`PZ$7*sZ>`~7?%C(F z&pG$Jd(SMsZx(y!W($O#2uY@6$`K13G9oJ<5YO- zum;|%P9~DkU0CERKs;NP$KEe^un0?9fJop&7kO9n|9H3G10kiDQAnS+R4PU|fLJ<- z0ogBF!|fcFt>t!chF=na z<6m1Aevl+W=z=F>8ds4~Jr1|zhiF8gw(8^x0DZMxTSn#}bYMP>PDOHCu*l-wH!ufG z9X^>NgoVlI32K&Ot)*U|7r7$jLcIW?2r08zPL1!yo@99%mJ*+OEVcXvH*vwdnO+Er z*6CEN3Ikh0W&0UXYZ;dEG7H~HXph}gPcg`eXrED+)>h{!q|g+JkN>iO6N5m=|>cnOrr zvhK4Y$SL#b@3J8#$@Kv_ELz4VxDdL2c*-R$bn*spW43*p2au6(b2-*SV^=wd?fV|F zaAi*Z8tct%ST2w`+8MTD3vq*Bx8_j(nyZ)6i~}@{hj*^J1Yyy9{%H_(x#M>?w?Ahr%cgr3jSPmT7N9` zT%$2MG3emd-+zAPjU(vUYp)jOzLLKC*xy!vKOFb>i(kfmCtCl>4vXzv^!vS;#Q_KN z244H?hV9*Z|4{j1|6uAlRn+cN(~}Xphxx4)>jmNQ54Pqht3H2w>E++9ebpiv^LSf# z{Ydd}@}<{KUcT*H_(at;r6}_gf(}i-W@4A@Z3J&3jCh(*L>KY@QQdcLvSGlgG9AS+-y# zqz=y$+B5>poWS8^T^*Lq3MQJTX{f`ApqbqYn$4`H5=IQ!Qjek6NXRZKGaGKYWQ@uu zgf#B5%YW7Ya-qFt$Xx{|~)BNzz%OV^uh|g{uIV+$=PBa@(xtfb#k0rit z5s?TzP(1B~_>met4gmVooGd2Zq3%cW8nGY9Iyspw(IHdM?5vhl*k%Vk`Cqf0j_WJn zUg}#eIOE+XpB1Ec3j}#y>#)j|r*kiCKh2`s@yw`EN*eX{9+~7sk{nhJz3%VMV&PF1$z*E-NaNlgv75xRJM|$&Clj^7p5;^n5Y_d5B>ESuq!v>FtFQa zTw**y=j$0Cce}Phuv=Nd*@ad-W#qc!Jcz=JXSn=t&12g&2|^DQ2<7lx`d4u0Nabj|>8;5|C zua1`YBv4+bDKA&T*?c99gC#Q2ii5#JP6wVRuxW-#MmtuMiY_c6$2#oQ=;;FU^81_) zD?EGv2NP*G_6OyUsWKhy(GzZfz)m}0pc4QaZ9D+nQON=>_$QBevU#MX+ddK0oO0L? zZh$%=_94d)U|9tFi8#MWk))%ueuVPPcBYf%`j!}zl6_dkvWkOv`wrlFBC{dV(FBm|j^`kQikXmX#Y~T*{)>)CXeVlD^YcsiV7^@|rwzlkkyN!&k2cLulpuJX zTxhfVxxos|hIbu;;C)yLe4>X_w(O?^;$ANT(J(8++JQrLn zt^dOE4b90;dbL>1b5U%^GIQ=nk$<<_tCq?1oZ3tyZ=;cGc=*$~U|R=fW#_67YH49} zXfo1yFnu1tQpnBy*bnZMB>WfnnT2LUSRsZRV{GY;>TQ+Paa$|OXEI~&nq;#HKSLWg zwTQHt=)wH4OQ*w|*)UW>uG0amVefChDeAZs9e_|N9lMmS^D!F^t>@fs;2er*)a)l& Oi>g8p8n2;O2lRjb5B^U8 diff --git a/plugin-performance/src/main/java/games/rednblack/editor/plugin/performance/PerformancePanel.java b/plugin-performance/src/main/java/games/rednblack/editor/plugin/performance/PerformancePanel.java index 50b12692..b9fb6572 100644 --- a/plugin-performance/src/main/java/games/rednblack/editor/plugin/performance/PerformancePanel.java +++ b/plugin-performance/src/main/java/games/rednblack/editor/plugin/performance/PerformancePanel.java @@ -95,8 +95,10 @@ public class PerformancePanel extends UIDraggablePanel { @Override public void act(float delta) { super.act(delta); + entitiesCount.setText(entitySubscription.getEntities().size()); fpsLbl.setText(Gdx.graphics.getFramesPerSecond()); + MemoryUsage memoryUsage = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage(); long usedMemory = memoryUsage.getUsed() / (1024 * 1024); long allocatedMemory = memoryUsage.getCommitted() / (1024 * 1024); @@ -105,13 +107,19 @@ public class PerformancePanel extends UIDraggablePanel { memoryLabel.getText().append(" of "); memoryLabel.getText().append(allocatedMemory); memoryLabel.getText().append(" MB"); + memoryLabel.invalidateHierarchy(); + glCalls.setText(profiler.getCalls()); drawCalls.setText(profiler.getDrawCalls()); shaderSwitch.setText(profiler.getShaderSwitches()); textureBind.setText(profiler.getTextureBindings()); vertexCount.setText((int) profiler.getVertexCount().total); - renderTime.setText((int) (TimeUtils.nanosToMillis(TimeUtils.nanoTime() - time))); + + long ms = TimeUtils.nanosToMillis(TimeUtils.nanoTime() - time); + renderTime.getText().clear(); + renderTime.getText().append(ms); renderTime.getText().append(" ms"); + renderTime.invalidateHierarchy(); }