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

@@ -38,14 +38,13 @@ import java.util.function.Consumer
typealias SteamBridgeProvider = (
server: VRServer,
hmdTracker: Tracker,
computedTrackers: List<Tracker>,
) -> ISteamVRBridge?
const val SLIMEVR_IDENTIFIER = "dev.slimevr.SlimeVR"
class VRServer @JvmOverloads constructor(
driverBridgeProvider: SteamBridgeProvider = { _, _, _ -> null },
driverBridgeProvider: SteamBridgeProvider = { _, _ -> null },
feederBridgeProvider: (VRServer) -> ISteamVRBridge? = { _ -> null },
serialHandlerProvider: (VRServer) -> SerialHandler = { _ -> SerialHandlerStub() },
// configPath is used by VRWorkout, do not remove!
@@ -56,7 +55,6 @@ class VRServer @JvmOverloads constructor(
@JvmField
val humanPoseManager: HumanPoseManager
val hmdTracker: Tracker
private val trackers: MutableList<Tracker> = FastList()
val trackersServer: TrackersUDPServer
private val bridges: MutableList<Bridge> = FastList()
@@ -109,17 +107,6 @@ class VRServer @JvmOverloads constructor(
tapSetupHandler = TapSetupHandler()
autoBoneHandler = AutoBoneHandler(this)
protocolAPI = ProtocolAPI(this)
hmdTracker = Tracker(
null,
0,
"HMD",
"HMD",
TrackerPosition.HEAD,
null,
hasPosition = true,
hasRotation = true,
isComputed = true
)
humanPoseManager = HumanPoseManager(this)
val computedTrackers = humanPoseManager.computedTrackers
@@ -132,7 +119,7 @@ class VRServer @JvmOverloads constructor(
) { tracker: Tracker -> registerTracker(tracker) }
// Start bridges for SteamVR and Feeder
val driverBridge = driverBridgeProvider(this, hmdTracker, computedTrackers)
val driverBridge = driverBridgeProvider(this, computedTrackers)
if (driverBridge != null) {
tasks.add(Runnable { driverBridge.startBridge() })
bridges.add(driverBridge)
@@ -144,7 +131,7 @@ class VRServer @JvmOverloads constructor(
}
// Create WebSocket server
val wsBridge = WebSocketVRBridge(hmdTracker, computedTrackers, this)
val wsBridge = WebSocketVRBridge(computedTrackers, this)
tasks.add(Runnable { wsBridge.startBridge() })
bridges.add(wsBridge)
@@ -169,7 +156,6 @@ class VRServer @JvmOverloads constructor(
oscHandlers.add(vMCHandler)
oSCRouter = OSCRouter(configManager.vrConfig.oscRouter, oscHandlers)
bvhRecorder = BVHRecorder(this)
registerTracker(hmdTracker)
for (tracker in computedTrackers) {
registerTracker(tracker)
}
@@ -269,7 +255,7 @@ class VRServer @JvmOverloads constructor(
private fun trackerAdded(tracker: Tracker) {
humanPoseManager.trackerAdded(tracker)
updateSkeletonModel()
if (tracker.isComputed && tracker.name != "HMD") {
if (tracker.isComputed) {
vMCHandler.addComputedTracker(tracker)
}
refreshTrackersDriftCompensationEnabled()
@@ -14,11 +14,6 @@ object TrackerUtils {
allTrackers: List<Tracker>,
position: TrackerPosition,
): Tracker? {
if (position == TrackerPosition.HEAD) {
// Prioritize non-computed
val head = getNonInternalNonComputedTrackerForBodyPosition(allTrackers, position)
if (head != null) return head
}
return getNonInternalTrackerForBodyPosition(allTrackers, position)
}
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import dev.slimevr.VRServer;
import dev.slimevr.bridge.Bridge;
import dev.slimevr.tracking.trackers.Device;
import dev.slimevr.tracking.trackers.Tracker;
import dev.slimevr.tracking.trackers.TrackerPosition;
import dev.slimevr.tracking.trackers.TrackerStatus;
@@ -20,7 +21,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class WebSocketVRBridge extends WebsocketAPI implements Bridge {
private static final String resetSourceName = "WebSocketVRBridge";
private final Tracker hmd;
private final List<Tracker> computedTrackers;
private final List<Tracker> internalTrackers;
private final AtomicBoolean newHMDData = new AtomicBoolean(false);
@@ -39,14 +39,13 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge {
true,
true
);
private Tracker hmdTracker;
public WebSocketVRBridge(
Tracker hmd,
List<Tracker> computedTrackers,
VRServer server
) {
super(server, server.protocolAPI);
this.hmd = hmd;
this.computedTrackers = new FastList<>(computedTrackers);
this.internalTrackers = new FastList<>(computedTrackers.size());
for (Tracker t : computedTrackers) {
@@ -71,9 +70,31 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge {
@Override
public void dataRead() {
if (newHMDData.compareAndSet(true, false)) {
hmd.setPosition(internalHMDTracker.getPosition());
hmd.setRotation(internalHMDTracker.getRotation());
hmd.dataTick();
if (hmdTracker == null) {
// Create HMD for websocket
Device hmdDevice = server.deviceManager
.createDevice("WebSocketVRBridge", null, null);
hmdTracker = new Tracker(
null,
VRServer.getNextLocalTrackerId(),
"WebSocketHMD",
"WebSocketHMD",
TrackerPosition.HEAD,
null,
true,
true,
false,
true,
false,
true
);
hmdDevice.getTrackers().put(0, hmdTracker);
server.registerTracker(hmdTracker);
}
hmdTracker.setPosition(internalHMDTracker.getPosition());
hmdTracker.setRotation(internalHMDTracker.getRotation());
hmdTracker.dataTick();
}
}