From 68164756c21647eaba06f79cc6c882cd8e9155c9 Mon Sep 17 00:00:00 2001 From: ButterscotchVanilla Date: Wed, 8 Dec 2021 19:53:07 -0500 Subject: [PATCH] Add more ways to set SkeletonConfig values --- .../slimevr/vr/processor/SkeletonConfig.java | 96 ++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java b/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java index 852eef74b..54cc2761b 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java @@ -1,9 +1,12 @@ package dev.slimevr.vr.processor; import java.util.EnumMap; +import java.util.Map; import com.jme3.math.Vector3f; +import io.eiren.yaml.YamlFile; + public class SkeletonConfig { protected final EnumMap configs = new EnumMap(SkeletonConfigValue.class); @@ -11,10 +14,17 @@ public class SkeletonConfig { protected final EnumMap nodeOffsets = new EnumMap(SkeletonNodeOffset.class); public SkeletonConfig() { - // Setup node offsets computeAllNodeOffsets(); } + public SkeletonConfig(Map configs, Map toggles) { + setConfigs(configs, toggles); + } + + public SkeletonConfig(SkeletonConfig skeletonConfig) { + setConfigs(skeletonConfig); + } + public Float setConfig(SkeletonConfigValue config, float newValue) { Float origVal = configs.put(config, newValue); @@ -66,6 +76,10 @@ public class SkeletonConfig { } } + protected void setNodeOffset(SkeletonNodeOffset nodeOffset, Vector3f offset) { + setNodeOffset(nodeOffset, offset.x, offset.y, offset.z); + } + public Vector3f getNodeOffset(SkeletonNodeOffset nodeOffset) { return nodeOffsets.getOrDefault(nodeOffset, Vector3f.ZERO); } @@ -115,4 +129,84 @@ public class SkeletonConfig { computeNodeOffset(offset); } } + + public void setConfigs(Map configs, Map toggles) { + if (configs != null) { + this.configs.putAll(configs); + } + + if (toggles != null) { + this.toggles.putAll(toggles); + } + + computeAllNodeOffsets(); + } + + public void setConfigs(SkeletonConfig skeletonConfig) { + setConfigs(skeletonConfig.configs, skeletonConfig.toggles); + } + + //#region Cast utilities for config reading + private static Float castFloat(Object o) { + if(o == null) { + return null; + } else if(o instanceof Float) { + return (Float) o; + } else if(o instanceof Double) { + return ((Double) o).floatValue(); + } else if(o instanceof Byte) { + return (float) (Byte) o; + } else if(o instanceof Integer) { + return (float) (Integer) o; + } else if(o instanceof Long) { + return (float) (Long) o; + } else { + return null; + } + } + + private static Boolean castBoolean(Object o) { + if(o == null) { + return null; + } else if(o instanceof Boolean) { + return (Boolean) o; + } else { + return null; + } + } + //#endregion + + public void loadFromConfig(YamlFile config) { + for (SkeletonConfigValue configValue : SkeletonConfigValue.values) { + Float val = castFloat(config.getProperty(configValue.configKey)); + if (val != null) { + configs.put(configValue, val); + } + } + + for (SkeletonConfigToggle configValue : SkeletonConfigToggle.values) { + Boolean val = castBoolean(config.getProperty(configValue.configKey)); + if (val != null) { + toggles.put(configValue, val); + } + } + + computeAllNodeOffsets(); + } + + public void saveToConfig(YamlFile config) { + configs.forEach((key, value) -> { + config.setProperty(key.configKey, value); + }); + + toggles.forEach((key, value) -> { + config.setProperty(key.configKey, value); + }); + } + + public void resetConfigs() { + configs.clear(); + toggles.clear(); + computeAllNodeOffsets(); + } }