fix(osc): only read the OSC JSON config if oscquery isn't in use #300
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
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.
In #215 the behavior of parameter loading was adjusted to use the OSC JSON config if an avatar change was triggered from the
/avatar/changeOSC message. This allows things like av3emulator to work, but introduces a regression because VRCFT will now only load the parameter list from oscquery on initial startup. Future avatar changes are instead loaded from the OSC configs, with all of the associated pitfalls (resetting OSC configs, etc).Additionally, ChilloutVR is adding oscquery support, and this is a blocker for VRCFT to work for them due to the OSC configs being VRChat specific.
This change will revert to using oscquery for parameter loading iff VRChat-compatible oscquery is detected. If oscquery is not detected (av3emulator, Resonite mod, etc) it will read the parameters from the OSC configs. This was successfully tested on: