mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 09:01:20 -08:00
Remove vertical foot offset
Only keep skeleton offset
This commit is contained in:
1 parent
566df6793c
commit
b98eafb66f
4 files changed
+7
-18
No files matched your search
@@ -135,9 +135,7 @@ public class AutoBone {
|
||||
|
||||
// Keep "feet" at ankles
|
||||
staticConfigs.put(SkeletonConfigValue.FOOT_LENGTH, 0f);
|
||||
staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET_Y, 0f);
|
||||
staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET_Z, 0f);
|
||||
|
||||
staticConfigs.put(SkeletonConfigValue.FOOT_OFFSET, 0f);
|
||||
staticConfigs.put(SkeletonConfigValue.SKELETON_OFFSET, 0f);
|
||||
}
|
||||
|
||||
|
||||
@@ -624,12 +624,7 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb
|
||||
rightFootNode.update();
|
||||
updateComputedTrackers();
|
||||
break;
|
||||
case FOOT_OFFSET_Y:
|
||||
trackerLeftFootNode.update();
|
||||
trackerRightFootNode.update();
|
||||
updateComputedTrackers();
|
||||
break;
|
||||
case FOOT_OFFSET_Z:
|
||||
case FOOT_OFFSET:
|
||||
leftAnkleNode.update();
|
||||
rightAnkleNode.update();
|
||||
updateComputedTrackers();
|
||||
@@ -698,11 +693,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb
|
||||
case FOOT_LENGTH:
|
||||
skeletonConfig.setConfig(SkeletonConfigValue.FOOT_LENGTH, null);
|
||||
break;
|
||||
case FOOT_OFFSET_Y:
|
||||
skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET_Y, null);
|
||||
break;
|
||||
case FOOT_OFFSET_Z:
|
||||
skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET_Z, null);
|
||||
case FOOT_OFFSET:
|
||||
skeletonConfig.setConfig(SkeletonConfigValue.FOOT_OFFSET, null);
|
||||
break;
|
||||
case SKELETON_OFFSET:
|
||||
skeletonConfig.setConfig(SkeletonConfigValue.SKELETON_OFFSET, null);
|
||||
|
||||
@@ -243,13 +243,13 @@ public class SkeletonConfig {
|
||||
setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET));
|
||||
break;
|
||||
case ANKLE:
|
||||
setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.KNEE_HEIGHT), -getConfig(SkeletonConfigValue.FOOT_OFFSET_Z));
|
||||
setNodeOffset(nodeOffset, 0, -getConfig(SkeletonConfigValue.KNEE_HEIGHT), -getConfig(SkeletonConfigValue.FOOT_OFFSET));
|
||||
break;
|
||||
case FOOT:
|
||||
setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.FOOT_LENGTH));
|
||||
break;
|
||||
case FOOT_TRACKER:
|
||||
setNodeOffset(nodeOffset, 0, getConfig(SkeletonConfigValue.FOOT_OFFSET_Y), -getConfig(SkeletonConfigValue.SKELETON_OFFSET));
|
||||
setNodeOffset(nodeOffset, 0, 0, -getConfig(SkeletonConfigValue.SKELETON_OFFSET));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,8 +15,7 @@ public enum SkeletonConfigValue {
|
||||
LEGS_LENGTH("Legs length", "legsLength", "Legs length", 0.86f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE}),
|
||||
KNEE_HEIGHT("Knee height", "kneeHeight", "Knee height", 0.43f, new SkeletonNodeOffset[]{SkeletonNodeOffset.KNEE, SkeletonNodeOffset.ANKLE}),
|
||||
FOOT_LENGTH("Foot length", "footLength", "Foot length", 0.05f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT}),
|
||||
FOOT_OFFSET_Y("Foot offset y", "footOffsetY", "Foot offset y", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.FOOT_TRACKER}),
|
||||
FOOT_OFFSET_Z("Foot offset z", "footOffsetZ", "Foot offset z", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ANKLE}),
|
||||
FOOT_OFFSET("Foot offset", "footOffset", "Foot offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.ANKLE}),
|
||||
SKELETON_OFFSET("Skeleton offset", "skeletonOffset", "Skeleton offset", 0.0f, new SkeletonNodeOffset[]{SkeletonNodeOffset.CHEST_TRACKER, SkeletonNodeOffset.HIP_TRACKER, SkeletonNodeOffset.KNEE_TRACKER, SkeletonNodeOffset.FOOT_TRACKER}),
|
||||
;
|
||||
|
||||
|
||||
Reference in new issue
Block a user