From 1e01d3027eea6bbe8c6f8f82abbe3de174556036 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 4 Dec 2022 03:37:55 +0900
Subject: [PATCH] delta-t benchmarking will update itself every 64th frame,
 reducing the performance impact

---
 .idea/artifacts/SpriteAssemblerApp.xml             | 12 ++++++------
 .idea/artifacts/TerrarumBuild.xml                  |  2 +-
 .idea/compiler.xml                                 |  1 +
 .idea/modules.xml                                  |  4 ++--
 .idea/runConfigurations/SpriteAssemblerApp.xml     |  2 +-
 .idea/runConfigurations/Terrarum.xml               |  2 +-
 .idea/runConfigurations/Terrarum__no_DEV_MODE_.xml |  2 +-
 ModuleComputers/ModuleComputers.iml                |  2 +-
 terrarum.terrarum.iml => TerrarumBuild.iml         |  0
 src/net/torvald/terrarum/TerrarumPostProcessor.kt  | 14 +++++++++-----
 10 files changed, 23 insertions(+), 18 deletions(-)
 rename terrarum.terrarum.iml => TerrarumBuild.iml (100%)

diff --git a/.idea/artifacts/SpriteAssemblerApp.xml b/.idea/artifacts/SpriteAssemblerApp.xml
index cfd3fea8a..5d7b9dcef 100644
--- a/.idea/artifacts/SpriteAssemblerApp.xml
+++ b/.idea/artifacts/SpriteAssemblerApp.xml
@@ -5,7 +5,7 @@
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/src/net/torvald/terrarum/spriteassembler/META-INF/MANIFEST.MF" />
       </element>
-      <element id="module-output" name="terrarum.terrarum" />
+      <element id="module-output" name="TerrarumBuild" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/Terrarum_Joise.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-csv-1.8.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/TerrarumSansBitmap.jar" path-in-jar="/" />
@@ -57,11 +57,11 @@
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-platform-1.10.0-natives-desktop.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-controllers-core-2.2.1.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/GetCpuName.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/plugins/Kotlin/kotlinc/lib/kotlin-stdlib.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/plugins/Kotlin/kotlinc/lib/kotlin-reflect.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/plugins/Kotlin/kotlinc/lib/kotlin-test.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$APPLICATION_HOME_DIR$/plugins/Kotlin/kotlinc/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-reflect.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-test.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk7.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$KOTLIN_BUNDLED$/lib/kotlin-stdlib-jdk8.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/prtree.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/commons-codec-1.15.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/jxinput-1.0.0.jar" path-in-jar="/" />
diff --git a/.idea/artifacts/TerrarumBuild.xml b/.idea/artifacts/TerrarumBuild.xml
index 1c180ad5f..c6f61dd0f 100644
--- a/.idea/artifacts/TerrarumBuild.xml
+++ b/.idea/artifacts/TerrarumBuild.xml
@@ -5,7 +5,7 @@
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
       </element>
-      <element id="module-output" name="terrarum.terrarum" />
+      <element id="module-output" name="TerrarumBuild" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-backend-lwjgl3-1.10.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/gdx-1.10.0.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/lib/lwjgl-3.2.3.jar" path-in-jar="/" />
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 4e9742ba6..9783de69d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
+    <option name="BUILD_PROCESS_HEAP_SIZE" value="2048" />
     <annotationProcessing>
       <profile default="true" name="Default" enabled="true" />
     </annotationProcessing>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 83248ab4c..beb22c826 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ModuleRenamingHistory">
-    <module old-name="terrarum" new-name="terrarum.terrarum" />
+    <module old-name="terrarum" new-name="TerrarumBuild" />
   </component>
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" filepath="$PROJECT_DIR$/ModuleComputers/ModuleComputers.iml" />
-      <module fileurl="file://$PROJECT_DIR$/terrarum.terrarum.iml" filepath="$PROJECT_DIR$/terrarum.terrarum.iml" />
+      <module fileurl="file://$PROJECT_DIR$/TerrarumBuild.iml" filepath="$PROJECT_DIR$/TerrarumBuild.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/SpriteAssemblerApp.xml b/.idea/runConfigurations/SpriteAssemblerApp.xml
index 9f632f982..7de5a5218 100644
--- a/.idea/runConfigurations/SpriteAssemblerApp.xml
+++ b/.idea/runConfigurations/SpriteAssemblerApp.xml
@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <module name="terrarum.terrarum" />
+    <module name="TerrarumBuild" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="SpriteAssemblerApp" />
diff --git a/.idea/runConfigurations/Terrarum.xml b/.idea/runConfigurations/Terrarum.xml
index 13e0e75b4..c124bd17e 100644
--- a/.idea/runConfigurations/Terrarum.xml
+++ b/.idea/runConfigurations/Terrarum.xml
@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <module name="terrarum.terrarum" />
+    <module name="TerrarumBuild" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="ModuleComputers" />
diff --git a/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml b/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
index c25ace922..d2b35fce3 100644
--- a/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
+++ b/.idea/runConfigurations/Terrarum__no_DEV_MODE_.xml
@@ -5,7 +5,7 @@
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <module name="terrarum.terrarum" />
+    <module name="TerrarumBuild" />
     <method v="2">
       <option name="BuildArtifacts" enabled="true">
         <artifact name="ModuleComputers" />
