OSCQuery support #958
Open
OSCQuery support #958
Conversation
This file contains 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
|
I'm in pain |
Erimelowo
requested review from
ButterscotchV,
Eirenliel and
ImUrX
as code owners
ImUrX
requested changes
May 10, 2024
| @@ -100,6 +102,8 @@ class VRServer @JvmOverloads constructor( | |||
|
|
|||
| init { | |||
| // UwU | |||
| instance = this | |||
There was a problem hiding this comment.
what was the reason this was moved to the start instead of waiting for everything to initialize and then let instance be?
There was a problem hiding this comment.
This was for referencing vrserver as latestart or something.
Comment on lines
+122
to
+125
| "[VMCHandler] Error listening to the port " + | ||
| portIn + | ||
| ": " + | ||
| e, |
There was a problem hiding this comment.
why, why return to monke
Suggested change
| "[VMCHandler] Error listening to the port " + | |
| portIn + | |
| ": " + | |
| e, | |
| "[VMCHandler] Error listening to the port $portIn: $e", |
Comment on lines
+162
to
+165
| "[VMCHandler] Sending to port " + | ||
| portOut + | ||
| " at address " + | ||
| address, |
There was a problem hiding this comment.
😭
Suggested change
| "[VMCHandler] Sending to port " + | |
| portOut + | |
| " at address " + | |
| address, | |
| "[VMCHandler] Sending to port $portOut at address $address", |
Comment on lines
+176
to
+181
| "[VMCHandler] Error connecting to port " + | ||
| portOut + | ||
| " at the address " + | ||
| address + | ||
| ": " + | ||
| e, |
There was a problem hiding this comment.
🔪
Suggested change
| "[VMCHandler] Error connecting to port " + | |
| portOut + | |
| " at the address " + | |
| address + | |
| ": " + | |
| e, | |
| "[VMCHandler] Error connecting to port $portOut at the address $address: $e", |
Comment on lines
+364
to
+376
| val boneType = unityBone.boneType | ||
| if (boneType != null) { | ||
| // Get SlimeVR bone | ||
| val bone = humanPoseManager.getBone(boneType) | ||
|
|
||
| // Update unity hierarchy from bone's global | ||
| // rotation | ||
| outputUnityArmature!! | ||
| .setGlobalRotationForBone( | ||
| unityBone, | ||
| bone.getGlobalRotation().times(bone.rotationOffset.inv()), | ||
| ) | ||
| } |
There was a problem hiding this comment.
WHY IS THE CODE GETTING WORST
Suggested change
| val boneType = unityBone.boneType | |
| if (boneType != null) { | |
| // Get SlimeVR bone | |
| val bone = humanPoseManager.getBone(boneType) | |
| // Update unity hierarchy from bone's global | |
| // rotation | |
| outputUnityArmature!! | |
| .setGlobalRotationForBone( | |
| unityBone, | |
| bone.getGlobalRotation().times(bone.rotationOffset.inv()), | |
| ) | |
| } | |
| val boneType = unityBone.boneType ?: continue | |
| // Get SlimeVR bone | |
| val bone = humanPoseManager.getBone(boneType) | |
| // Update unity hierarchy from bone's global | |
| // rotation | |
| outputUnityArmature!! | |
| .setGlobalRotationForBone( | |
| unityBone, | |
| bone.getGlobalRotation() * bone.rotationOffset.inv(), | |
| ) |
Comment on lines
+384
to
+391
| val upperLegsAverage = outputUnityArmature | ||
| ?.getHeadNodeOfBone(UnityBone.LEFT_UPPER_LEG) | ||
| ?.worldTransform | ||
| ?.translation | ||
| ?.plus( | ||
| outputUnityArmature!!.getHeadNodeOfBone(UnityBone.RIGHT_UPPER_LEG)!!.worldTransform | ||
| .translation, | ||
| )?.times(0.5f) |
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.
OSCQuery allows VRChat's ports and address to be automatically detected.
It also allows SlimeVR to advertise that it wants head and controller data and for VRChat to send it to us.