Feature/etvr module support#106
Merged
lorow merged 33 commits intoEyeTrackVR:v2.0-beta-feature-branchfrom Jul 4, 2024
Merged
Conversation
77e2331 to
a0b8b3f
Compare
b0641b0 to
1e6fced
Compare
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
NOTE: I brought back the entire old OSC implementation as a live reference, this will be removed once I'm done. This also lays ground for other modes as they're pretty similar # TODO: # - there's ghosts in the machine - vrc osc is not working properly # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
…ig sends everything changed anyway, sunset the idea of using single client and thus simplify the code a bit # TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
# TODO: # - min/maxing will require field combinators in the modules lmao
…Receiver # TODO: # - min/maxing will require field combinators in the modules lmao
3c729b1 to
3d7b5bc
Compare
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
1 participant
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.
Description
Refactors completely OSC and adds support for the VRCFT module
Changes done:
To explain a bit how the new architecture works.
We have now one main OSCManager, its role is to coordinate dispatching OSC messages to anything that needs them, and to listen and react to any incoming OSC messages. This is done using two other components. An OSCSender, and an OSCReceiver. It's one additional purpose is to serve as a proxy for registering callbacks for the OSCReceiver.
Basically, the OSCManager's role boils down to setting up a sender and a receiver component, spinning their threads and coordinating them, restarting them if need be.
Actual sending of messages is coordinated by the OSCSender component, it's responsible for listening to the passed down by OSCManager queue and dispatching the given message to a concrete sender. It does so based on the message type.
Right now, we implement two senders. VRChatOSCSender and VRCFTModuleSender, their purpose is to take the message and some context, transform the message into OSC messages the receiver expects and send them.
As for the receiving.
That's done by the OSCReceiver, it listens for any incoming messages, checks if they're valid and sends them to the interested receiver as a OSCMessage data object. Callbacks themselves are responsible for deciding if they want to engage with the given message.
To register a callback, the service must define the address it wishes to receive messages from, and the function to call. For example:
Checklist