From 4357c631be69a517ac590b55695b112c3e67a8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Fri, 2 Sep 2022 22:14:04 +0200 Subject: [PATCH] Remove FPS profiler from DemoRunner --- src/main/java/com/bartlomiejpluta/demo/gui/HUD.java | 6 +----- .../java/com/bartlomiejpluta/demo/runner/DemoRunner.java | 7 ------- widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java b/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java index 32efee8..94197b4 100644 --- a/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java +++ b/src/main/java/com/bartlomiejpluta/demo/gui/HUD.java @@ -8,7 +8,6 @@ import com.bartlomiejpluta.base.api.screen.Screen; import com.bartlomiejpluta.base.lib.gui.BorderLayout; import com.bartlomiejpluta.base.lib.gui.Label; import com.bartlomiejpluta.base.lib.gui.TextView; -import com.bartlomiejpluta.base.util.profiler.FPSProfiler; import com.bartlomiejpluta.demo.entity.Player; import com.bartlomiejpluta.demo.event.EnemyDiedEvent; import com.bartlomiejpluta.demo.event.HitEvent; @@ -28,8 +27,6 @@ public class HUD extends BorderLayout { private final Runtime runtime; private final LimitedQueue logger = new LimitedQueue<>(MAX_LOG_SIZE); - private final FPSProfiler fpsProfiler; - private float logVisibilityDuration = 0f; @Ref("hp") @@ -44,7 +41,6 @@ public class HUD extends BorderLayout { public HUD(Context context, GUI gui, Map refs) { super(context, gui, refs); this.player = DemoRunner.instance().getPlayer(); - this.fpsProfiler = DemoRunner.instance().getFpsProfiler(); this.runtime = Runtime.getRuntime(); context.addEventListener(HitEvent.TYPE, this::logHitEvent); context.addEventListener(EnemyDiedEvent.TYPE, this::logEnemyDiedEvent); @@ -84,7 +80,7 @@ public class HUD extends BorderLayout { public void draw(Screen screen, GUI gui) { var coords = player.getCoordinates(); var pos = player.getPosition(); - debugTxt.setText(String.format("FPS: %.2f\n" + "Mem: %.2f / %.2f [MB]\n" + "Coords: %d : %d\n" + "Pos: %.2f : %.2f\n" + "Entities: %d\n", fpsProfiler.getInstantFPS(), runtime.totalMemory() / 1024f / 1024f, runtime.maxMemory() / 1024f / 1024f, coords.x(), coords.y(), pos.x(), pos.y(), player.getLayer().getEntities().size() - 1)); + debugTxt.setText(String.format("Mem: %.2f / %.2f [MB]\nCoords: %d : %d\nPos: %.2f : %.2f\nEntities: %d\n", runtime.totalMemory() / 1024f / 1024f, runtime.maxMemory() / 1024f / 1024f, coords.x(), coords.y(), pos.x(), pos.y(), player.getLayer().getEntities().size())); logLbl.setAlpha(Math.min(1f, logVisibilityDuration / LOG_VISIBILITY_FADING_OUT)); diff --git a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java index c90727b..c0f5e7e 100644 --- a/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java +++ b/src/main/java/com/bartlomiejpluta/demo/runner/DemoRunner.java @@ -4,7 +4,6 @@ import com.bartlomiejpluta.base.api.context.Context; import com.bartlomiejpluta.base.api.gui.GUI; import com.bartlomiejpluta.base.api.runner.GameRunner; import com.bartlomiejpluta.base.api.screen.Screen; -import com.bartlomiejpluta.base.util.profiler.FPSProfiler; import com.bartlomiejpluta.demo.entity.Player; import com.bartlomiejpluta.demo.menu.GuiManager; import lombok.Getter; @@ -20,8 +19,6 @@ public class DemoRunner implements GameRunner { private Context context; private GUI hud; - @Getter - private final FPSProfiler fpsProfiler = FPSProfiler.create(20); @Getter private GuiManager guiManager; @@ -82,10 +79,6 @@ public class DemoRunner implements GameRunner { context.close(); } - @Override - public void update(float dt) { - fpsProfiler.update(dt); - } @Override public void dispose() { diff --git a/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml b/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml index 19f79fd..6f53b89 100644 --- a/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml +++ b/widgets/00bd0625-b3b8-4abf-97b7-91f42bce28ec.xml @@ -17,7 +17,7 @@ - +