Skip to content

Don't send VRChat OSC data when the SteamVR driver is connected #1826

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

Open
ImSapphire wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't send VRChat OSC data when the SteamVR driver is connected #1826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions server/core/src/main/java/dev/slimevr/osc/VRCOSCHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.illposed.osc.transport.OSCPortOut
import com.jme3.math.FastMath
import com.jme3.system.NanoTimer
import dev.slimevr.VRServer
import dev.slimevr.bridge.ISteamVRBridge
import dev.slimevr.config.VRCOSCConfig
import dev.slimevr.tracking.trackers.Device
import dev.slimevr.tracking.trackers.Tracker
Expand Down Expand Up @@ -76,6 +77,14 @@ class VRCOSCHandler(
refreshSettings(false)
}

internal fun enabled(): Boolean {
val bridge = server.getVRBridge {
it is ISteamVRBridge
} as? ISteamVRBridge

return (bridge == null || !bridge.isConnected()) && config.enabled
}

override fun refreshSettings(refreshRouterSettings: Boolean) {
// Sets which trackers are enabled and force head and hands to false
for (i in computedTrackers.indices) {
Expand All @@ -93,7 +102,7 @@ class VRCOSCHandler(
updateOscReceiver(config.portIn, vrsystemTrackersAddresses + oscTrackersAddresses)
updateOscSender(config.portOut, config.address)

if (config.enabled && config.oscqueryEnabled) {
if (enabled() && config.oscqueryEnabled) {
if (vrcOscQueryHandler == null) {
try {
vrcOscQueryHandler = VRCOSCQueryHandler(server, this)
Expand Down Expand Up @@ -142,7 +151,7 @@ class VRCOSCHandler(
* Adds an OSC Sender from OSCQuery
*/
fun addOSCQuerySender(oscPortOut: Int, oscIP: String) {
if (!config.enabled) {
if (!enabled()) {
closeOscQuerySender()
return
}
Expand Down Expand Up @@ -236,7 +245,7 @@ class VRCOSCHandler(
}

override fun updateOscReceiver(portIn: Int, oscAddresses: Array<String>) {
if (!config.enabled) {
if (!enabled()) {
closeOscReceiver()
return
}
Expand Down Expand Up @@ -274,7 +283,7 @@ class VRCOSCHandler(
}

override fun updateOscSender(portOut: Int, ip: String) {
if (!config.enabled) {
if (!enabled()) {
closeOscSender()
return
}
Expand Down Expand Up @@ -504,7 +513,7 @@ class VRCOSCHandler(
}

override fun update() {
if (!config.enabled) {
if (!enabled()) {
return
}

Expand Down