Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skeleton Constraints #1222

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
Open

Skeleton Constraints #1222

wants to merge 79 commits into from

Conversation

Stermere
Copy link
Contributor

@Stermere Stermere commented Oct 30, 2024 •
edited
Loading

Adds constraints to the joints of the skeleton allowing for unrealistic joint angles to be clamped to more reasonable values and for extreme drift to be compensated for.

@github-actions github-actions bot added Area: Skeletal Model Deals with the model of the skeleton and its pose Area: Application Protocol Related to communication with apps like the GUI, overlay, games Area: AutoBone The AutoBone feature Area: Translation Improvements or additions to translations Area: Server Related to the server labels Oct 30, 2024
@Stermere Stermere added Priority: Normal The default priority Type: Enhancement Adds or improves a feature Area: Application Protocol Related to communication with apps like the GUI, overlay, games Area: AutoBone The AutoBone feature Area: Translation Improvements or additions to translations and removed Area: Application Protocol Related to communication with apps like the GUI, overlay, games Area: AutoBone The AutoBone feature Area: Translation Improvements or additions to translations labels Oct 31, 2024
@ButterscotchV ButterscotchV added the Status: Blocked by other issue Progress cannot be made until linked issue is resolved label Nov 21, 2024
ButterscotchV
ButterscotchV requested changes Nov 21, 2024
View reviewed changes
Copy link
Member

@ButterscotchV ButterscotchV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking really good, overall good quality code. I think my suggestions could help to keep things maintainable for the future.

server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Bone.kt Outdated Show resolved Hide resolved
Stermere
Stermere commented Nov 29, 2024
View reviewed changes
Copy link
Contributor Author

@Stermere Stermere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hope these changes were what you had in mind! If they are not don't hesitate to let me know.

server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
server/core/src/main/java/dev/slimevr/tracking/processor/skeleton/HumanSkeleton.kt Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Area: GUI Related to the GUI label Nov 29, 2024
@Stermere
Copy link
Contributor Author

I tested not excluding hinge constraints from correction but it causes the lower leg bone to consistently become off-kilter by 5-15 degrees after a little moving around so I am leaving them excluded for now :(

ButterscotchV
ButterscotchV requested changes Dec 3, 2024
View reviewed changes
Copy link
Member

@ButterscotchV ButterscotchV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks much better, see my previous comments as I've replied to some for why changes are requested. P.S. If possible, merging from main is preferred to update PRs after reviews as otherwise it clobbers history, if it's not possible then it's fine, just makes it a little difficult. Perhaps a quick beta can be done with this to ensure none of the changes have broken anything. TY for the fixes!

server/core/src/main/java/dev/slimevr/tracking/processor/Constraint.kt Outdated Show resolved Hide resolved
Stermere and others added 2 commits December 3, 2024 19:42
@Stermere
fix comment
39980fd
@Stermere @ButterscotchV
Update server/core/src/main/java/dev/slimevr/tracking/processor/Const…
561aa38 
…raint.kt

Co-authored-by: Butterscotch! <bscotchvanilla@gmail.com>
@Stermere
Copy link
Contributor Author

Stermere commented Dec 4, 2024

I can merge after reviews in the future, I didn't realize it messed it up until after I did it. I'll make a beta soon, thanks for the suggestions they made the code heaps better!

@Eirenliel
Copy link
Member

Pl.ease rebase SolarXR

@ButterscotchV ButterscotchV mentioned this pull request Dec 8, 2024
Open
@Stermere
Merge branch 'main' into Constraints-only
aafc902 
# Conflicts:
#	server/core/src/main/java/dev/slimevr/protocol/rpc/settings/RPCSettingsBuilder.java
@Stermere
Disable corrections on upper chest tracker
20d9fd0
@ButterscotchV
Copy link
Member

Looks much better, see my previous comments as I've replied to some for why changes are requested. P.S. If possible, merging from main is preferred to update PRs after reviews as otherwise it clobbers history, if it's not possible then it's fine, just makes it a little difficult. Perhaps a quick beta can be done with this to ensure none of the changes have broken anything. TY for the fixes!

Just updating on this, I did test the beta myself and it appears to be fine, personally I think it's good to be merged besides SolarXR issues? Unsure what the status of SolarXR stuff is because I know the spine yaw correct PR got merged first.

@Stermere
Copy link
Contributor Author

Just updating on this, I did test the beta myself and it appears to be fine, personally I think it's good to be merged besides SolarXR issues? Unsure what the status of SolarXR stuff is because I know the spine yaw correct PR got merged first.

Is SolarXR an issue? I belive the unused values for spine yaw comp are just replaced with dummies as of currently.

@ButterscotchV
Copy link
Member

Just updating on this, I did test the beta myself and it appears to be fine, personally I think it's good to be merged besides SolarXR issues? Unsure what the status of SolarXR stuff is because I know the spine yaw correct PR got merged first.

Is SolarXR an issue? I belive the unused values for spine yaw comp are just replaced with dummies as of currently.

SolarXR should be fine yeah I didn't realize Eiren filled it in.

@ImUrX
Copy link
Member

ImUrX commented Dec 20, 2024

please fix lint

@Stermere
Copy link
Contributor Author

please fix lint

Done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ButterscotchV ButterscotchV ButterscotchV approved these changes

@ImUrX ImUrX ImUrX approved these changes

@Eirenliel Eirenliel Eirenliel approved these changes

@Erimelowo Erimelowo Awaiting requested review from Erimelowo Erimelowo is a code owner

@loucass003 loucass003 Awaiting requested review from loucass003

Assignees
No one assigned
Labels
Area: Application Protocol Related to communication with apps like the GUI, overlay, games Area: AutoBone The AutoBone feature Area: GUI Related to the GUI Area: Server Related to the server Area: Skeletal Model Deals with the model of the skeleton and its pose Area: Translation Improvements or additions to translations Priority: Normal The default priority Status: Blocked by other issue Progress cannot be made until linked issue is resolved Type: Enhancement Adds or improves a feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Stermere @Eirenliel @ButterscotchV @ImUrX