Move rest of the classes to dev.slimev package, comment out wrong uni…

…t-test, minor cleanups
SlimeVR · Dec 24, 2021 · 7b15d24 · 7b15d24
1 parent b81458d
commit 7b15d24
Show file tree

Hide file tree

Showing 57 changed files with 159 additions and 158 deletions.
diff --git a/src/main/java/io/eiren/vr/Main.java → src/main/java/dev/slimevr/Main.java b/src/main/java/io/eiren/vr/Main.java → src/main/java/dev/slimevr/Main.java
@@ -1,4 +1,4 @@
-package io.eiren.vr;
+package dev.slimevr;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,6 +9,7 @@
 import org.apache.commons.lang3.JavaVersion;
 import org.apache.commons.lang3.SystemUtils;
 
+import dev.slimevr.gui.Keybinding;
 import dev.slimevr.gui.VRServerGUI;
 import io.eiren.util.logging.LogManager;
 

diff --git a/src/main/java/io/eiren/vr/VRServer.java → src/main/java/dev/slimevr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java → src/main/java/dev/slimevr/VRServer.java
@@ -1,4 +1,4 @@
-package io.eiren.vr;
+package dev.slimevr;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,21 +20,21 @@
 import dev.slimevr.bridge.SteamVRPipeInputBridge;
 import dev.slimevr.bridge.VMCBridge;
 import dev.slimevr.bridge.WebSocketVRBridge;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.processor.HumanPoseProcessor;
 import dev.slimevr.vr.processor.skeleton.HumanSkeleton;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.Tracker;
+import dev.slimevr.vr.trackers.TrackerConfig;
+import dev.slimevr.vr.trackers.TrackersUDPServer;
 import io.eiren.util.OperatingSystem;
 import io.eiren.util.ann.ThreadSafe;
 import io.eiren.util.ann.ThreadSecure;
-import io.eiren.util.ann.VRServerThread;
 import io.eiren.util.collections.FastList;
-import io.eiren.vr.processor.HumanPoseProcessor;
-import io.eiren.vr.trackers.HMDTracker;
-import io.eiren.vr.trackers.ShareableTracker;
-import io.eiren.vr.trackers.TrackersUDPServer;
 import io.eiren.yaml.YamlException;
 import io.eiren.yaml.YamlFile;
 import io.eiren.yaml.YamlNode;
