Allow partial/separate resets for feet and fingers #1441
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Erimelowo
requested review from
ButterscotchV,
Eirenliel,
ImUrX and
loucass003
as code owners
github-actions
bot
added
Area: Skeletal Model
loucass003
approved these changes
May 21, 2025
ImUrX
requested changes
May 21, 2025
Comment on lines
139
to
231
| fun isThigh(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.LEFT_UPPER_LEG || | ||
| it == TrackerPosition.RIGHT_UPPER_LEG | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isLeftArm(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.LEFT_SHOULDER || | ||
| it == TrackerPosition.LEFT_UPPER_ARM || | ||
| it == TrackerPosition.LEFT_LOWER_ARM || | ||
| it == TrackerPosition.LEFT_HAND | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isRightArm(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.RIGHT_SHOULDER || | ||
| it == TrackerPosition.RIGHT_UPPER_ARM || | ||
| it == TrackerPosition.RIGHT_LOWER_ARM || | ||
| it == TrackerPosition.RIGHT_HAND | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isLeftLowerArm(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.LEFT_LOWER_ARM || | ||
| it == TrackerPosition.LEFT_HAND | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isRightLowerArm(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.RIGHT_LOWER_ARM || | ||
| it == TrackerPosition.RIGHT_HAND | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isFoot(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.LEFT_FOOT || | ||
| it == TrackerPosition.RIGHT_FOOT | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isLeftFinger(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.LEFT_THUMB_METACARPAL || | ||
| it == TrackerPosition.LEFT_THUMB_PROXIMAL || | ||
| it == TrackerPosition.LEFT_THUMB_DISTAL || | ||
| it == TrackerPosition.LEFT_INDEX_PROXIMAL || | ||
| it == TrackerPosition.LEFT_INDEX_INTERMEDIATE || | ||
| it == TrackerPosition.LEFT_INDEX_DISTAL || | ||
| it == TrackerPosition.LEFT_MIDDLE_PROXIMAL || | ||
| it == TrackerPosition.LEFT_MIDDLE_INTERMEDIATE || | ||
| it == TrackerPosition.LEFT_MIDDLE_DISTAL || | ||
| it == TrackerPosition.LEFT_RING_PROXIMAL || | ||
| it == TrackerPosition.LEFT_RING_INTERMEDIATE || | ||
| it == TrackerPosition.LEFT_RING_DISTAL || | ||
| it == TrackerPosition.LEFT_LITTLE_PROXIMAL || | ||
| it == TrackerPosition.LEFT_LITTLE_INTERMEDIATE || | ||
| it == TrackerPosition.LEFT_LITTLE_DISTAL | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| fun isRightFinger(trackerPosition: TrackerPosition?): Boolean { | ||
| trackerPosition?.let { | ||
| return it == TrackerPosition.RIGHT_THUMB_METACARPAL || | ||
| it == TrackerPosition.RIGHT_THUMB_PROXIMAL || | ||
| it == TrackerPosition.RIGHT_THUMB_DISTAL || | ||
| it == TrackerPosition.RIGHT_INDEX_PROXIMAL || | ||
| it == TrackerPosition.RIGHT_INDEX_INTERMEDIATE || | ||
| it == TrackerPosition.RIGHT_INDEX_DISTAL || | ||
| it == TrackerPosition.RIGHT_MIDDLE_PROXIMAL || | ||
| it == TrackerPosition.RIGHT_MIDDLE_INTERMEDIATE || | ||
| it == TrackerPosition.RIGHT_MIDDLE_DISTAL || | ||
| it == TrackerPosition.RIGHT_RING_PROXIMAL || | ||
| it == TrackerPosition.RIGHT_RING_INTERMEDIATE || | ||
| it == TrackerPosition.RIGHT_RING_DISTAL || | ||
| it == TrackerPosition.RIGHT_LITTLE_PROXIMAL || | ||
| it == TrackerPosition.RIGHT_LITTLE_INTERMEDIATE || | ||
| it == TrackerPosition.RIGHT_LITTLE_DISTAL | ||
| } | ||
| return false | ||
| } |
There was a problem hiding this comment.
maybe this should be a member function on the enum?
ofc it wont be usable with null object but it will be much easier to read
TrackerPosition.isLeftArm(tracker.trackerPosition)
// or
tracker.trackerPosition != null &&
(tracker.trackerPosition.isLeftArm() || tracker.trackerPosition.isLeftFinger()) or if you dont want to check for null, just make it an extension function
fun TrackerPosition?.isLeftArm(): boolean {
this?.let {
return true
}
return false
}
tracker.trackerPosition.isLeftArm()There was a problem hiding this comment.
Done with extension functions in 2a6870e
ImUrX
approved these changes
Jun 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds an array on every reset used to specify which trackers should be reset.
If the array is empty, the server will decide which trackers will be reset (all except fingers and feet during mounting basically).
This deprecates the feet reset feature since I believe it is much better to keep it a separate mounting reset.
This is also backwards compatible.
Needs SlimeVR/SolarXR-Protocol#173