From 3f022cd09e50b98a83fc0971bd7dd70392abfa36 Mon Sep 17 00:00:00 2001 From: Erimel Date: Sat, 3 Dec 2022 01:13:47 -0500 Subject: [PATCH] add hands to gui steamvr checkboxes (#331) --- .../settings/pages/GeneralSettings.tsx | 10 ++++++++++ .../rpc/settings/RPCSettingsBuilder.java | 17 ++++++++++++----- .../rpc/settings/RPCSettingsHandler.java | 2 ++ solarxr-protocol | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/gui/src/components/settings/pages/GeneralSettings.tsx b/gui/src/components/settings/pages/GeneralSettings.tsx index 0859a9af9..d1eff0ffe 100644 --- a/gui/src/components/settings/pages/GeneralSettings.tsx +++ b/gui/src/components/settings/pages/GeneralSettings.tsx @@ -30,6 +30,7 @@ interface SettingsForm { feet: boolean; knees: boolean; elbows: boolean; + hands: boolean; }; filtering: { type: number; @@ -63,6 +64,7 @@ export function GeneralSettings() { elbows: false, knees: false, feet: false, + hands: false, }, toggles: { extendedSpine: true, @@ -87,6 +89,7 @@ export function GeneralSettings() { trackers.feet = values.trackers.feet; trackers.knees = values.trackers.knees; trackers.elbows = values.trackers.elbows; + trackers.hands = values.trackers.hands; settings.steamVrTrackers = trackers; } @@ -226,6 +229,13 @@ export function GeneralSettings() { name="trackers.elbows" label="Elbows" /> + diff --git a/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java b/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java index 04e4e56d5..3ae974f14 100644 --- a/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java +++ b/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java @@ -31,10 +31,14 @@ public class RPCSettingsBuilder { config.getOSCTrackerRole(TrackerRole.HEAD, false), config.getOSCTrackerRole(TrackerRole.CHEST, false), config.getOSCTrackerRole(TrackerRole.WAIST, false), - config.getOSCTrackerRole(TrackerRole.LEFT_KNEE, false), - config.getOSCTrackerRole(TrackerRole.LEFT_FOOT, false), - config.getOSCTrackerRole(TrackerRole.LEFT_ELBOW, false), + config.getOSCTrackerRole(TrackerRole.LEFT_KNEE, false) + && config.getOSCTrackerRole(TrackerRole.RIGHT_KNEE, false), + config.getOSCTrackerRole(TrackerRole.LEFT_FOOT, false) + && config.getOSCTrackerRole(TrackerRole.RIGHT_FOOT, false), + config.getOSCTrackerRole(TrackerRole.LEFT_ELBOW, false) + && config.getOSCTrackerRole(TrackerRole.RIGHT_ELBOW, false), config.getOSCTrackerRole(TrackerRole.LEFT_HAND, false) + && config.getOSCTrackerRole(TrackerRole.RIGHT_HAND, false) ); int addressStringOffset = fbb.createString(config.getAddress()); @@ -81,7 +85,9 @@ public class RPCSettingsBuilder { bridge.getShareSetting(TrackerRole.LEFT_KNEE) && bridge.getShareSetting(TrackerRole.RIGHT_KNEE), bridge.getShareSetting(TrackerRole.LEFT_ELBOW) - && bridge.getShareSetting(TrackerRole.RIGHT_ELBOW) + && bridge.getShareSetting(TrackerRole.RIGHT_ELBOW), + bridge.getShareSetting(TrackerRole.LEFT_HAND) + && bridge.getShareSetting(TrackerRole.RIGHT_HAND) ); } return steamvrTrackerSettings; @@ -108,6 +114,7 @@ public class RPCSettingsBuilder { config.getValue(SkeletonConfigValues.HIP_LEGS_AVERAGING), config.getValue(SkeletonConfigValues.KNEE_TRACKER_ANKLE_AVERAGING) ); - return ModelSettings.createModelSettings(fbb, togglesOffset, ratiosOffset); + // TODO: legtweaks amount in protocol + return ModelSettings.createModelSettings(fbb, togglesOffset, ratiosOffset, 0); } } diff --git a/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.java b/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.java index a3a12ed68..6c67d345a 100644 --- a/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.java +++ b/server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.java @@ -83,6 +83,8 @@ public record RPCSettingsHandler(RPCHandler rpcHandler, ProtocolAPI api) { bridge.changeShareSettings(TrackerRole.RIGHT_KNEE, req.steamVrTrackers().knees()); bridge.changeShareSettings(TrackerRole.LEFT_ELBOW, req.steamVrTrackers().elbows()); bridge.changeShareSettings(TrackerRole.RIGHT_ELBOW, req.steamVrTrackers().elbows()); + bridge.changeShareSettings(TrackerRole.LEFT_HAND, req.steamVrTrackers().hands()); + bridge.changeShareSettings(TrackerRole.RIGHT_HAND, req.steamVrTrackers().hands()); } } diff --git a/solarxr-protocol b/solarxr-protocol index cc6be7999..724e50346 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit cc6be79999fe2d50e4a8b29680f6cc69c594eb1f +Subproject commit 724e50346839b7dcd7c858f185e9ddcb9711e343