diff --git a/.gitignore b/.gitignore index 3688d1911..9a08c2697 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,10 @@ build /bin/ +# Ignore .idea +.idea + # Syncthing ignore file .stignore -MagnetoLib.dll \ No newline at end of file +MagnetoLib.dll diff --git a/src/main/java/dev/slimevr/VRServer.java b/src/main/java/dev/slimevr/VRServer.java index 61ceb9d70..4058a112f 100644 --- a/src/main/java/dev/slimevr/VRServer.java +++ b/src/main/java/dev/slimevr/VRServer.java @@ -16,8 +16,8 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.function.Consumer; import dev.slimevr.bridge.Bridge; -import dev.slimevr.bridge.NamedPipeBridge; -import dev.slimevr.bridge.SteamVRPipeInputBridge; +import dev.slimevr.platform.windows.WindowsNamedPipeBridge; +import dev.slimevr.platform.windows.WindowsSteamVRPipeInputBridge; import dev.slimevr.bridge.VMCBridge; import dev.slimevr.bridge.WebSocketVRBridge; import dev.slimevr.util.ann.VRServerThread; @@ -71,11 +71,11 @@ public class VRServer extends Thread { bridges.add(driverBridge); //*/ // Create named pipe bridge for SteamVR input - SteamVRPipeInputBridge steamVRInput = new SteamVRPipeInputBridge(this); + WindowsSteamVRPipeInputBridge steamVRInput = new WindowsSteamVRPipeInputBridge(this); tasks.add(() -> steamVRInput.startBridge()); bridges.add(steamVRInput); //*/ - NamedPipeBridge driverBridge = new NamedPipeBridge(hmdTracker, "steamvr", "SteamVR Driver Bridge", "\\\\.\\pipe\\SlimeVRDriver", shareTrackers); + WindowsNamedPipeBridge driverBridge = new WindowsNamedPipeBridge(hmdTracker, "steamvr", "SteamVR Driver Bridge", "\\\\.\\pipe\\SlimeVRDriver", shareTrackers); tasks.add(() -> driverBridge.startBridge()); bridges.add(driverBridge); } diff --git a/src/main/java/dev/slimevr/bridge/PipeState.java b/src/main/java/dev/slimevr/bridge/PipeState.java new file mode 100644 index 000000000..8a667f46f --- /dev/null +++ b/src/main/java/dev/slimevr/bridge/PipeState.java @@ -0,0 +1,7 @@ +package dev.slimevr.bridge; + +public enum PipeState { + CREATED, + OPEN, + ERROR; +} diff --git a/src/main/java/dev/slimevr/gui/VRServerGUI.java b/src/main/java/dev/slimevr/gui/VRServerGUI.java index 54aa468d7..1721a0848 100644 --- a/src/main/java/dev/slimevr/gui/VRServerGUI.java +++ b/src/main/java/dev/slimevr/gui/VRServerGUI.java @@ -7,7 +7,7 @@ import javax.swing.event.MouseInputAdapter; import dev.slimevr.Main; import dev.slimevr.VRServer; -import dev.slimevr.bridge.NamedPipeBridge; +import dev.slimevr.platform.windows.WindowsNamedPipeBridge; import dev.slimevr.gui.swing.ButtonTimer; import dev.slimevr.gui.swing.EJBagNoStretch; import dev.slimevr.gui.swing.EJBox; @@ -34,7 +34,6 @@ import java.awt.event.ComponentEvent; import java.awt.event.MouseEvent; import java.awt.image.BufferedImage; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -274,8 +273,8 @@ public class VRServerGUI extends JFrame { l.setAlignmentX(0.5f); add(new SkeletonConfigGUI(server, VRServerGUI.this)); add(Box.createVerticalStrut(10)); - if(server.hasBridge(NamedPipeBridge.class)) { - NamedPipeBridge br = server.getVRBridge(NamedPipeBridge.class); + if(server.hasBridge(WindowsNamedPipeBridge.class)) { + WindowsNamedPipeBridge br = server.getVRBridge(WindowsNamedPipeBridge.class); add(l = new JLabel("SteamVR Trackers")); l.setFont(l.getFont().deriveFont(Font.BOLD)); l.setAlignmentX(0.5f); diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java similarity index 83% rename from src/main/java/dev/slimevr/bridge/NamedPipeBridge.java rename to src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java index 54136821c..b470a9bb4 100644 --- a/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java @@ -1,4 +1,4 @@ -package dev.slimevr.bridge; +package dev.slimevr.platform.windows; import java.io.IOException; import java.util.List; @@ -10,7 +10,9 @@ import com.sun.jna.platform.win32.WinError; import com.sun.jna.ptr.IntByReference; import dev.slimevr.Main; -import dev.slimevr.bridge.Pipe.PipeState; +import dev.slimevr.bridge.BridgeThread; +import dev.slimevr.bridge.PipeState; +import dev.slimevr.bridge.ProtobufBridge; import dev.slimevr.bridge.ProtobufMessages.ProtobufMessage; import dev.slimevr.bridge.ProtobufMessages.TrackerAdded; import dev.slimevr.util.ann.VRServerThread; @@ -21,19 +23,19 @@ import dev.slimevr.vr.trackers.TrackerRole; import dev.slimevr.vr.trackers.VRTracker; import io.eiren.util.logging.LogManager; -public class NamedPipeBridge extends ProtobufBridge implements Runnable { - +public class WindowsNamedPipeBridge 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 WindowsPipe pipe; protected final String pipeName; protected final String bridgeSettingsKey; protected final Thread runnerThread; private final List shareableTrackers; - - public NamedPipeBridge(HMDTracker hmd, String bridgeSettingsKey, String bridgeName, String pipeName, List shareableTrackers) { + + public WindowsNamedPipeBridge(HMDTracker hmd, String bridgeSettingsKey, String bridgeName, String pipeName, List shareableTrackers) { super(bridgeName, hmd); this.pipeName = pipeName; this.bridgeSettingsKey = bridgeSettingsKey; @@ -131,26 +133,26 @@ public class NamedPipeBridge extends ProtobufBridge implements Runnab protected boolean sendMessageReal(ProtobufMessage message) { if(pipe.state == PipeState.OPEN) { try { - int size = message.getSerializedSize(); - CodedOutputStream os = CodedOutputStream.newInstance(buffArray, 4, size); - message.writeTo(os); - size += 4; - buffArray[0] = (byte) (size & 0xFF); - buffArray[1] = (byte) ((size >> 8) & 0xFF); - buffArray[2] = (byte) ((size >> 16) & 0xFF); - buffArray[3] = (byte) ((size >> 24) & 0xFF); - if(Kernel32.INSTANCE.WriteFile(pipe.pipeHandle, buffArray, size, null, null)) { - return true; - } - pipe.state = PipeState.ERROR; - LogManager.log.severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); + int size = message.getSerializedSize(); + CodedOutputStream os = CodedOutputStream.newInstance(buffArray, 4, size); + message.writeTo(os); + size += 4; + buffArray[0] = (byte) (size & 0xFF); + buffArray[1] = (byte) ((size >> 8) & 0xFF); + buffArray[2] = (byte) ((size >> 16) & 0xFF); + buffArray[3] = (byte) ((size >> 24) & 0xFF); + if(Kernel32.INSTANCE.WriteFile(pipe.pipeHandle, buffArray, size, null, null)) { + return true; + } + pipe.state = PipeState.ERROR; + LogManager.log.severe("[" + bridgeName + "] Pipe error: " + Kernel32.INSTANCE.GetLastError()); } catch(IOException e) { e.printStackTrace(); } - } + } return false; } - + private boolean updatePipe() throws IOException { if(pipe.state == PipeState.OPEN) { boolean readAnything = false; @@ -185,16 +187,16 @@ public class NamedPipeBridge extends ProtobufBridge implements Runnab } return false; } - + private void resetPipe() { - Pipe.safeDisconnect(pipe); + WindowsPipe.safeDisconnect(pipe); pipe.state = PipeState.CREATED; Main.vrServer.queueTask(this::disconnected); } - + private void createPipe() throws IOException { try { - pipe = new Pipe(Kernel32.INSTANCE.CreateNamedPipe(pipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + pipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(pipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode 1, // nMaxInstances, 1024 * 16, // nOutBufferSize, @@ -206,12 +208,12 @@ public class NamedPipeBridge extends ProtobufBridge implements Runnab throw new IOException("Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); LogManager.log.info("[" + bridgeName + "] Pipes are created"); } catch(IOException e) { - Pipe.safeDisconnect(pipe); + WindowsPipe.safeDisconnect(pipe); throw e; } } - - private boolean tryOpeningPipe(Pipe pipe) { + + private boolean tryOpeningPipe(WindowsPipe pipe) { if(Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED) { pipe.state = PipeState.OPEN; LogManager.log.info("[" + bridgeName + "] Pipe " + pipe.name + " is open"); diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java similarity index 87% rename from src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java rename to src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java index 3f80d6b78..12649a514 100644 --- a/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java @@ -1,4 +1,4 @@ -package dev.slimevr.bridge; +package dev.slimevr.platform.windows; import java.io.IOException; import java.nio.charset.Charset; @@ -13,7 +13,8 @@ import com.sun.jna.platform.win32.WinNT.HANDLE; import com.sun.jna.ptr.IntByReference; import dev.slimevr.VRServer; -import dev.slimevr.bridge.Pipe.PipeState; +import dev.slimevr.bridge.Bridge; +import dev.slimevr.bridge.PipeState; import dev.slimevr.vr.trackers.ComputedTracker; import dev.slimevr.vr.trackers.HMDTracker; import dev.slimevr.vr.trackers.ShareableTracker; @@ -22,7 +23,7 @@ import dev.slimevr.vr.trackers.TrackerStatus; import io.eiren.util.collections.FastList; import io.eiren.util.logging.LogManager; -public class NamedPipeVRBridge extends Thread implements Bridge { +public class WindowsNamedPipeVRBridge extends Thread implements Bridge { private static final int MAX_COMMAND_LENGTH = 2048; public static final String HMDPipeName = "\\\\.\\pipe\\HMDPipe"; @@ -36,17 +37,17 @@ public class NamedPipeVRBridge extends Thread implements Bridge { private final Vector3f vBuffer2 = new Vector3f(); private final Quaternion qBuffer = new Quaternion(); private final Quaternion qBuffer2 = new Quaternion(); - - private Pipe hmdPipe; + + private WindowsPipe hmdPipe; private final HMDTracker hmd; - private final List trackerPipes; + private final List trackerPipes; private final List shareTrackers; private final List internalTrackers; - + private final HMDTracker internalHMDTracker = new HMDTracker("internal://HMD"); private final AtomicBoolean newHMDData = new AtomicBoolean(false); - - public NamedPipeVRBridge(HMDTracker hmd, List shareTrackers, VRServer server) { + + public WindowsNamedPipeVRBridge(HMDTracker hmd, List shareTrackers, VRServer server) { super("Named Pipe VR Bridge"); this.hmd = hmd; this.shareTrackers = new FastList<>(shareTrackers); @@ -59,7 +60,7 @@ public class NamedPipeVRBridge extends Thread implements Bridge { this.internalTrackers.add(ct); } } - + @Override public void run() { try { @@ -101,21 +102,21 @@ public class NamedPipeVRBridge extends Thread implements Bridge { it.rotation.set(qBuffer2); } } - + private void waitForPipesToOpen() { if(hmdPipe.state == PipeState.CREATED) { if(tryOpeningPipe(hmdPipe)) initHMDPipe(hmdPipe); } for(int i = 0; i < trackerPipes.size(); ++i) { - Pipe trackerPipe = trackerPipes.get(i); + WindowsPipe trackerPipe = trackerPipes.get(i); if(trackerPipe.state == PipeState.CREATED) { if(tryOpeningPipe(trackerPipe)) initTrackerPipe(trackerPipe, i); } } } - + public boolean updateHMD() throws IOException { if(hmdPipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); @@ -145,7 +146,7 @@ public class NamedPipeVRBridge extends Thread implements Bridge { } return false; } - + private void executeHMDInput() throws IOException { String[] split = commandBuilder.toString().split(" "); if(split.length < 7) { @@ -160,7 +161,7 @@ public class NamedPipeVRBridge extends Thread implements Bridge { double qx = Double.parseDouble(split[4]); double qy = Double.parseDouble(split[5]); double qz = Double.parseDouble(split[6]); - + internalHMDTracker.position.set((float) x, (float) y, (float) z); internalHMDTracker.rotation.set((float) qx, (float) qy, (float) qz, (float) qw); internalHMDTracker.dataTick(); @@ -169,11 +170,11 @@ public class NamedPipeVRBridge extends Thread implements Bridge { e.printStackTrace(); } } - + public void updateTracker(int trackerId, boolean hmdUpdated) { Tracker sensor = internalTrackers.get(trackerId); if(sensor.getStatus().sendData) { - Pipe trackerPipe = trackerPipes.get(trackerId); + WindowsPipe trackerPipe = trackerPipes.get(trackerId); if(hmdUpdated && trackerPipe.state == PipeState.OPEN) { sbBuffer.setLength(0); sensor.getPosition(vBuffer); @@ -188,34 +189,34 @@ public class NamedPipeVRBridge extends Thread implements Bridge { } } } - - private void initHMDPipe(Pipe pipe) { + + private void initHMDPipe(WindowsPipe pipe) { hmd.setStatus(TrackerStatus.OK); } - - private void initTrackerPipe(Pipe pipe, int trackerId) { + + private void initTrackerPipe(WindowsPipe pipe, int trackerId) { String trackerHello = this.shareTrackers.size() + " 0"; System.arraycopy(trackerHello.getBytes(ASCII), 0, buffArray, 0, trackerHello.length()); buffArray[trackerHello.length()] = '\0'; IntByReference lpNumberOfBytesWritten = new IntByReference(0); Kernel32.INSTANCE.WriteFile(pipe.pipeHandle, - buffArray, - trackerHello.length() + 1, - lpNumberOfBytesWritten, - null); + buffArray, + trackerHello.length() + 1, + lpNumberOfBytesWritten, + null); } - - private boolean tryOpeningPipe(Pipe pipe) { + + private boolean tryOpeningPipe(WindowsPipe pipe) { if(Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null)) { pipe.state = PipeState.OPEN; LogManager.log.info("[VRBridge] Pipe " + pipe.name + " is open"); return true; } - + LogManager.log.info("[VRBridge] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); return false; } - + private boolean areAllPipesOpen() { if(hmdPipe == null || hmdPipe.state == PipeState.CREATED) { return false; @@ -226,10 +227,10 @@ public class NamedPipeVRBridge extends Thread implements Bridge { } return true; } - + private void createPipes() throws IOException { try { - hmdPipe = new Pipe(Kernel32.INSTANCE.CreateNamedPipe(HMDPipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + hmdPipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(HMDPipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode 1, // nMaxInstances, 1024 * 16, // nOutBufferSize, @@ -242,16 +243,16 @@ public class NamedPipeVRBridge extends Thread implements Bridge { for(int i = 0; i < this.shareTrackers.size(); ++i) { String pipeName = TrackersPipeName + i; HANDLE pipeHandle = Kernel32.INSTANCE.CreateNamedPipe(pipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode - WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode - 1, // nMaxInstances, - 1024 * 16, // nOutBufferSize, - 1024 * 16, // nInBufferSize, - 0, // nDefaultTimeOut, - null); // lpSecurityAttributes + WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode + 1, // nMaxInstances, + 1024 * 16, // nOutBufferSize, + 1024 * 16, // nInBufferSize, + 0, // nDefaultTimeOut, + null); // lpSecurityAttributes if(WinBase.INVALID_HANDLE_VALUE.equals(pipeHandle)) throw new IOException("Can't open " + pipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); LogManager.log.info("[VRBridge] Pipe " + pipeName + " created"); - trackerPipes.add(new Pipe(pipeHandle, pipeName)); + trackerPipes.add(new WindowsPipe(pipeHandle, pipeName)); } LogManager.log.info("[VRBridge] Pipes are open"); } catch(IOException e) { @@ -262,8 +263,8 @@ public class NamedPipeVRBridge extends Thread implements Bridge { throw e; } } - - public static void safeDisconnect(Pipe pipe) { + + public static void safeDisconnect(WindowsPipe pipe) { try { if(pipe != null && pipe.pipeHandle != null) Kernel32.INSTANCE.DisconnectNamedPipe(pipe.pipeHandle); @@ -274,13 +275,13 @@ public class NamedPipeVRBridge extends Thread implements Bridge { @Override public void addSharedTracker(ShareableTracker tracker) { // TODO Auto-generated method stub - + } @Override public void removeSharedTracker(ShareableTracker tracker) { // TODO Auto-generated method stub - + } @Override diff --git a/src/main/java/dev/slimevr/bridge/Pipe.java b/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java similarity index 64% rename from src/main/java/dev/slimevr/bridge/Pipe.java rename to src/main/java/dev/slimevr/platform/windows/WindowsPipe.java index 8c4d354ae..3e7130d09 100644 --- a/src/main/java/dev/slimevr/bridge/Pipe.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsPipe.java @@ -1,30 +1,25 @@ -package dev.slimevr.bridge; +package dev.slimevr.platform.windows; import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinNT.HANDLE; +import dev.slimevr.bridge.PipeState; + +public class WindowsPipe { -public class Pipe { - public final String name; public final HANDLE pipeHandle; public PipeState state = PipeState.CREATED; - - public Pipe(HANDLE pipeHandle, String name) { + + public WindowsPipe(HANDLE pipeHandle, String name) { this.pipeHandle = pipeHandle; this.name = name; } - - public static void safeDisconnect(Pipe pipe) { + + public static void safeDisconnect(WindowsPipe pipe) { try { if(pipe != null && pipe.pipeHandle != null) Kernel32.INSTANCE.DisconnectNamedPipe(pipe.pipeHandle); } catch(Exception e) { } } - - enum PipeState { - CREATED, - OPEN, - ERROR; - } -} \ No newline at end of file +} diff --git a/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java similarity index 68% rename from src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java rename to src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java index 839cbf595..d7c80f87a 100644 --- a/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java @@ -1,4 +1,4 @@ -package dev.slimevr.bridge; +package dev.slimevr.platform.windows; import java.io.IOException; import java.util.HashMap; @@ -7,6 +7,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; +import dev.slimevr.VRServer; +import dev.slimevr.bridge.Bridge; import org.apache.commons.lang3.StringUtils; import com.jme3.math.Quaternion; @@ -16,8 +18,7 @@ import com.sun.jna.platform.win32.WinBase; import com.sun.jna.platform.win32.WinError; import com.sun.jna.ptr.IntByReference; -import dev.slimevr.VRServer; -import dev.slimevr.bridge.Pipe.PipeState; +import dev.slimevr.bridge.PipeState; import dev.slimevr.vr.trackers.ShareableTracker; import dev.slimevr.vr.trackers.TrackerPosition; import dev.slimevr.vr.trackers.TrackerStatus; @@ -25,7 +26,7 @@ import dev.slimevr.vr.trackers.VRTracker; import io.eiren.util.collections.FastList; import io.eiren.util.logging.LogManager; -public class SteamVRPipeInputBridge extends Thread implements Bridge { +public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { private static final int MAX_COMMAND_LENGTH = 2048; public static final String PipeName = "\\\\.\\pipe\\SlimeVRInput"; @@ -38,12 +39,12 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { private AtomicBoolean newData = new AtomicBoolean(false); private final Vector3f vBuffer = new Vector3f(); private final Quaternion qBuffer = new Quaternion(); - private Pipe pipe; - - public SteamVRPipeInputBridge(VRServer server) { + private WindowsPipe pipe; + + public WindowsSteamVRPipeInputBridge(VRServer server) { this.server = server; } - + @Override public void run() { try { @@ -71,7 +72,7 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { e.printStackTrace(); } } - + public boolean updatePipes() throws IOException { if(pipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); @@ -105,73 +106,73 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { } return false; } - + private void executeInputCommand() throws IOException { String[] command = commandBuilder.toString().split(" "); switch(command[0]) { - case "ADD": // Add new tracker - if(command.length < 4) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in ADD command. Command requires at least 4 arguments. Supplied: " + commandBuilder.toString()); - return; - } - VRTracker internalTracker = new VRTracker(Integer.parseInt(command[1]), StringUtils.join(command, " ", 3, command.length), true, true); - int roleId = Integer.parseInt(command[2]); - if(roleId >= 0 && roleId < SteamVRInputRoles.values.length) { - SteamVRInputRoles svrRole = SteamVRInputRoles.values[roleId]; - internalTracker.bodyPosition = svrRole.bodyPosition; - } - VRTracker oldTracker; - synchronized(trackersInternal) { - oldTracker = trackersInternal.put(internalTracker.getTrackerId(), internalTracker); - } - if(oldTracker != null) { - LogManager.log.severe("[SteamVRPipeInputBridge] New tracker added with the same id. Supplied: " + commandBuilder.toString()); - return; - } - newData.set(true); - break; - case "UPD": // Update tracker data - if(command.length < 9) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in UPD command. Command requires at least 9 arguments. Supplied: " + commandBuilder.toString()); - return; - } - int id = Integer.parseInt(command[1]); - double x = Double.parseDouble(command[2]); - double y = Double.parseDouble(command[3]); - double z = Double.parseDouble(command[4]); - double qw = Double.parseDouble(command[5]); - double qx = Double.parseDouble(command[6]); - double qy = Double.parseDouble(command[7]); - double qz = Double.parseDouble(command[8]); - internalTracker = trackersInternal.get(id); - if(internalTracker != null) { - internalTracker.position.set((float) x, (float) y, (float) z); - internalTracker.rotation.set((float) qx, (float) qy, (float) qz, (float) qw); - internalTracker.dataTick(); + case "ADD": // Add new tracker + if(command.length < 4) { + LogManager.log.severe("[SteamVRPipeInputBridge] Error in ADD command. Command requires at least 4 arguments. Supplied: " + commandBuilder.toString()); + return; + } + VRTracker internalTracker = new VRTracker(Integer.parseInt(command[1]), StringUtils.join(command, " ", 3, command.length), true, true); + int roleId = Integer.parseInt(command[2]); + if(roleId >= 0 && roleId < SteamVRInputRoles.values.length) { + SteamVRInputRoles svrRole = SteamVRInputRoles.values[roleId]; + internalTracker.bodyPosition = svrRole.bodyPosition; + } + VRTracker oldTracker; + synchronized(trackersInternal) { + oldTracker = trackersInternal.put(internalTracker.getTrackerId(), internalTracker); + } + if(oldTracker != null) { + LogManager.log.severe("[SteamVRPipeInputBridge] New tracker added with the same id. Supplied: " + commandBuilder.toString()); + return; + } newData.set(true); - } - break; - case "STA": // Update tracker status - if(command.length < 3) { - LogManager.log.severe("[SteamVRPipeInputBridge] Error in STA command. Command requires at least 3 arguments. Supplied: " + commandBuilder.toString()); - return; - } - id = Integer.parseInt(command[1]); - int status = Integer.parseInt(command[2]); - TrackerStatus st = TrackerStatus.getById(status); - if(st == null) { - LogManager.log.severe("[SteamVRPipeInputBridge] Unrecognized status id. Supplied: " + commandBuilder.toString()); - return; - } - internalTracker = trackersInternal.get(id); - if(internalTracker != null) { - internalTracker.setStatus(st); - newData.set(true); - } - break; + break; + case "UPD": // Update tracker data + if(command.length < 9) { + LogManager.log.severe("[SteamVRPipeInputBridge] Error in UPD command. Command requires at least 9 arguments. Supplied: " + commandBuilder.toString()); + return; + } + int id = Integer.parseInt(command[1]); + double x = Double.parseDouble(command[2]); + double y = Double.parseDouble(command[3]); + double z = Double.parseDouble(command[4]); + double qw = Double.parseDouble(command[5]); + double qx = Double.parseDouble(command[6]); + double qy = Double.parseDouble(command[7]); + double qz = Double.parseDouble(command[8]); + internalTracker = trackersInternal.get(id); + if(internalTracker != null) { + internalTracker.position.set((float) x, (float) y, (float) z); + internalTracker.rotation.set((float) qx, (float) qy, (float) qz, (float) qw); + internalTracker.dataTick(); + newData.set(true); + } + break; + case "STA": // Update tracker status + if(command.length < 3) { + LogManager.log.severe("[SteamVRPipeInputBridge] Error in STA command. Command requires at least 3 arguments. Supplied: " + commandBuilder.toString()); + return; + } + id = Integer.parseInt(command[1]); + int status = Integer.parseInt(command[2]); + TrackerStatus st = TrackerStatus.getById(status); + if(st == null) { + LogManager.log.severe("[SteamVRPipeInputBridge] Unrecognized status id. Supplied: " + commandBuilder.toString()); + return; + } + internalTracker = trackersInternal.get(id); + if(internalTracker != null) { + internalTracker.setStatus(st); + newData.set(true); + } + break; } } - + @Override public void dataRead() { if(newData.getAndSet(false)) { @@ -198,7 +199,7 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { VRTracker tracker = trackers.get(i); VRTracker internal = trackersInternal.get(tracker.getTrackerId()); if(internal == null) - throw new NullPointerException("Lost internal tracker somehow: " + tracker.getTrackerId()); // Shouldn't really happen even, but better to catch it like this + throw new NullPointerException("Lost internal tracker somehow: " + tracker.getTrackerId()); // Shouln't really happen even, but better to catch it like this if(internal.getPosition(vBuffer)) tracker.position.set(vBuffer); if(internal.getRotation(qBuffer)) @@ -208,32 +209,32 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { } } } - + @Override public void dataWrite() { // Not used, only input } - + private void resetPipe() { - Pipe.safeDisconnect(pipe); + WindowsPipe.safeDisconnect(pipe); pipe.state = PipeState.CREATED; //Main.vrServer.queueTask(this::disconnected); } - - private boolean tryOpeningPipe(Pipe pipe) { + + private boolean tryOpeningPipe(WindowsPipe pipe) { if(Kernel32.INSTANCE.ConnectNamedPipe(pipe.pipeHandle, null) || Kernel32.INSTANCE.GetLastError() == WinError.ERROR_PIPE_CONNECTED) { pipe.state = PipeState.OPEN; LogManager.log.info("[SteamVRPipeInputBridge] Pipe " + pipe.name + " is open"); return true; } - + LogManager.log.info("[SteamVRPipeInputBridge] Error connecting to pipe " + pipe.name + ": " + Kernel32.INSTANCE.GetLastError()); return false; } - + private void createPipes() throws IOException { try { - pipe = new Pipe(Kernel32.INSTANCE.CreateNamedPipe(PipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode + pipe = new WindowsPipe(Kernel32.INSTANCE.CreateNamedPipe(PipeName, WinBase.PIPE_ACCESS_DUPLEX, // dwOpenMode WinBase.PIPE_TYPE_BYTE | WinBase.PIPE_READMODE_BYTE | WinBase.PIPE_WAIT, // dwPipeMode 1, // nMaxInstances, 1024 * 16, // nOutBufferSize, @@ -245,7 +246,7 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { throw new IOException("Can't open " + PipeName + " pipe: " + Kernel32.INSTANCE.GetLastError()); LogManager.log.info("[SteamVRPipeInputBridge] Pipes are open"); } catch(IOException e) { - Pipe.safeDisconnect(pipe); + WindowsPipe.safeDisconnect(pipe); throw e; } } @@ -253,15 +254,15 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { @Override public void addSharedTracker(ShareableTracker tracker) { // TODO Auto-generated method stub - + } @Override public void removeSharedTracker(ShareableTracker tracker) { // TODO Auto-generated method stub - + } - + public enum SteamVRInputRoles { HEAD(TrackerPosition.HMD), LEFT_HAND(TrackerPosition.LEFT_CONTROLLER), @@ -277,10 +278,10 @@ public class SteamVRPipeInputBridge extends Thread implements Bridge { WAIST(TrackerPosition.WAIST), CHEST(TrackerPosition.CHEST), ; - + private static final SteamVRInputRoles[] values = values(); public final TrackerPosition bodyPosition; - + private SteamVRInputRoles(TrackerPosition slimeVrPosition) { this.bodyPosition = slimeVrPosition; }