Merge pull request #121 from ButterscotchV/spell-fix

Fix spelling mistakes
This commit is contained in:
Eiren Rain authored and GitHub committed 2022-02-09 21:09:33 +02:00
commit c5945d784b
12 files changed
+35 -35

No files matched your search

+2 -2
View File
@@ -4,10 +4,10 @@ import dev.slimevr.util.ann.VRServerThread;
import dev.slimevr.vr.trackers.ShareableTracker;
/**
* Bridge handles sending and recieving tracker data
* Bridge handles sending and receiving tracker data
* between SlimeVR and other systems like VR APIs (SteamVR, OpenXR, etc),
* apps and protocols (VMC, WebSocket, TIP). It can create and manage
* tracker recieved from the <b>remote side</b> or send shared <b>local
* tracker received from the <b>remote side</b> or send shared <b>local
* trackers</b> to the other side.
*/
public interface Bridge {
@@ -166,7 +166,7 @@ public class NamedPipeBridge extends ProtobufBridge<VRTracker> implements Runnab
if(bytesAvailable.getValue() >= messageLength) {
if(Kernel32.INSTANCE.ReadFile(pipe.pipeHandle, buffArray, messageLength, bytesAvailable, null)) {
ProtobufMessage message = ProtobufMessage.parser().parseFrom(buffArray, 4, messageLength - 4);
messageRecieved(message);
messageReceived(message);
readAnything = true;
} else {
pipe.state = PipeState.ERROR;
@@ -58,7 +58,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
protected abstract boolean sendMessageReal(ProtobufMessage message);
@BridgeThread
protected void messageRecieved(ProtobufMessage message) {
protected void messageReceived(ProtobufMessage message) {
inputQueue.add(message);
}
@@ -82,7 +82,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
hadNewData = false;
ProtobufMessage message = null;
while((message = inputQueue.poll()) != null) {
processMessageRecieved(message);
processMessageReceived(message);
hadNewData = true;
}
if(hadNewData && hmdTracker != null) {
@@ -101,7 +101,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
@VRServerThread
@Override
public void dataWrite() {
if(!hadNewData) // Don't write anything if no message were recieved, we always process at the speed of the other side
if(!hadNewData) // Don't write anything if no message were received, we always process at the speed of the other side
return;
for(int i = 0; i < sharedTrackers.size(); ++i) {
writeTrackerUpdate(sharedTrackers.get(i));
@@ -126,22 +126,22 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
}
@VRServerThread
protected void processMessageRecieved(ProtobufMessage message) {
protected void processMessageReceived(ProtobufMessage message) {
//if(!message.hasPosition())
// LogManager.log.info("[" + bridgeName + "] MSG: " + message);
if(message.hasPosition()) {
positionRecieved(message.getPosition());
positionReceived(message.getPosition());
} else if(message.hasUserAction()) {
userActionRecieved(message.getUserAction());
userActionReceived(message.getUserAction());
} else if(message.hasTrackerStatus()) {
trackerStatusRecieved(message.getTrackerStatus());
trackerStatusReceived(message.getTrackerStatus());
} else if(message.hasTrackerAdded()) {
trackerAddedRecieved(message.getTrackerAdded());
trackerAddedReceived(message.getTrackerAdded());
}
}
@VRServerThread
protected void positionRecieved(Position positionMessage) {
protected void positionReceived(Position positionMessage) {
T tracker = getInternalRemoteTrackerById(positionMessage.getTrackerId());
if(tracker != null) {
if(positionMessage.hasX())
@@ -155,7 +155,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
protected abstract T createNewTracker(TrackerAdded trackerAdded);
@VRServerThread
protected void trackerAddedRecieved(TrackerAdded trackerAdded) {
protected void trackerAddedReceived(TrackerAdded trackerAdded) {
T tracker = getInternalRemoteTrackerById(trackerAdded.getTrackerId());
if(tracker != null) {
// TODO reinit?
@@ -176,7 +176,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
}
@VRServerThread
protected void userActionRecieved(UserAction userAction) {
protected void userActionReceived(UserAction userAction) {
switch(userAction.getName()) {
case "calibrate":
// TODO : Check pose field
@@ -186,7 +186,7 @@ public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
}
@VRServerThread
protected void trackerStatusRecieved(TrackerStatus trackerStatus) {
protected void trackerStatusReceived(TrackerStatus trackerStatus) {
T tracker = getInternalRemoteTrackerById(trackerStatus.getTrackerId());
if(tracker != null) {
tracker.setStatus(dev.slimevr.vr.trackers.TrackerStatus.getById(trackerStatus.getStatusValue()));
@@ -198,7 +198,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()); // Shouln't really happen even, but better to catch it like this
throw new NullPointerException("Lost internal tracker somehow: " + tracker.getTrackerId()); // Shouldn't really happen even, but better to catch it like this
if(internal.getPosition(vBuffer))
tracker.position.set(vBuffer);
if(internal.getRotation(qBuffer))
@@ -36,7 +36,7 @@ public class WebSocketVRBridge extends WebSocketServer implements Bridge {
private final List<? extends ShareableTracker> shareTrackers;
private final List<ComputedTracker> internalTrackers;
private final HMDTracker internalHMDTracker = new HMDTracker("itnernal://HMD");
private final HMDTracker internalHMDTracker = new HMDTracker("internal://HMD");
private final AtomicBoolean newHMDData = new AtomicBoolean(false);
public WebSocketVRBridge(HMDTracker hmd, List<? extends ShareableTracker> shareTrackers, VRServer server) {
@@ -116,7 +116,7 @@ public class WebSocketVRBridge extends WebSocketServer implements Bridge {
parseAction(json, conn);
return;
case "config": // TODO Ignore it for now, it should only register HMD in our test case with id 0
LogManager.log.info("[WebSocket] Config recieved: " + json.toString());
LogManager.log.info("[WebSocket] Config received: " + json.toString());
return;
}
}
@@ -32,14 +32,14 @@ public class CalibrationWindow extends JFrame {
build();
}
public void currentCalibrationRecieved(String str) {
public void currentCalibrationReceived(String str) {
java.awt.EventQueue.invokeLater(() -> {
currentCalibration.setText(str);
pack();
});
}
public void newCalibrationRecieved(String str) {
public void newCalibrationReceived(String str) {
java.awt.EventQueue.invokeLater(() -> {
calibrateButton.setText("Calibrate");
newCalibration.setText(str);
@@ -56,7 +56,7 @@ public class CalibrationWindow extends JFrame {
@Override
public void mouseClicked(MouseEvent e) {
calibrateButton.setText("Calibrating...");
((CalibratingTracker) tracker).startCalibration(CalibrationWindow.this::newCalibrationRecieved);
((CalibratingTracker) tracker).startCalibration(CalibrationWindow.this::newCalibrationReceived);
}
});
}});
@@ -66,7 +66,7 @@ public class CalibrationWindow extends JFrame {
add(new JLabel("Current calibration"));
add(currentCalibration = new JTextArea(10, 25));
((CalibratingTracker) tracker).requestCalibrationData(CalibrationWindow.this::currentCalibrationRecieved);
((CalibratingTracker) tracker).requestCalibrationData(CalibrationWindow.this::currentCalibrationReceived);
}});
pane.add(new EJBox(BoxLayout.PAGE_AXIS) {{
setBorder(new EmptyBorder(i(5)));
@@ -111,7 +111,7 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery {
@Override
public boolean getRotation(Quaternion store) {
store.set(rotQuaternion);
//correction.mult(store, store); // Correction is not used now to preven accidental errors while debugging other things
//correction.mult(store, store); // Correction is not used now to prevent accidental errors while debugging other things
store.multLocal(rotAdjust);
return true;
}
@@ -192,7 +192,7 @@ public class IMUTracker implements Tracker, TrackerWithTPS, TrackerWithBattery {
*/
protected void calculateLiveMagnetometerCorrection() {
// TODO Magic, correct only yaw
// TODO Print "jump" length when correcing if it's more than 1 degree
// TODO Print "jump" length when correcting if it's more than 1 degree
}
@Override
@@ -14,7 +14,7 @@ public class MPUTracker extends IMUTracker {
public static class ConfigurationData {
//acel offsets and correction matrix
//accel offsets and correction matrix
float[] A_B = new float[3];
float[][] A_Ainv = new float[3][3];
// mag offsets and correction matrix
@@ -57,7 +57,7 @@ public class ReferenceAdjustedTracker<E extends Tracker> implements Tracker {
/**
* Reset the tracker so that it's current yaw rotation
* is counted as <HMD Yaw>. This allows the tracker
* to have yaw independant of the HMD. Tracker should
* to have yaw independent of the HMD. Tracker should
* still report yaw as if it was mounted facing HMD,
* mounting position should be corrected in the source.
*/
@@ -18,7 +18,7 @@ public enum TrackerPosition {
LEFT_FOOT("body:left_foot", TrackerRole.LEFT_FOOT),
RIGHT_FOOT("body:right_foot", TrackerRole.RIGHT_FOOT),
LEFT_CONTROLLER("body:left_controller", TrackerRole.LEFT_CONTROLLER),
RIGHT_CONTROLLER("body:right_conroller", TrackerRole.RIGHT_CONTROLLER),
RIGHT_CONTROLLER("body:right_controller", TrackerRole.RIGHT_CONTROLLER),
;
public final String designation;
@@ -52,4 +52,4 @@ public enum TrackerPosition {
}
}
}
}
}
@@ -37,12 +37,12 @@ import io.eiren.util.collections.FastList;
import io.eiren.util.logging.LogManager;
/**
* Recieves trackers data by UDP using extended owoTrack protocol.
* Receives trackers data by UDP using extended owoTrack protocol.
*/
public class TrackersUDPServer extends Thread {
/**
* Change between IMU axises and OpenGL/SteamVR axises
* Change between IMU axes and OpenGL/SteamVR axes
*/
private static final Quaternion offset = new Quaternion().fromAngleAxis(-FastMath.HALF_PI, Vector3f.UNIT_X);
@@ -90,7 +90,7 @@ public class TrackersUDPServer extends Thread {
}
private void setUpNewConnection(DatagramPacket handshakePacket, UDPPacket3Handshake handshake) throws IOException {
LogManager.log.info("[TrackerServer] Handshake recieved from " + handshakePacket.getAddress() + ":" + handshakePacket.getPort());
LogManager.log.info("[TrackerServer] Handshake received from " + handshakePacket.getAddress() + ":" + handshakePacket.getPort());
InetAddress addr = handshakePacket.getAddress();
TrackerUDPConnection connection;
synchronized(connections) {
@@ -100,7 +100,7 @@ public class TrackersUDPServer extends Thread {
connection = new TrackerUDPConnection(handshakePacket.getSocketAddress(), addr);
connection.firmwareBuild = handshake.firmwareBuild;
if(handshake.firmware == null || handshake.firmware.length() == 0) {
// Only old owoTrack doesn't report firmware and have differenet packet IDs with SlimeVR
// Only old owoTrack doesn't report firmware and have different packet IDs with SlimeVR
connection.protocol = NetworkProtocol.OWO_LEGACY;
} else {
connection.protocol = NetworkProtocol.SLIMEVR_RAW;
@@ -332,7 +332,7 @@ public class TrackersUDPServer extends Thread {
tracker.dataTick();
}
} else {
LogManager.log.debug("[TrackerServer] Wrog ping id " + ping.pingId + " != " + connection.lastPingPacketId);
LogManager.log.debug("[TrackerServer] Wrong ping id " + ping.pingId + " != " + connection.lastPingPacketId);
}
break;
case UDPProtocolParser.PACKET_SERIAL:
@@ -366,7 +366,7 @@ public class TrackersUDPServer extends Thread {
break;
case UDPProtocolParser.PACKET_ERROR:
UDPPacket14Error error = (UDPPacket14Error) packet;
LogManager.log.severe("[TrackerServer] Error recieved from " + received.getSocketAddress() + ": " + error.errorNumber);
LogManager.log.severe("[TrackerServer] Error received from " + received.getSocketAddress() + ": " + error.errorNumber);
if(connection == null)
break;
tracker = connection.sensors.get(error.getSensorId());
@@ -51,7 +51,7 @@ public class UDPProtocolParser {
if(newPacket != null) {
newPacket.readData(buf);
} else {
//LogManager.log.debug("[UDPPorotocolParser] Skipped packet id " + packetId + " from " + connection);
//LogManager.log.debug("[UDPProtocolParser] Skipped packet id " + packetId + " from " + connection);
}
return newPacket;
}