-import io.eiren.vr.trackers.Tracker;
-import io.eiren.vr.trackers.TrackerConfig;
 
 public class VRServer extends Thread {
 

diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java
@@ -9,6 +9,7 @@
 import com.jme3.math.FastMath;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.VRServer;
 import dev.slimevr.poserecorder.PoseFrameSkeleton;
 import dev.slimevr.poserecorder.PoseFrameTracker;
 import dev.slimevr.poserecorder.PoseFrames;
@@ -18,13 +19,12 @@
 import dev.slimevr.vr.processor.skeleton.SimpleSkeleton;
 import dev.slimevr.vr.processor.skeleton.SkeletonConfig;
 import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue;
+import dev.slimevr.vr.trackers.TrackerPosition;
+import dev.slimevr.vr.trackers.TrackerRole;
+import dev.slimevr.vr.trackers.TrackerUtils;
 import io.eiren.util.ann.ThreadSafe;
 import io.eiren.util.logging.LogManager;
 import io.eiren.util.collections.FastList;
-import io.eiren.vr.VRServer;
-import io.eiren.vr.trackers.TrackerPosition;
-import io.eiren.vr.trackers.TrackerRole;
-import io.eiren.vr.trackers.TrackerUtils;
 
 public class AutoBone {
 

diff --git a/src/main/java/dev/slimevr/bridge/Bridge.java b/src/main/java/dev/slimevr/bridge/Bridge.java
@@ -1,7 +1,7 @@
 package dev.slimevr.bridge;
 
-import io.eiren.util.ann.VRServerThread;
-import io.eiren.vr.trackers.ShareableTracker;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.trackers.ShareableTracker;
 
 /**
  * Bridge handles sending and recieving tracker data

diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java b/src/main/java/dev/slimevr/bridge/NamedPipeBridge.java
@@ -9,17 +9,17 @@
 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.ProtobufMessages.ProtobufMessage;
 import dev.slimevr.bridge.ProtobufMessages.TrackerAdded;
-import io.eiren.util.ann.VRServerThread;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.TrackerPosition;
+import dev.slimevr.vr.trackers.TrackerRole;
+import dev.slimevr.vr.trackers.VRTracker;
 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<VRTracker> implements Runnable {
 

diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java b/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java
@@ -12,15 +12,15 @@
 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.vr.trackers.ComputedTracker;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.Tracker;
+import dev.slimevr.vr.trackers.TrackerStatus;
 import io.eiren.util.collections.FastList;
 import io.eiren.util.logging.LogManager;
-import io.eiren.vr.VRServer;
-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.TrackerStatus;
 
 public class NamedPipeVRBridge extends Thread implements Bridge {
 

diff --git a/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java b/src/main/java/dev/slimevr/bridge/OpenVRNativeBridge.java
@@ -1,7 +1,7 @@
 package dev.slimevr.bridge;
 
-import io.eiren.util.ann.VRServerThread;
-import io.eiren.vr.trackers.ShareableTracker;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.trackers.ShareableTracker;
 
 public class OpenVRNativeBridge implements Bridge {
 

diff --git a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java
@@ -11,21 +11,21 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.Main;
 import dev.slimevr.bridge.ProtobufMessages.Position;
 import dev.slimevr.bridge.ProtobufMessages.ProtobufMessage;
 import dev.slimevr.bridge.ProtobufMessages.TrackerAdded;
 import dev.slimevr.bridge.ProtobufMessages.TrackerStatus;
 import dev.slimevr.bridge.ProtobufMessages.UserAction;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.trackers.ComputedTracker;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.TrackerRole;
+import dev.slimevr.vr.trackers.VRTracker;
 import io.eiren.util.ann.Synchronize;
 import io.eiren.util.ann.ThreadSafe;
-import io.eiren.util.ann.VRServerThread;
 import io.eiren.util.collections.FastList;
-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.TrackerRole;
-import io.eiren.vr.trackers.VRTracker;
 
 public abstract class ProtobufBridge<T extends VRTracker> implements Bridge {
 
@@ -189,7 +189,7 @@ protected void userActionRecieved(UserAction userAction) {
 	protected void trackerStatusRecieved(TrackerStatus trackerStatus) {
 		T tracker = getInternalRemoteTrackerById(trackerStatus.getTrackerId());
 		if(tracker != null) {
-			tracker.setStatus(io.eiren.vr.trackers.TrackerStatus.getById(trackerStatus.getStatusValue()));
+			tracker.setStatus(dev.slimevr.vr.trackers.TrackerStatus.getById(trackerStatus.getStatusValue()));
 		}
 	}
 
@@ -214,11 +214,11 @@ protected void disconnected() {
 		synchronized(remoteTrackersByTrackerId) {
 			Iterator<Entry<Integer, T>> iterator = remoteTrackersByTrackerId.entrySet().iterator();
 			while(iterator.hasNext()) {
-				iterator.next().getValue().setStatus(io.eiren.vr.trackers.TrackerStatus.DISCONNECTED);
+				iterator.next().getValue().setStatus(dev.slimevr.vr.trackers.TrackerStatus.DISCONNECTED);
 			}
 		}
 		if(hmdTracker != null) {
-			hmd.setStatus(io.eiren.vr.trackers.TrackerStatus.DISCONNECTED);
+			hmd.setStatus(dev.slimevr.vr.trackers.TrackerStatus.DISCONNECTED);
 		}
 	}
 

diff --git a/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/bridge/SteamVRPipeInputBridge.java
@@ -16,14 +16,14 @@
 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.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.TrackerPosition;
+import dev.slimevr.vr.trackers.TrackerStatus;
+import dev.slimevr.vr.trackers.VRTracker;
 import io.eiren.util.collections.FastList;
 import io.eiren.util.logging.LogManager;
-import io.eiren.vr.VRServer;
-import io.eiren.vr.trackers.VRTracker;
-import io.eiren.vr.trackers.ShareableTracker;
-import io.eiren.vr.trackers.TrackerPosition;
-import io.eiren.vr.trackers.TrackerStatus;
 
 public class SteamVRPipeInputBridge extends Thread implements Bridge {
 

diff --git a/src/main/java/dev/slimevr/bridge/VMCBridge.java b/src/main/java/dev/slimevr/bridge/VMCBridge.java
@@ -2,8 +2,8 @@
 
 import java.net.InetAddress;
 
-import io.eiren.vr.trackers.ShareableTracker;
-import io.eiren.vr.trackers.Tracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.Tracker;
 
 public class VMCBridge extends Thread implements Bridge {
 

diff --git a/src/main/java/dev/slimevr/bridge/WebSocketVRBridge.java b/src/main/java/dev/slimevr/bridge/WebSocketVRBridge.java
@@ -17,15 +17,15 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.Main;
+import dev.slimevr.VRServer;
+import dev.slimevr.vr.trackers.ComputedTracker;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.ShareableTracker;
+import dev.slimevr.vr.trackers.Tracker;
+import dev.slimevr.vr.trackers.TrackerStatus;
 import io.eiren.util.collections.FastList;
 import io.eiren.util.logging.LogManager;
-import io.eiren.vr.Main;
-import io.eiren.vr.VRServer;
-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.TrackerStatus;
 
 public class WebSocketVRBridge extends WebSocketServer implements Bridge {
 

diff --git a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java
@@ -10,19 +10,18 @@
 import java.awt.event.MouseEvent;
 import java.io.File;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.concurrent.Future;
 
 import io.eiren.util.StringUtils;
 import io.eiren.util.ann.AWTThread;
 import io.eiren.util.collections.FastList;
 import io.eiren.util.logging.LogManager;
-import io.eiren.vr.VRServer;
 
 import javax.swing.event.MouseInputAdapter;
 
 import org.apache.commons.lang3.tuple.Pair;
 
+import dev.slimevr.VRServer;
 import dev.slimevr.autobone.AutoBone;
 import dev.slimevr.gui.swing.EJBox;
 import dev.slimevr.poserecorder.PoseFrames;

diff --git a/src/main/java/dev/slimevr/gui/CalibrationWindow.java b/src/main/java/dev/slimevr/gui/CalibrationWindow.java
@@ -13,9 +13,9 @@
 import javax.swing.event.MouseInputAdapter;
 
 import dev.slimevr.gui.swing.EJBox;
+import dev.slimevr.vr.trackers.CalibratingTracker;
+import dev.slimevr.vr.trackers.Tracker;
 import io.eiren.util.ann.AWTThread;
-import io.eiren.vr.trackers.CalibratingTracker;
-import io.eiren.vr.trackers.Tracker;
 
 public class CalibrationWindow extends JFrame {
 

diff --git a/src/main/java/io/eiren/vr/Keybinding.java → ...main/java/dev/slimevr/gui/Keybinding.java b/src/main/java/io/eiren/vr/Keybinding.java → ...main/java/dev/slimevr/gui/Keybinding.java
@@ -1,7 +1,10 @@
-package io.eiren.vr;
+package dev.slimevr.gui;
 
 import com.melloware.jintellitype.JIntellitype;
 import com.melloware.jintellitype.JIntellitypeException;
+
+import dev.slimevr.VRServer;
+
 import com.melloware.jintellitype.HotkeyListener;
 import io.eiren.util.ann.AWTThread;
 import io.eiren.util.logging.LogManager;

diff --git a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java
@@ -8,13 +8,13 @@
 import javax.swing.JLabel;
 import javax.swing.event.MouseInputAdapter;
 
+import dev.slimevr.VRServer;
 import dev.slimevr.gui.swing.ButtonTimer;
 import dev.slimevr.gui.swing.EJBagNoStretch;
 import dev.slimevr.vr.processor.skeleton.HumanSkeleton;
 import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue;
 import io.eiren.util.StringUtils;
 import io.eiren.util.ann.ThreadSafe;
-import io.eiren.vr.VRServer;
 
 public class SkeletonConfigGUI extends EJBagNoStretch {
 

diff --git a/src/main/java/dev/slimevr/gui/SkeletonList.java b/src/main/java/dev/slimevr/gui/SkeletonList.java
@@ -9,14 +9,14 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.VRServer;
 import dev.slimevr.gui.swing.EJBagNoStretch;
+import dev.slimevr.util.ann.VRServerThread;
+import dev.slimevr.vr.processor.TransformNode;
 import dev.slimevr.vr.processor.skeleton.HumanSkeleton;
 import io.eiren.util.StringUtils;
 import io.eiren.util.ann.ThreadSafe;
-import io.eiren.util.ann.VRServerThread;
 import io.eiren.util.collections.FastList;
-import io.eiren.vr.VRServer;
-import io.eiren.vr.processor.TransformNode;
 
 public class SkeletonList extends EJBagNoStretch {
 

diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java
@@ -17,23 +17,23 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.VRServer;
 import dev.slimevr.gui.swing.EJBagNoStretch;
 import dev.slimevr.gui.swing.EJBoxNoStretch;
+import dev.slimevr.vr.trackers.ComputedTracker;
+import dev.slimevr.vr.trackers.HMDTracker;
+import dev.slimevr.vr.trackers.IMUTracker;
+import dev.slimevr.vr.trackers.ReferenceAdjustedTracker;
+import dev.slimevr.vr.trackers.Tracker;
+import dev.slimevr.vr.trackers.TrackerConfig;
+import dev.slimevr.vr.trackers.TrackerMountingRotation;
+import dev.slimevr.vr.trackers.TrackerPosition;
+import dev.slimevr.vr.trackers.TrackerWithBattery;
+import dev.slimevr.vr.trackers.TrackerWithTPS;
 import io.eiren.util.StringUtils;
 import io.eiren.util.ann.AWTThread;
 import io.eiren.util.ann.ThreadSafe;
 import io.eiren.util.collections.FastList;
-import io.eiren.vr.VRServer;
-import io.eiren.vr.trackers.ReferenceAdjustedTracker;
-import io.eiren.vr.trackers.ComputedTracker;
-import io.eiren.vr.trackers.HMDTracker;
-import io.eiren.vr.trackers.IMUTracker;
-import io.eiren.vr.trackers.Tracker;
-import io.eiren.vr.trackers.TrackerConfig;
-import io.eiren.vr.trackers.TrackerMountingRotation;
-import io.eiren.vr.trackers.TrackerPosition;
-import io.eiren.vr.trackers.TrackerWithBattery;
-import io.eiren.vr.trackers.TrackerWithTPS;
 
 public class TrackersList extends EJBoxNoStretch {
 

diff --git a/src/main/java/dev/slimevr/gui/VRServerGUI.java b/src/main/java/dev/slimevr/gui/VRServerGUI.java
@@ -5,18 +5,18 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.MouseInputAdapter;
 
+import dev.slimevr.Main;
+import dev.slimevr.VRServer;
 import dev.slimevr.bridge.NamedPipeBridge;
 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 dev.slimevr.vr.trackers.TrackerRole;
 import io.eiren.util.MacOSX;
 import io.eiren.util.OperatingSystem;
 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;

diff --git a/.../eiren/hardware/magentometer/Magneto.java → ...limevr/hardware/magentometer/Magneto.java b/.../eiren/hardware/magentometer/Magneto.java → ...limevr/hardware/magentometer/Magneto.java
@@ -1,4 +1,4 @@
-package io.eiren.hardware.magentometer;
+package dev.slimevr.hardware.magentometer;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;

diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java
@@ -11,9 +11,9 @@
 import com.jme3.math.Quaternion;
 import com.jme3.math.Vector3f;
 
+import dev.slimevr.vr.trackers.TrackerPosition;
 import io.eiren.util.collections.FastList;
 import io.eiren.util.logging.LogManager;
-import io.eiren.vr.trackers.TrackerPosition;
 
 public final class PoseFrameIO {