diff --git a/ModuleComputers/ModuleComputers.iml b/ModuleComputers/ModuleComputers.iml
index 7eb3b20b5..d8119fd9c 100644
--- a/ModuleComputers/ModuleComputers.iml
+++ b/ModuleComputers/ModuleComputers.iml
@@ -8,7 +8,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="ModuleComputersLib" level="project" />
-    <orderEntry type="module" module-name="terrarum.terrarum" />
+    <orderEntry type="module" module-name="TerrarumBuild" />
     <orderEntry type="library" name="com.badlogicgames.gdx:gdx-backend-lwjgl3:1.10.0" level="project" />
     <orderEntry type="library" name="com.badlogicgames.gdx:gdx:1.10.0" level="project" />
     <orderEntry type="library" name="graalvm-js-21.1.0 and graalvm-js-scriptengine-21.1.0" level="project" />
diff --git a/terrarum.terrarum.iml b/TerrarumBuild.iml
similarity index 100%
rename from terrarum.terrarum.iml
rename to TerrarumBuild.iml
diff --git a/src/net/torvald/terrarum/TerrarumPostProcessor.kt b/src/net/torvald/terrarum/TerrarumPostProcessor.kt
index 00ae5df88..4c4140a25 100644
--- a/src/net/torvald/terrarum/TerrarumPostProcessor.kt
+++ b/src/net/torvald/terrarum/TerrarumPostProcessor.kt
@@ -77,6 +77,8 @@ object TerrarumPostProcessor : Disposable {
         outFBO.dispose()
     }
 
+    private var deltatBenchStr = "ΔF: Gathering data"
+
     fun draw(projMat: Matrix4, fbo: FrameBuffer): FrameBuffer {
 
         // init
@@ -156,10 +158,9 @@ object TerrarumPostProcessor : Disposable {
                 }
 
                 if (KeyToggler.isOn(App.getConfigInt("debug_key_deltat_benchmark"))) {
-                    batch.color = Toolkit.Theme.COL_ACTIVE
-                    batch.inUse {
+                    if (INGAME.WORLD_UPDATE_TIMER % 64 == 42) {
                         // we're going to assume the data are normally distributed
-                        val benchstr = if (INGAME.deltaTeeBenchmarks.elemCount < INGAME.deltaTeeBenchmarks.size) {
+                        deltatBenchStr = if (INGAME.deltaTeeBenchmarks.elemCount < INGAME.deltaTeeBenchmarks.size) {
                             "ΔF: Gathering data (${INGAME.deltaTeeBenchmarks.elemCount}/${INGAME.deltaTeeBenchmarks.size})"
                         }
                         else {
@@ -178,8 +179,11 @@ object TerrarumPostProcessor : Disposable {
                             val low1 = FastMath.interpolateLinear(low1pos - low1ind, tallies[low1ind], tallies[low1ind + 1])
                             "ΔF: Avr ${average.format(1)}; Med ${median.format(1)}; 5% ${low5.format(1)}; 1% ${low1.format(1)}"
                         }
-                        val tw = App.fontGame.getWidth(benchstr)
-                        App.fontGame.draw(it, benchstr, Toolkit.drawWidth - tw - 5f, App.scr.height - 24f)
+                    }
+                    batch.color = Toolkit.Theme.COL_ACTIVE
+                    batch.inUse {
+                        val tw = App.fontGame.getWidth(deltatBenchStr)
+                        App.fontGame.draw(it, deltatBenchStr, Toolkit.drawWidth - tw - 5f, App.scr.height - 24f)
                     }
                 }
             }