curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: delta d bench was broken

Browse Source
This commit is contained in:
minjaesong
2023-09-19 16:13:29 +09:00
parent 0229cf501c
commit 1b3796b265
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/net/torvald/terrarum/App.java
View File

@@ -405,6 +405,7 @@ public class App implements ApplicationListener {
initialiseConfig(); initialiseConfig();
readConfigJson(); readConfigJson();
setGamepadButtonLabels(); setGamepadButtonLabels();
rectifyConfigs();
ShaderProgram.pedantic = false; ShaderProgram.pedantic = false;
@@ -1710,4 +1711,14 @@ public class App implements ApplicationListener {
public static void inputStrobed(TerrarumKeyboardEvent event) { public static void inputStrobed(TerrarumKeyboardEvent event) {
currentScreen.inputStrobed(event); currentScreen.inputStrobed(event);
} }
/**
* Corrects out-of-range config values
*/
private static void rectifyConfigs() {
// force set min autosave interval to 5 minutes
if (getConfigInt("autosaveinterval") < 5 * 60000) {
setConfig("autosaveinterval", 5 * 60000);
}
}
} }

4
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -617,7 +617,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
// some sketchy test code here // some sketchy test code here
KeyToggler.forceSet(App.getConfigInt("debug_key_deltat_benchmark"), false) KeyToggler.forceSet(Input.Keys.F2, false)
}// END enter }// END enter
@@ -853,7 +853,7 @@ open class TerrarumIngame(batch: FlippingSpriteBatch) : IngameInstance(batch) {
WORLD_UPDATE_TIMER += 1 WORLD_UPDATE_TIMER += 1
if (KeyToggler.isOn(App.getConfigInt("debug_key_deltat_benchmark"))) { if (KeyToggler.isOn(Input.Keys.F2)) {
deltaTeeBenchmarks.appendHead(1f / Gdx.graphics.deltaTime) deltaTeeBenchmarks.appendHead(1f / Gdx.graphics.deltaTime)
if (deltaTeeCleared) deltaTeeCleared = false if (deltaTeeCleared) deltaTeeCleared = false

2
src/net/torvald/terrarum/modulebasegame/ui/UIPerformanceControlPanel.kt
View File

@@ -25,7 +25,7 @@ class UIPerformanceControlPanel(remoCon: UIRemoCon?) : UICanvas() {
init { init {
ControlPanelCommon.register(this, width, "basegame.performancecontrolpanel", arrayOf( ControlPanelCommon.register(this, width, "basegame.performancecontrolpanel", arrayOf(
arrayOf("", { Lang["MENU_OPTIONS_GAMEPLAY"] }, "h1"), arrayOf("", { Lang["MENU_OPTIONS_GAMEPLAY"] }, "h1"),
arrayOf("autosaveinterval", { Lang["MENU_OPTIONS_AUTOSAVE"] + " (${Lang["CONTEXT_TIME_MINUTE_PLURAL"]})" }, "spinnerimul,1,120,1,60000"), arrayOf("autosaveinterval", { Lang["MENU_OPTIONS_AUTOSAVE"] + " (${Lang["CONTEXT_TIME_MINUTE_PLURAL"]})" }, "spinnerimul,5,120,5,60000"),
arrayOf("notificationshowuptime", { Lang["MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION"] + " (${Lang["CONTEXT_TIME_SECOND_PLURAL"]})" }, "spinnerimul,2,10,1,1000"), arrayOf("notificationshowuptime", { Lang["MENU_OPTIONS_NOTIFICATION_DISPLAY_DURATION"] + " (${Lang["CONTEXT_TIME_SECOND_PLURAL"]})" }, "spinnerimul,2,10,1,1000"),
arrayOf("", { Lang["MENU_LABEL_GRAPHICS"] }, "h1"), arrayOf("", { Lang["MENU_LABEL_GRAPHICS"] }, "h1"),
arrayOf("atlastexsize", { Lang["MENU_OPTIONS_ATLAS_TEXTURE_SIZE"] }, "spinnersel,1024,2048,4096,8192"), arrayOf("atlastexsize", { Lang["MENU_OPTIONS_ATLAS_TEXTURE_SIZE"] }, "spinnersel,1024,2048,4096,8192"),