github/SlimeVR-Server
1
1
Fork 0
mirror of https://github.com/SlimeVR/SlimeVR-Server.git synced 2026-04-06 02:01:58 +02:00
Code Issues 161 Packages Projects Releases Wiki Activity

add hands to gui steamvr checkboxes (#331)

Browse Source
This commit is contained in:
Erimel
2022-12-03 01:13:47 -05:00
committed by GitHub
parent 78f9780147
commit 3f022cd09e
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/src/components/settings/pages/GeneralSettings.tsx
View File

@@ -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"
/>
<CheckBox
variant="toggle"
outlined
control={control}
name="trackers.hands"
label="Hands"
/>
</div>
</>
</SettingsPageLayout>

17
server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java
View File

@@ -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);
}
}

2
server/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsHandler.java
View File

@@ -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());
}
}

2
solarxr-protocol

Submodule solarxr-protocol updated: cc6be79999...724e503468