-
-
Notifications
You must be signed in to change notification settings - Fork 236
Add Velocity calculation logic and GUI toggle (end-to-end MVP). #1753
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.
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
Open
M1DNYT3
wants to merge
12
commits into
SlimeVR:main
Choose a base branch
from
M1DNYT3:velocity-mvp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
6577987
Add Velocity transmission toggle and calculation logic.
M1DNYT3 15aa4f4
Add Velocity data send via ProtobufBridge. Update ProtobufMessages to…
M1DNYT3 369991a
Added velocity transmission toggle to GUI and RPC (NaLo support)
M1DNYT3 3a53ccc
Remove applyVelocityPolicyTo(), Replace System.nanoTime with Timesour…
M1DNYT3 40089e0
Add build stubs for solarxr-protocol schema additions pending #1811
M1DNYT3 3d111ab
Add FBT jitter warning to velocity settings description
M1DNYT3 6427535
Fix RPC velocity toggle state being sent to response instead of request
M1DNYT3 cfab5bc
Review: Inlined velocity policy, non-nullable velocityState, markNow …
M1DNYT3 c8ad726
Review: velocityState direct use and change to val
M1DNYT3 c2c6675
Solar: sync with the updated head
M1DNYT3 ec178b6
Update solarxr to track main.
M1DNYT3 76d087e
Review: rename updateTrackersVelocityPolicy and rephrase updateDerive…
M1DNYT3 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
19 changes: 19 additions & 0 deletions
19
server/core/src/main/java/dev/slimevr/config/VelocityConfig.kt
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package dev.slimevr.config | ||
|
|
||
| import dev.slimevr.VRServer | ||
|
|
||
| /** | ||
| * Allows to enable/disable sending of optional derived velocity data via Protobuf. | ||
| * Enables Natural Locomotion Support | ||
| * May create overprediction in certain titles causing excessive jitter when moving upper body. | ||
| */ | ||
| class VelocityConfig { | ||
| // Disables derived velocity for all trackers. Driver zeroes out velocity if nothing is returned in protobuf message. | ||
| var sendDerivedVelocity: Boolean = false | ||
|
|
||
| fun updateTrackersVelocitySettings() { | ||
| for (t in VRServer.instance.allTrackers) { | ||
| t.allowVelocity = sendDerivedVelocity | ||
| } | ||
| } | ||
| } |
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be shortened
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why this is not showing up as an outdated comment, and also doesn't show up in the diff for the PR.
If looking directly at my base branch, you can see the update: https://github.com/M1DNYT3/SlimeVR-Server-NaLo-Support/blob/c9c750230ea73da399fbad0276fd919647b8bea8/server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt#L369
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hell, even a rebase didn't help. Seems like an issue on GitHub's end.
Anyway, both comments are addressed and the branch is rebased to the latest main, so the merge should be clean now.