diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java b/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java index 5ddcf2476..b5a3b19b2 100644 --- a/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java +++ b/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java @@ -1,6 +1,7 @@ package dev.slimevr.bridge; import java.io.IOException; +import java.util.List; import com.google.protobuf.CodedOutputStream; import com.sun.jna.platform.win32.Kernel32; @@ -15,22 +16,72 @@ import io.eiren.util.ann.VRServerThread; import io.eiren.util.logging.LogManager; import io.eiren.vr.Main; import io.eiren.vr.trackers.HMDTracker; +import io.eiren.vr.trackers.ShareableTracker; import io.eiren.vr.trackers.TrackerPosition; import io.eiren.vr.trackers.TrackerRole; import io.eiren.vr.trackers.VRTracker; public class NamedPipeBridge extends ProtobufBridge implements Runnable { + + private final TrackerRole[] defaultRoles = new TrackerRole[] {TrackerRole.WAIST, TrackerRole.LEFT_FOOT, TrackerRole.RIGHT_FOOT}; private final byte[] buffArray = new byte[2048]; protected Pipe pipe; protected final String pipeName; + protected final String bridgeSettingsKey; protected final Thread runnerThread; + private final List shareableTrackers; - public NamedPipeBridge(HMDTracker hmd, String bridgeName, String pipeName) { + public NamedPipeBridge(HMDTracker hmd, String bridgeSettingsKey, String bridgeName, String pipeName, List shareableTrackers) { super(bridgeName, hmd); this.pipeName = pipeName; + this.bridgeSettingsKey = bridgeSettingsKey; this.runnerThread = new Thread(this, "Named pipe thread"); + this.shareableTrackers = shareableTrackers; + } + + @Override + @VRServerThread + public void startBridge() { + for(TrackerRole role : defaultRoles) { + changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), true)); + } + for(int i = 0; i < shareableTrackers.size(); ++i) { + ShareableTracker tr = shareableTrackers.get(i); + TrackerRole role = tr.getTrackerRole(); + changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), false)); + } + runnerThread.start(); + } + + @VRServerThread + public boolean getShareSetting(TrackerRole role) { + for(int i = 0; i < shareableTrackers.size(); ++i) { + ShareableTracker tr = shareableTrackers.get(i); + if(tr.getTrackerRole() == role) { + return sharedTrackers.contains(tr); + } + } + return false; + } + + @VRServerThread + public void changeShareSettings(TrackerRole role, boolean share) { + if(role == null) + return; + for(int i = 0; i < shareableTrackers.size(); ++i) { + ShareableTracker tr = shareableTrackers.get(i); + if(tr.getTrackerRole() == role) { + if(share) { + addSharedTracker(tr); + } else { + removeSharedTracker(tr); + } + Main.vrServer.config.setProperty("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), share); + Main.vrServer.saveConfig(); + } + } } @Override @@ -170,10 +221,4 @@ public class NamedPipeBridge extends ProtobufBridge implements Runnab LogManager.log.info("[" + bridgeName + "] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); return false; } - - @Override - @VRServerThread - public void startBridge() { - runnerThread.start(); - } } diff --git a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java index e85236fcc..cee38b6e0 100644 --- a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java +++ b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java @@ -24,7 +24,6 @@ import io.eiren.vr.Main; import io.eiren.vr.trackers.ComputedTracker; import io.eiren.vr.trackers.HMDTracker; import io.eiren.vr.trackers.ShareableTracker; -import io.eiren.vr.trackers.Tracker; import io.eiren.vr.trackers.TrackerRole; import io.eiren.vr.trackers.VRTracker; @@ -38,7 +37,7 @@ public abstract class ProtobufBridge implements Bridge { @ThreadSafe private final Queue outputQueue = new LinkedBlockingQueue<>(); @VRServerThread - private final List sharedTrackers = new FastList<>(); + protected final List sharedTrackers = new FastList<>(); @Synchronize("self") private final Map remoteTrackersBySerial = new HashMap<>(); @Synchronize("self") diff --git a/src/main/java/io/eiren/gui/VRServerGUI.java b/src/main/java/io/eiren/gui/VRServerGUI.java index e084d8730..60e257e82 100644 --- a/src/main/java/io/eiren/gui/VRServerGUI.java +++ b/src/main/java/io/eiren/gui/VRServerGUI.java @@ -5,8 +5,10 @@ import javax.swing.*; import javax.swing.border.EmptyBorder; import javax.swing.event.MouseInputAdapter; +import dev.slimevr.bridge.NamedPipeBridge; import dev.slimevr.bridge.NamedPipeVRBridge; import dev.slimevr.gui.swing.ButtonTimer; +import dev.slimevr.gui.swing.EJBagNoStretch; import dev.slimevr.gui.swing.EJBox; import dev.slimevr.gui.swing.EJBoxNoStretch; import io.eiren.util.MacOSX; @@ -15,6 +17,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.trackers.TrackerRole; import java.awt.Component; import java.awt.Container; @@ -186,67 +189,78 @@ public class VRServerGUI extends JFrame { setBorder(new EmptyBorder(i(5))); add(new EJBoxNoStretch(PAGE_AXIS, false, true) {{ setAlignmentY(TOP_ALIGNMENT); - add(new JLabel("Trackers list")); + JLabel l; + add(l = new JLabel("Trackers list")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); add(trackersList); add(Box.createVerticalGlue()); }}); add(new EJBoxNoStretch(PAGE_AXIS, false, true) {{ setAlignmentY(TOP_ALIGNMENT); - add(new JLabel("Body proportions")); + JLabel l; + add(l = new JLabel("Body proportions")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); add(new SkeletonConfig(server, VRServerGUI.this)); add(Box.createVerticalStrut(10)); - - 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; - } - 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; + if(server.hasBridge(NamedPipeBridge.class)) { + NamedPipeBridge br = server.getVRBridge(NamedPipeBridge.class); + add(l = new JLabel("SteamVR Trackers")); + l.setFont(l.getFont().deriveFont(Font.BOLD)); + l.setAlignmentX(0.5f); + add(l = new JLabel("Changes may require restart of SteamVR")); + l.setFont(l.getFont().deriveFont(Font.ITALIC)); + l.setAlignmentX(0.5f); + + add(new EJBagNoStretch(false, true) {{ + JCheckBox waistCb; + add(waistCb = new JCheckBox("Waist"), c(1, 1)); + waistCb.setSelected(br.getShareSetting(TrackerRole.WAIST)); + waistCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + br.changeShareSettings(TrackerRole.WAIST, waistCb.isSelected()); } - server.saveConfig(); - } - }); - add(Box.createVerticalStrut(10)); + }); + + JCheckBox legsCb; + add(legsCb = new JCheckBox("Legs"), c(2, 1)); + legsCb.setSelected(br.getShareSetting(TrackerRole.LEFT_FOOT) && br.getShareSetting(TrackerRole.RIGHT_FOOT)); + legsCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + br.changeShareSettings(TrackerRole.LEFT_FOOT, legsCb.isSelected()); + br.changeShareSettings(TrackerRole.RIGHT_FOOT, legsCb.isSelected()); + } + }); + + JCheckBox chestCb; + add(chestCb = new JCheckBox("Chest"), c(1, 2)); + chestCb.setSelected(br.getShareSetting(TrackerRole.CHEST)); + chestCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + br.changeShareSettings(TrackerRole.CHEST, chestCb.isSelected()); + } + }); + + JCheckBox kneesCb; + add(kneesCb = new JCheckBox("Knees"), c(2, 2)); + kneesCb.setSelected(br.getShareSetting(TrackerRole.LEFT_KNEE) && br.getShareSetting(TrackerRole.RIGHT_KNEE)); + kneesCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + br.changeShareSettings(TrackerRole.LEFT_KNEE, kneesCb.isSelected()); + br.changeShareSettings(TrackerRole.RIGHT_KNEE, kneesCb.isSelected()); + } + }); + + }}); + + + add(Box.createVerticalStrut(10)); } add(new JLabel("Skeleton data")); add(skeletonList); diff --git a/src/main/java/io/eiren/vr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java index 5d029bef0..7890cdb9b 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/src/main/java/io/eiren/vr/VRServer.java @@ -48,6 +48,7 @@ public class VRServer extends Thread { public final HMDTracker hmdTracker; private final List> newTrackersConsumers = new FastList<>(); private final List onTick = new FastList<>(); + private final List shareTrackers; public VRServer() { super("VRServer"); @@ -55,8 +56,8 @@ public class VRServer extends Thread { hmdTracker = new HMDTracker("HMD"); hmdTracker.position.set(0, 1.8f, 0); // Set starting position for easier debugging // TODO Multiple processors - humanPoseProcessor = new HumanPoseProcessor(this, hmdTracker, config.getInt("virtualtrackers", 3)); - List shareTrackers = humanPoseProcessor.getComputedTrackers(); + humanPoseProcessor = new HumanPoseProcessor(this, hmdTracker); + shareTrackers = humanPoseProcessor.getComputedTrackers(); // Start server for SlimeVR trackers trackersServer = new TrackersUDPServer(6969, "Sensors UDP server", this::registerTracker); @@ -74,13 +75,8 @@ public class VRServer extends Thread { tasks.add(() -> steamVRInput.startBridge()); bridges.add(steamVRInput); //*/ - NamedPipeBridge driverBridge = new NamedPipeBridge(hmdTracker, "SteamVR Driver Bridge", "\\\\.\\pipe\\SlimeVRDriver"); + NamedPipeBridge driverBridge = new NamedPipeBridge(hmdTracker, "steamvr", "SteamVR Driver Bridge", "\\\\.\\pipe\\SlimeVRDriver", shareTrackers); tasks.add(() -> driverBridge.startBridge()); - tasks.add(() -> { - // TODO : THIS SHOULD BE HANDLED COMPLETELY DIFFERENT AND FOR EACH BRIDGE TOGETHER - for(int i = 0; i < shareTrackers.size(); ++i) - driverBridge.addSharedTracker(shareTrackers.get(i)); - }); bridges.add(driverBridge); } @@ -106,17 +102,18 @@ public class VRServer extends Thread { public boolean hasBridge(Class bridgeClass) { for(int i = 0; i < bridges.size(); ++i) { - return bridgeClass.isAssignableFrom(bridges.get(i).getClass()); + if(bridgeClass.isAssignableFrom(bridges.get(i).getClass())) + return true; } return false; } @ThreadSafe - public E getVRBridge(Class cls) { + public E getVRBridge(Class bridgeClass) { for(int i = 0; i < bridges.size(); ++i) { Bridge b = bridges.get(i); - if(cls.isInstance(b)) - return cls.cast(b); + if(bridgeClass.isAssignableFrom(b.getClass())) + return bridgeClass.cast(b); } return null; } diff --git a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java index 523d17113..8ff6ea929 100644 --- a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java @@ -20,20 +20,14 @@ public class HumanPoseProcessor { private final List> onSkeletonUpdated = new FastList<>(); private HumanSkeleton skeleton; - public HumanPoseProcessor(VRServer server, HMDTracker hmd, int trackersAmount) { + public HumanPoseProcessor(VRServer server, HMDTracker hmd) { this.server = server; computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.WAIST, TrackerRole.WAIST)); - if(trackersAmount > 2) { - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_FOOT, TrackerRole.LEFT_FOOT)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_FOOT, TrackerRole.RIGHT_FOOT)); - if(trackersAmount == 4 || trackersAmount >= 6) { - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.CHEST, TrackerRole.CHEST)); - } - if(trackersAmount >= 5) { - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_KNEE, TrackerRole.LEFT_KNEE)); - computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_KNEE, TrackerRole.RIGHT_KNEE)); - } - } + computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_FOOT, TrackerRole.LEFT_FOOT)); + computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_FOOT, TrackerRole.RIGHT_FOOT)); + computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.CHEST, TrackerRole.CHEST)); + computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.LEFT_KNEE, TrackerRole.LEFT_KNEE)); + computedTrackers.add(new ComputedHumanPoseTracker(Tracker.getNextLocalTrackerId(), ComputedHumanPoseTrackerPosition.RIGHT_KNEE, TrackerRole.RIGHT_KNEE)); } public HumanSkeleton getSkeleton() {