diff --git a/src/main/java/io/eiren/vr/bridge/NamedPipeVRBridge.java b/src/main/java/io/eiren/vr/bridge/NamedPipeVRBridge.java index 31d8f431a..7ef1b8243 100644 --- a/src/main/java/io/eiren/vr/bridge/NamedPipeVRBridge.java +++ b/src/main/java/io/eiren/vr/bridge/NamedPipeVRBridge.java @@ -21,19 +21,20 @@ import io.eiren.vr.trackers.Tracker; import io.eiren.vr.trackers.TrackerStatus; public class NamedPipeVRBridge extends Thread implements VRBridge { - + + private static final int MAX_COMMAND_LENGTH = 2048; public static final String HMDPipeName = "\\\\.\\pipe\\HMDPipe"; public static final String TrackersPipeName = "\\\\.\\pipe\\TrackPipe"; public static final Charset ASCII = Charset.forName("ASCII"); - - private final byte[] buffer = new byte[1024]; + + private final byte[] buffArray = new byte[1024]; + private final StringBuilder commandBuilder = new StringBuilder(1024); private final StringBuilder sbBuffer = new StringBuilder(1024); private final Vector3f vBuffer = new Vector3f(); private final Vector3f vBuffer2 = new Vector3f(); private final Quaternion qBuffer = new Quaternion(); private final Quaternion qBuffer2 = new Quaternion(); - private final VRServer server; private Pipe hmdPipe; private final HMDTracker hmd; private final List trackerPipes; @@ -45,7 +46,6 @@ public class NamedPipeVRBridge extends Thread implements VRBridge { public NamedPipeVRBridge(HMDTracker hmd, List shareTrackers, VRServer server) { super("Named Pipe VR Bridge"); - this.server = server; this.hmd = hmd; this.shareTrackers = new FastList<>(shareTrackers); this.trackerPipes = new FastList<>(shareTrackers.size()); @@ -114,30 +114,26 @@ public class NamedPipeVRBridge extends Thread implements VRBridge { } } - public boolean updateHMD() { + public boolean updateHMD() throws IOException { if(hmdPipe.state == PipeState.OPEN) { IntByReference bytesAvailable = new IntByReference(0); if(Kernel32.INSTANCE.PeekNamedPipe(hmdPipe.pipeHandle, null, 0, null, bytesAvailable, null)) { if(bytesAvailable.getValue() > 0) { - if(Kernel32.INSTANCE.ReadFile(hmdPipe.pipeHandle, buffer, buffer.length, bytesAvailable, null)) { - String str = new String(buffer, 0, bytesAvailable.getValue() - 1, ASCII); - String[] split = str.split("\n")[0].split(" "); - try { - double x = Double.parseDouble(split[0]); - double y = Double.parseDouble(split[1]); - double z = Double.parseDouble(split[2]); - double qw = Double.parseDouble(split[3]); - 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(); - newHMDData.set(true); - } catch(NumberFormatException e) { - e.printStackTrace(); + while(Kernel32.INSTANCE.ReadFile(hmdPipe.pipeHandle, buffArray, buffArray.length, bytesAvailable, null)) { + int bytesRead = bytesAvailable.getValue(); + for(int i = 0; i < bytesRead; ++i) { + char c = (char) buffArray[i]; + if(c == '\n') { + executeHMDInput(); + commandBuilder.setLength(0); + } else { + commandBuilder.append(c); + if(commandBuilder.length() >= MAX_COMMAND_LENGTH) + throw new IOException("Command from the pipe is too long"); + } } + if(bytesRead < buffArray.length) + break; // Don't repeat, we read all available bytes } return true; } @@ -146,6 +142,26 @@ public class NamedPipeVRBridge extends Thread implements VRBridge { return false; } + private void executeHMDInput() throws IOException { + String[] split = commandBuilder.toString().split(" "); + try { + double x = Double.parseDouble(split[0]); + double y = Double.parseDouble(split[1]); + double z = Double.parseDouble(split[2]); + double qw = Double.parseDouble(split[3]); + 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(); + newHMDData.set(true); + } catch(NumberFormatException e) { + e.printStackTrace(); + } + } + public void updateTracker(int trackerId, boolean hmdUpdated) { Tracker sensor = internalTrackers.get(trackerId); if(sensor.getStatus().sendData) { @@ -157,10 +173,10 @@ public class NamedPipeVRBridge extends Thread implements VRBridge { sbBuffer.append(vBuffer.x).append(' ').append(vBuffer.y).append(' ').append(vBuffer.z).append(' '); sbBuffer.append(qBuffer.getW()).append(' ').append(qBuffer.getX()).append(' ').append(qBuffer.getY()).append(' ').append(qBuffer.getZ()).append('\n'); String str = sbBuffer.toString(); - System.arraycopy(str.getBytes(ASCII), 0, buffer, 0, str.length()); - buffer[str.length()] = '\0'; + System.arraycopy(str.getBytes(ASCII), 0, buffArray, 0, str.length()); + buffArray[str.length()] = '\0'; IntByReference lpNumberOfBytesWritten = new IntByReference(0); - Kernel32.INSTANCE.WriteFile(trackerPipe.pipeHandle, buffer, str.length() + 1, lpNumberOfBytesWritten, null); + Kernel32.INSTANCE.WriteFile(trackerPipe.pipeHandle, buffArray, str.length() + 1, lpNumberOfBytesWritten, null); } } } @@ -171,11 +187,11 @@ public class NamedPipeVRBridge extends Thread implements VRBridge { private void initTrackerPipe(Pipe pipe, int trackerId) { String trackerHello = this.shareTrackers.size() + " 0"; - System.arraycopy(trackerHello.getBytes(ASCII), 0, buffer, 0, trackerHello.length()); - buffer[trackerHello.length()] = '\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, - buffer, + buffArray, trackerHello.length() + 1, lpNumberOfBytesWritten, null);