From dfd5ceca426220d8407d90f6328ba6fde211b37c Mon Sep 17 00:00:00 2001 From: loucass003 Date: Thu, 10 Sep 2026 08:23:17 +0200 Subject: [PATCH] Make Foot shift able to go negative --- .../core/src/main/java/dev/slimevr/skeleton/proportions.kt | 5 +++-- .../java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt b/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt index 28e511554..3b962f6b5 100644 --- a/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt +++ b/server/core/src/main/java/dev/slimevr/skeleton/proportions.kt @@ -65,7 +65,8 @@ private val BONE_VALUE_TO_HEAD_OFFSETS: Map> ) // Inverts an offset table so a resolved offset vector can be turned back into a SkeletonBone value. -// The vector is inverted too ((vec/len)/len == 1/vec) so hadamard + len recovers the scalar. +// Each direction is divided by its squared length so a dot product with the resolved offset +// recovers the signed scalar. private fun invertOffsetTable(table: Map>): BodyPartMap> = BodyPartMap( table .flatMap { (cfg, bones) -> bones.map { (bone, vec) -> bone to (cfg to vec / vec.lenSq()) } } @@ -132,7 +133,7 @@ fun toBoneOffsets(lengths: Map): BoneOffsets { fun toBoneValues(tailOffsets: BodyPartMap, headOffsets: BodyPartMap): Map { fun invert(offsets: BodyPartMap, table: BodyPartMap>) = offsets.flatMap { (bone, vec) -> - table[bone]?.map { (cfg, cfgVec) -> cfg to vec.hadamard(cfgVec).len() } ?: emptyList() + table[bone]?.map { (cfg, cfgVec) -> cfg to vec.dot(cfgVec) } ?: emptyList() } return (invert(tailOffsets, BONE_OFFSET_TO_VALUES) + invert(headOffsets, BONE_HEAD_OFFSET_TO_VALUES)) diff --git a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt index 159c501eb..ece5203fd 100644 --- a/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt +++ b/server/core/src/main/java/dev/slimevr/solarxr/rpc/skeleton-proportions.kt @@ -27,6 +27,9 @@ import solarxr_protocol.rpc.SkeletonProportionsResponse private const val MIN_HEIGHT = 0.9f +// Bones whose value is a signed offset rather than a length, so negatives are valid. +private val SIGNED_BONES = setOf(SkeletonBone.FOOT_SHIFT) + class SkeletonProportionsBehaviour( private val userConfig: UserConfig, private val skeleton: Skeleton, @@ -82,7 +85,7 @@ class SkeletonProportionsBehaviour( receiver.rpcDispatcher.on { req -> val bone = req.bone if (bone == SkeletonBone.NONE) return@on - val value = req.value.coerceAtLeast(0f) + val value = if (bone in SIGNED_BONES) req.value else req.value.coerceAtLeast(0f) userConfig.context.dispatch(UserConfigActions.Update { copy(proportions = proportions + (bone.name to value)) }) }.launchIn(receiver.context.scope)