Improve HMD handling (#801)

This commit is contained in:
Erimel authored and GitHub committed 2023-08-09 13:33:02 -04:00
1 parent f343b0e80c
commit cdb4d15d60
8 files changed
+67 -87

No files matched your search

@@ -145,7 +145,6 @@ fun main(args: Array<String>) {
fun provideSteamVRBridge(
server: VRServer,
hmdTracker: Tracker,
computedTrackers: List<Tracker>,
): ISteamVRBridge? {
val driverBridge: SteamVRBridge?
@@ -153,7 +152,6 @@ fun provideSteamVRBridge(
// Create named pipe bridge for SteamVR driver
driverBridge = WindowsNamedPipeBridge(
server,
hmdTracker,
"steamvr",
"SteamVR Driver Bridge",
"""\\.\pipe\SlimeVRDriver""",
@@ -164,7 +162,6 @@ fun provideSteamVRBridge(
try {
linuxBridge = UnixSocketBridge(
server,
hmdTracker,
"steamvr",
"SteamVR Driver Bridge",
Paths.get(OperatingSystem.tempDirectory, "SlimeVRDriver")
@@ -201,29 +198,30 @@ fun provideFeederBridge(
server: VRServer,
): ISteamVRBridge? {
val feederBridge: SteamVRBridge?
if (OperatingSystem.currentPlatform == OperatingSystem.WINDOWS) {
// Create named pipe bridge for SteamVR input
// TODO: how do we want to handle HMD input from the feeder app?
feederBridge = WindowsNamedPipeBridge(
server,
null,
"steamvr_feeder",
"SteamVR Feeder Bridge",
"""\\.\pipe\SlimeVRInput""",
FastList()
)
} else if (OperatingSystem.currentPlatform == OperatingSystem.LINUX) {
feederBridge = UnixSocketBridge(
server,
null,
"steamvr_feeder",
"SteamVR Feeder Bridge",
Paths.get(OperatingSystem.tempDirectory, "SlimeVRInput")
.toString(),
FastList()
)
} else {
feederBridge = null
when (OperatingSystem.currentPlatform) {
OperatingSystem.WINDOWS -> {
// Create named pipe bridge for SteamVR input
feederBridge = WindowsNamedPipeBridge(
server,
"steamvr_feeder",
"SteamVR Feeder Bridge",
"""\\.\pipe\SlimeVRInput""",
FastList()
)
}
OperatingSystem.LINUX -> {
feederBridge = UnixSocketBridge(
server,
"steamvr_feeder",
"SteamVR Feeder Bridge",
Paths.get(OperatingSystem.tempDirectory, "SlimeVRInput")
.toString(),
FastList()
)
}
else -> {
feederBridge = null
}
}
return feederBridge
@@ -5,12 +5,10 @@ import dev.slimevr.bridge.BridgeThread;
import dev.slimevr.bridge.ISteamVRBridge;
import dev.slimevr.desktop.platform.ProtobufMessages.*;
import dev.slimevr.tracking.trackers.Tracker;
import dev.slimevr.tracking.trackers.TrackerRole;
import dev.slimevr.util.ann.VRServerThread;
import io.eiren.util.ann.Synchronize;
import io.eiren.util.ann.ThreadSafe;
import io.eiren.util.collections.FastList;
import io.eiren.util.logging.LogManager;
import io.github.axisangles.ktmath.Quaternion;
import io.github.axisangles.ktmath.Vector3;
@@ -36,13 +34,10 @@ public abstract class ProtobufBridge implements ISteamVRBridge {
private final Map<String, Tracker> remoteTrackersBySerial = new HashMap<>();
@Synchronize("self")
private final Map<Integer, Tracker> remoteTrackersByTrackerId = new HashMap<>();
private final Tracker hmd;
private boolean hadNewData = false;
private Tracker hmdTracker;
public ProtobufBridge(String bridgeName, Tracker hmd) {
public ProtobufBridge(String bridgeName) {
this.bridgeName = bridgeName;
this.hmd = hmd;
}
/**
@@ -83,9 +78,6 @@ public abstract class ProtobufBridge implements ISteamVRBridge {
processMessageReceived(message);
hadNewData = true;
}
if (hadNewData && hmdTracker != null) {
trackerOverrideUpdate(hmdTracker, hmd);
}
}
@VRServerThread
@@ -202,27 +194,17 @@ public abstract class ProtobufBridge implements ISteamVRBridge {
synchronized (remoteTrackersByTrackerId) {
remoteTrackersByTrackerId.put(tracker.getTrackerNum(), tracker);
}
if (trackerAdded.getTrackerRole() == TrackerRole.HMD.getId()) {
hmdTracker = tracker;
} else {
VRServer.Companion.getInstance().registerTracker(tracker);
}
VRServer.Companion.getInstance().registerTracker(tracker);
}
@VRServerThread
protected void userActionReceived(UserAction userAction) {
String resetSourceName = String.format("%s: %s", resetSourceNamePrefix, bridgeName);
switch (userAction.getName()) {
case "calibrate":
LogManager
.warning("[" + bridgeName + "] Received deprecated user action 'calibrate'!");
case "reset":
case "reset" ->
// TODO : Check pose field
VRServer.Companion.getInstance().resetTrackersFull(resetSourceName);
break;
case "fast_reset":
VRServer.Companion.getInstance().resetTrackersYaw(resetSourceName);
break;
case "fast_reset" -> VRServer.Companion.getInstance().resetTrackersYaw(resetSourceName);
}
}
@@ -267,9 +249,6 @@ public abstract class ProtobufBridge implements ISteamVRBridge {
.setStatus(dev.slimevr.tracking.trackers.TrackerStatus.DISCONNECTED);
}
}
if (hmdTracker != null) {
hmd.setStatus(dev.slimevr.tracking.trackers.TrackerStatus.DISCONNECTED);
}
}
@VRServerThread
@@ -23,13 +23,12 @@ public abstract class SteamVRBridge extends ProtobufBridge implements Runnable {
public SteamVRBridge(
VRServer server,
Tracker hmd,
String threadName,
String bridgeName,
String bridgeSettingsKey,
List<Tracker> shareableTrackers
) {
super(bridgeName, hmd);
super(bridgeName);
this.bridgeSettingsKey = bridgeSettingsKey;
this.runnerThread = new Thread(this, threadName);
this.shareableTrackers = shareableTrackers;
@@ -96,7 +95,11 @@ public abstract class SteamVRBridge extends ProtobufBridge implements Runnable {
String displayName;
boolean needsReset;
if (trackerAdded.getTrackerId() == 0) {
displayName = "OpenVR HMD";
if (trackerAdded.getTrackerName().equals("HMD"))
displayName = "SteamVR Driver HMD";
else
displayName = "Feeder App HMD";
// TODO support needsReset = true if HMD isn't assigned to head
needsReset = false;
} else {
displayName = trackerAdded.getTrackerName();
@@ -35,13 +35,12 @@ public class UnixSocketBridge extends SteamVRBridge implements AutoCloseable {
public UnixSocketBridge(
VRServer server,
Tracker hmd,
String bridgeSettingsKey,
String bridgeName,
String socketPath,
List<Tracker> shareableTrackers
) {
super(server, hmd, "Named socket thread", bridgeName, bridgeSettingsKey, shareableTrackers);
super(server, "Named socket thread", bridgeName, bridgeSettingsKey, shareableTrackers);
this.socketPath = socketPath;
this.socketAddress = UnixDomainSocketAddress.of(socketPath);
@@ -55,13 +55,12 @@ public class WindowsNamedPipeBridge extends SteamVRBridge {
public WindowsNamedPipeBridge(
VRServer server,
Tracker hmd,
String bridgeSettingsKey,
String bridgeName,
String pipeName,
List<Tracker> shareableTrackers
) {
super(server, hmd, "Named pipe thread", bridgeName, bridgeSettingsKey, shareableTrackers);
super(server, "Named pipe thread", bridgeName, bridgeSettingsKey, shareableTrackers);
this.pipeName = pipeName;
overlappedWait.hEvent = rxEvent;
}