From 0690d742c73462e9e78e90dad684368695f6f396 Mon Sep 17 00:00:00 2001 From: ButterscotchVanilla Date: Thu, 16 Dec 2021 01:38:16 -0500 Subject: [PATCH] Properly save SkeletonConfig values --- .../dev/slimevr/gui/SkeletonConfigGUI.java | 10 +++++ .../vr/processor/skeleton/SkeletonConfig.java | 45 ++++++++++--------- .../vr/processor/HumanPoseProcessor.java | 6 +++ 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java index 4a032c430..1b318fd9c 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java +++ b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java @@ -127,24 +127,34 @@ public class SkeletonConfigGUI extends EJBagNoStretch { } private void change(SkeletonConfigValue joint, float diff) { + // Update config value float current = server.humanPoseProcessor.getSkeletonConfig(joint); server.humanPoseProcessor.setSkeletonConfig(joint, current + diff); + server.humanPoseProcessor.getSkeletonConfig().saveToConfig(server.config); server.saveConfig(); + + // Update GUI labels.get(joint).setText(StringUtils.prettyNumber((current + diff) * 100, 0)); } private void reset(SkeletonConfigValue joint) { + // Update config value server.humanPoseProcessor.resetSkeletonConfig(joint); + server.humanPoseProcessor.getSkeletonConfig().saveToConfig(server.config); server.saveConfig(); + // Update GUI float current = server.humanPoseProcessor.getSkeletonConfig(joint); labels.get(joint).setText(StringUtils.prettyNumber((current) * 100, 0)); } private void resetAll() { + // Update config value server.humanPoseProcessor.resetAllSkeletonConfigs(); + server.humanPoseProcessor.getSkeletonConfig().saveToConfig(server.config); server.saveConfig(); + // Update GUI refreshAll(); } diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java index 3549dec39..5f41f9e1a 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java @@ -64,29 +64,29 @@ public class SkeletonConfig { } private void callCallbackOnAll(boolean defaultOnly) { + if (callback == null) { + return; + } + for (SkeletonConfigValue config : SkeletonConfigValue.values) { - if (callback != null) { - try { - Float val = configs.get(config); - if (!defaultOnly || val == null) { - callback.updateConfigState(config, val == null ? config.defaultValue : val); - } - } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + try { + Float val = configs.get(config); + if (!defaultOnly || val == null) { + callback.updateConfigState(config, val == null ? config.defaultValue : val); } + } catch (Exception e) { + LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); } } for (SkeletonConfigToggle config : SkeletonConfigToggle.values) { - if (callback != null) { - try { - Boolean val = toggles.get(config); - if (!defaultOnly || val == null) { - callback.updateToggleState(config, val == null ? config.defaultValue : val); - } - } catch (Exception e) { - LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); + try { + Boolean val = toggles.get(config); + if (!defaultOnly || val == null) { + callback.updateToggleState(config, val == null ? config.defaultValue : val); } + } catch (Exception e) { + LogManager.log.severe("[SkeletonConfig] Exception while calling callback", e); } } } @@ -334,13 +334,14 @@ public class SkeletonConfig { } public void saveToConfig(YamlFile config) { - configs.forEach((key, value) -> { - config.setProperty(key.configKey, value); - }); + // Write all possible values, this keeps configs consistent even if defaults were changed + for (SkeletonConfigValue value : SkeletonConfigValue.values) { + config.setProperty(value.configKey, getConfig(value)); + } - toggles.forEach((key, value) -> { - config.setProperty(key.configKey, value); - }); + for (SkeletonConfigToggle value : SkeletonConfigToggle.values) { + config.setProperty(value.configKey, getToggle(value)); + } } public void resetConfigs() { diff --git a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java index ba1b657a3..46c7419d7 100644 --- a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java @@ -5,6 +5,7 @@ import java.util.function.Consumer; import dev.slimevr.vr.processor.skeleton.HumanSkeleton; import dev.slimevr.vr.processor.skeleton.SimpleSkeleton; +import dev.slimevr.vr.processor.skeleton.SkeletonConfig; import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; import io.eiren.util.ann.ThreadSafe; import io.eiren.util.ann.VRServerThread; @@ -62,6 +63,11 @@ public class HumanPoseProcessor { skeleton.resetAllSkeletonConfigs(); } + @ThreadSafe + public SkeletonConfig getSkeletonConfig() { + return skeleton.getSkeletonConfig(); + } + @ThreadSafe public float getSkeletonConfig(SkeletonConfigValue key) { if(skeleton != null) {