From 9f4d956345ccd9009cd2c6dbc3edad0bdcdf65e8 Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Wed, 29 Sep 2021 17:16:28 +0300 Subject: [PATCH] Don't start SteamVR bridge not on Windows for now --- src/main/java/io/eiren/gui/VRServerGUI.java | 100 ++++++++++---------- src/main/java/io/eiren/vr/VRServer.java | 33 +++++-- 2 files changed, 76 insertions(+), 57 deletions(-) diff --git a/src/main/java/io/eiren/gui/VRServerGUI.java b/src/main/java/io/eiren/gui/VRServerGUI.java index eb3733785..7d13d3d11 100644 --- a/src/main/java/io/eiren/gui/VRServerGUI.java +++ b/src/main/java/io/eiren/gui/VRServerGUI.java @@ -14,6 +14,7 @@ import io.eiren.util.StringUtils; import io.eiren.util.ann.AWTThread; import io.eiren.vr.Main; import io.eiren.vr.VRServer; +import io.eiren.vr.bridge.NamedPipeVRBridge; import java.awt.Component; import java.awt.Container; @@ -195,55 +196,58 @@ public class VRServerGUI extends JFrame { add(new JLabel("Body proportions")); add(new SkeletonConfig(server, VRServerGUI.this)); add(Box.createVerticalStrut(10)); - add(new JLabel("SteamVR trackers")); - JComboBox trackersSelect; - add(trackersSelect = new JComboBox<>()); - trackersSelect.addItem("Waist"); - trackersSelect.addItem("Waist + Legs"); - trackersSelect.addItem("Waist + Legs + Chest"); - trackersSelect.addItem("Waist + Legs + Knees"); - trackersSelect.addItem("Waist + Legs + Chest + Knees"); - switch(server.config.getInt("virtualtrackers", 3)) { - case 1: - trackersSelect.setSelectedIndex(0); - break; - case 3: - trackersSelect.setSelectedIndex(1); - break; - case 4: - trackersSelect.setSelectedIndex(2); - break; - case 5: - trackersSelect.setSelectedIndex(3); - break; - case 6: - trackersSelect.setSelectedIndex(4); - break; - } - trackersSelect.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - switch(trackersSelect.getSelectedIndex()) { - case 0: - server.config.setProperty("virtualtrackers", 1); - break; - case 1: - server.config.setProperty("virtualtrackers", 3); - break; - case 2: - server.config.setProperty("virtualtrackers", 4); - break; - case 3: - server.config.setProperty("virtualtrackers", 5); - break; - case 4: - server.config.setProperty("virtualtrackers", 6); - break; - } - server.saveConfig(); + + if(server.hasBridge(NamedPipeVRBridge.class)) { + add(new JLabel("SteamVR trackers")); + JComboBox trackersSelect; + add(trackersSelect = new JComboBox<>()); + trackersSelect.addItem("Waist"); + trackersSelect.addItem("Waist + Legs"); + trackersSelect.addItem("Waist + Legs + Chest"); + trackersSelect.addItem("Waist + Legs + Knees"); + trackersSelect.addItem("Waist + Legs + Chest + Knees"); + switch(server.config.getInt("virtualtrackers", 3)) { + case 1: + trackersSelect.setSelectedIndex(0); + break; + case 3: + trackersSelect.setSelectedIndex(1); + break; + case 4: + trackersSelect.setSelectedIndex(2); + break; + case 5: + trackersSelect.setSelectedIndex(3); + break; + case 6: + trackersSelect.setSelectedIndex(4); + break; } - }); - add(Box.createVerticalStrut(10)); + trackersSelect.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + switch(trackersSelect.getSelectedIndex()) { + case 0: + server.config.setProperty("virtualtrackers", 1); + break; + case 1: + server.config.setProperty("virtualtrackers", 3); + break; + case 2: + server.config.setProperty("virtualtrackers", 4); + break; + case 3: + server.config.setProperty("virtualtrackers", 5); + break; + case 4: + server.config.setProperty("virtualtrackers", 6); + break; + } + server.saveConfig(); + } + }); + add(Box.createVerticalStrut(10)); + } add(new JLabel("Skeleton data")); add(skeletonList); add(Box.createVerticalGlue()); diff --git a/src/main/java/io/eiren/vr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java index c3f9cebc3..9003599f1 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/src/main/java/io/eiren/vr/VRServer.java @@ -15,6 +15,7 @@ import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Consumer; +import io.eiren.util.OperatingSystem; import io.eiren.util.ann.ThreadSafe; import io.eiren.util.ann.ThreadSecure; import io.eiren.util.ann.VRServerThread; @@ -38,7 +39,7 @@ public class VRServer extends Thread { private final List trackers = new FastList<>(); public final HumanPoseProcessor humanPoseProcessor; - private final TrackersUDPServer trackersServer = new TrackersUDPServer(6969, "Sensors UDP server", this::registerTracker); + private final TrackersUDPServer trackersServer; private final List bridges = new FastList<>(); private final Queue tasks = new LinkedBlockingQueue<>(); private final Map configuration = new HashMap<>(); @@ -56,14 +57,21 @@ public class VRServer extends Thread { humanPoseProcessor = new HumanPoseProcessor(this, hmdTracker, config.getInt("virtualtrackers", 3)); List shareTrackers = humanPoseProcessor.getComputedTrackers(); - // Create named pipe bridge for SteamVR driver - NamedPipeVRBridge driverBridge = new NamedPipeVRBridge(hmdTracker, shareTrackers, this); - tasks.add(() -> driverBridge.start()); - bridges.add(driverBridge); - // Create named pipe bridge for SteamVR input - SteamVRPipeInputBridge steamVRInput = new SteamVRPipeInputBridge(this); - tasks.add(() -> steamVRInput.start()); - bridges.add(steamVRInput); + // Start server for SlimeVR trackers + trackersServer = new TrackersUDPServer(6969, "Sensors UDP server", this::registerTracker); + + // OpenVR bridge currently only supports Windows + if(OperatingSystem.getCurrentPlatform() == OperatingSystem.WINDOWS) { + // Create named pipe bridge for SteamVR driver + NamedPipeVRBridge driverBridge = new NamedPipeVRBridge(hmdTracker, shareTrackers, this); + tasks.add(() -> driverBridge.start()); + bridges.add(driverBridge); + // Create named pipe bridge for SteamVR input + SteamVRPipeInputBridge steamVRInput = new SteamVRPipeInputBridge(this); + tasks.add(() -> steamVRInput.start()); + bridges.add(steamVRInput); + } + // Create WebSocket server WebSocketVRBridge wsBridge = new WebSocketVRBridge(hmdTracker, shareTrackers, this); tasks.add(() -> wsBridge.start()); @@ -83,6 +91,13 @@ public class VRServer extends Thread { for(int i = 0; i < shareTrackers.size(); ++i) registerTracker(shareTrackers.get(i)); } + + public boolean hasBridge(Class bridgeClass) { + for(int i = 0; i < bridges.size(); ++i) { + return bridgeClass.isAssignableFrom(bridges.get(i).getClass()); + } + return false; + } @ThreadSafe public E getVRBridge(Class cls) {