diff --git a/server/src/main/java/dev/slimevr/autobone/errors/proportions/RangeProportionLimiter.kt b/server/src/main/java/dev/slimevr/autobone/errors/proportions/RangeProportionLimiter.kt index 1d1a57578..7a3bdafd2 100644 --- a/server/src/main/java/dev/slimevr/autobone/errors/proportions/RangeProportionLimiter.kt +++ b/server/src/main/java/dev/slimevr/autobone/errors/proportions/RangeProportionLimiter.kt @@ -19,12 +19,11 @@ class RangeProportionLimiter : HardProportionLimiter { boneLengthFunction: Function, range: Float, ) : super(targetRatio, boneLengthFunction) { - var range = range + val absRange = FastMath.abs(range) // Handle if someone puts in a negative value - range = FastMath.abs(range) - targetPositiveRange = range - targetNegativeRange = -range + targetPositiveRange = absRange + targetNegativeRange = -absRange } /** @@ -50,8 +49,8 @@ class RangeProportionLimiter : HardProportionLimiter { targetNegativeRange = negativeRange } - override fun getProportionError(config: HumanPoseManager, height: Float): Float { - val boneLength = boneLengthFunction.apply(config) + override fun getProportionError(humanPoseManager: HumanPoseManager, height: Float): Float { + val boneLength = boneLengthFunction.apply(humanPoseManager) val ratioOffset = targetRatio - boneLength / height // If the range is exceeded, return the offset from the range limit diff --git a/server/src/main/java/dev/slimevr/config/AutoBoneConfig.java b/server/src/main/java/dev/slimevr/config/AutoBoneConfig.java deleted file mode 100644 index 499473f76..000000000 --- a/server/src/main/java/dev/slimevr/config/AutoBoneConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -package dev.slimevr.config; - -public class AutoBoneConfig { - - public int cursorIncrement = 2; - public int minDataDistance = 1; - public int maxDataDistance = 1; - - public int numEpochs = 100; - - public int printEveryNumEpochs = 25; - - public float initialAdjustRate = 10f; - public float adjustRateMultiplier = 0.995f; - - public float slideErrorFactor = 0.0f; - public float offsetSlideErrorFactor = 2.0f; - public float footHeightOffsetErrorFactor = 0.0f; - public float bodyProportionErrorFactor = 0.825f; - public float heightErrorFactor = 0.0f; - public float positionErrorFactor = 0.0f; - public float positionOffsetErrorFactor = 0.0f; - - public boolean calcInitError = false; - public float targetHeight = -1; - - public boolean randomizeFrameOrder = true; - public boolean scaleEachStep = true; - - public int sampleCount = 1000; - public long sampleRateMs = 20; - - public boolean saveRecordings = false; - - public AutoBoneConfig() { - } -} diff --git a/server/src/main/java/dev/slimevr/config/AutoBoneConfig.kt b/server/src/main/java/dev/slimevr/config/AutoBoneConfig.kt new file mode 100644 index 000000000..9f9fdc876 --- /dev/null +++ b/server/src/main/java/dev/slimevr/config/AutoBoneConfig.kt @@ -0,0 +1,25 @@ +package dev.slimevr.config + +class AutoBoneConfig { + var cursorIncrement = 2 + var minDataDistance = 1 + var maxDataDistance = 1 + var numEpochs = 100 + var printEveryNumEpochs = 25 + var initialAdjustRate = 10f + var adjustRateMultiplier = 0.995f + var slideErrorFactor = 0.0f + var offsetSlideErrorFactor = 2.0f + var footHeightOffsetErrorFactor = 0.0f + var bodyProportionErrorFactor = 0.825f + var heightErrorFactor = 0.0f + var positionErrorFactor = 0.0f + var positionOffsetErrorFactor = 0.0f + var calcInitError = false + var targetHeight = -1f + var randomizeFrameOrder = true + var scaleEachStep = true + var sampleCount = 1000 + var sampleRateMs: Long = 20 + var saveRecordings = false +} diff --git a/server/src/main/java/dev/slimevr/config/VRConfig.java b/server/src/main/java/dev/slimevr/config/VRConfig.java index f4ef33b3c..16ba255a1 100644 --- a/server/src/main/java/dev/slimevr/config/VRConfig.java +++ b/server/src/main/java/dev/slimevr/config/VRConfig.java @@ -30,7 +30,7 @@ public class VRConfig { private final VMCConfig vmc = new VMCConfig(); - private final AutoBoneConfig autobone = new AutoBoneConfig(); + private final AutoBoneConfig autoBone = new AutoBoneConfig(); private final KeybindingsConfig keybindings = new KeybindingsConfig(); @@ -105,7 +105,7 @@ public class VRConfig { } public AutoBoneConfig getAutoBone() { - return autobone; + return autoBone; } public KeybindingsConfig getKeybindings() {