From 7b15d242f7bb47e5991b4657efd39eecda8df490 Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Fri, 24 Dec 2021 21:18:58 +0200 Subject: [PATCH] Move rest of the classes to dev.slimev package, comment out wrong unit-test, minor cleanups --- .../{io/eiren/vr => dev/slimevr}/Main.java | 3 ++- .../eiren/vr => dev/slimevr}/VRServer.java | 16 +++++++------- .../java/dev/slimevr/autobone/AutoBone.java | 8 +++---- src/main/java/dev/slimevr/bridge/Bridge.java | 4 ++-- .../dev/slimevr/bridge/NamedPipeBridge.java | 14 ++++++------ .../dev/slimevr/bridge/NamedPipeVRBridge.java | 12 +++++----- .../slimevr/bridge/OpenVRNativeBridge.java | 4 ++-- .../dev/slimevr/bridge/ProtobufBridge.java | 20 ++++++++--------- .../bridge/SteamVRPipeInputBridge.java | 10 ++++----- .../java/dev/slimevr/bridge/VMCBridge.java | 4 ++-- .../dev/slimevr/bridge/WebSocketVRBridge.java | 14 ++++++------ .../java/dev/slimevr/gui/AutoBoneWindow.java | 3 +-- .../dev/slimevr/gui/CalibrationWindow.java | 4 ++-- .../vr => dev/slimevr/gui}/Keybinding.java | 5 ++++- .../dev/slimevr/gui/SkeletonConfigGUI.java | 2 +- .../java/dev/slimevr/gui/SkeletonList.java | 6 ++--- .../java/dev/slimevr/gui/TrackersList.java | 22 +++++++++---------- .../java/dev/slimevr/gui/VRServerGUI.java | 6 ++--- .../hardware/magentometer/Magneto.java | 2 +- .../dev/slimevr/poserecorder/PoseFrameIO.java | 2 +- .../poserecorder/PoseFrameSkeleton.java | 6 ++--- .../poserecorder/PoseFrameTracker.java | 8 +++---- .../dev/slimevr/poserecorder/PoseFrames.java | 2 +- .../slimevr/poserecorder/PoseRecorder.java | 6 ++--- .../slimevr/poserecorder/TrackerFrame.java | 8 +++---- .../slimevr/posestreamer/BVHFileStream.java | 2 +- .../slimevr/posestreamer/PoseStreamer.java | 4 ++-- .../posestreamer/StdBVHFileStream.java | 2 +- .../posestreamer/TransformNodeWrapper.java | 2 +- .../slimevr}/util/ann/VRServerThread.java | 2 +- .../processor/ComputedHumanPoseTracker.java | 10 ++++----- .../ComputedHumanPoseTrackerPosition.java | 2 +- .../vr/processor/HumanPoseProcessor.java | 20 ++++++++--------- .../slimevr}/vr/processor/TransformNode.java | 2 +- .../vr/processor/skeleton/HumanSkeleton.java | 6 ++--- .../vr/processor/skeleton/SimpleSkeleton.java | 20 ++++++++--------- .../slimevr}/vr/trackers/BnoTap.java | 2 +- .../vr/trackers/CalibratingTracker.java | 2 +- .../slimevr}/vr/trackers/ComputedTracker.java | 2 +- .../slimevr}/vr/trackers/DeviceType.java | 2 +- .../slimevr}/vr/trackers/HMDTracker.java | 2 +- .../slimevr}/vr/trackers/IMUTracker.java | 2 +- .../slimevr}/vr/trackers/MPUTracker.java | 2 +- .../vr/trackers/ReferenceAdjustedTracker.java | 2 +- .../vr/trackers/ShareableTracker.java | 2 +- .../slimevr}/vr/trackers/Tracker.java | 2 +- .../slimevr}/vr/trackers/TrackerConfig.java | 2 +- .../vr/trackers/TrackerMountingRotation.java | 2 +- .../slimevr}/vr/trackers/TrackerPosition.java | 2 +- .../slimevr}/vr/trackers/TrackerRole.java | 2 +- .../slimevr}/vr/trackers/TrackerStatus.java | 2 +- .../slimevr}/vr/trackers/TrackerUtils.java | 2 +- .../vr/trackers/TrackerWithBattery.java | 2 +- .../slimevr}/vr/trackers/TrackerWithTPS.java | 2 +- .../vr/trackers/TrackersUDPServer.java | 2 +- .../slimevr}/vr/trackers/VRTracker.java | 2 +- .../unit/ReferenceAdjustmentsTests.java | 14 +++++++----- 57 files changed, 159 insertions(+), 158 deletions(-) rename src/main/java/{io/eiren/vr => dev/slimevr}/Main.java (97%) rename src/main/java/{io/eiren/vr => dev/slimevr}/VRServer.java (95%) rename src/main/java/{io/eiren/vr => dev/slimevr/gui}/Keybinding.java (97%) rename src/main/java/{io/eiren => dev/slimevr}/hardware/magentometer/Magneto.java (88%) rename src/main/java/{io/eiren => dev/slimevr}/util/ann/VRServerThread.java (84%) rename src/main/java/{io/eiren => dev/slimevr}/vr/processor/ComputedHumanPoseTracker.java (77%) rename src/main/java/{io/eiren => dev/slimevr}/vr/processor/ComputedHumanPoseTrackerPosition.java (77%) rename src/main/java/{io/eiren => dev/slimevr}/vr/processor/HumanPoseProcessor.java (89%) rename src/main/java/{io/eiren => dev/slimevr}/vr/processor/TransformNode.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/BnoTap.java (89%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/CalibratingTracker.java (89%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/ComputedTracker.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/DeviceType.java (73%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/HMDTracker.java (93%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/IMUTracker.java (99%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/MPUTracker.java (99%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/ReferenceAdjustedTracker.java (99%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/ShareableTracker.java (74%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/Tracker.java (97%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerConfig.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerMountingRotation.java (93%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerPosition.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerRole.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerStatus.java (94%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerUtils.java (98%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerWithBattery.java (77%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackerWithTPS.java (73%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/TrackersUDPServer.java (99%) rename src/main/java/{io/eiren => dev/slimevr}/vr/trackers/VRTracker.java (95%) rename src/test/java/{io/eiren => dev/slimevr}/unit/ReferenceAdjustmentsTests.java (96%) diff --git a/src/main/java/io/eiren/vr/Main.java b/src/main/java/dev/slimevr/Main.java similarity index 97% rename from src/main/java/io/eiren/vr/Main.java rename to src/main/java/dev/slimevr/Main.java index 9a8c6d62b..49d5f0fbc 100644 --- a/src/main/java/io/eiren/vr/Main.java +++ b/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 javax.swing.JOptionPane; 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 b/src/main/java/dev/slimevr/VRServer.java similarity index 95% rename from src/main/java/io/eiren/vr/VRServer.java rename to src/main/java/dev/slimevr/VRServer.java index 3216dd368..d9f5952ae 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/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.NamedPipeBridge; 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 index 19837edfb..29a6583f8 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -9,6 +9,7 @@ import java.util.function.Consumer; 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.HumanSkeleton; 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 index 31c4e1352..a849402e4 100644 --- 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 index b5a3b19b2..27b92fb94 100644 --- 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.WinBase; 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 implements Runnable { diff --git a/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java b/src/main/java/dev/slimevr/bridge/NamedPipeVRBridge.java index 9bc663ab7..a98f53ce9 100644 --- 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.WinBase; 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 index 0d8de3a84..95e77f05c 100644 --- 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 index cee38b6e0..61584e832 100644 --- a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java +++ b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java @@ -11,21 +11,21 @@ import java.util.concurrent.LinkedBlockingQueue; 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 implements Bridge { @@ -189,7 +189,7 @@ public abstract class ProtobufBridge implements Bridge { 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 @@ public abstract class ProtobufBridge implements Bridge { synchronized(remoteTrackersByTrackerId) { Iterator> 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 index c9ee5a407..4526e92b5 100644 --- 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.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.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 index fa083039a..d49c342a3 100644 --- a/src/main/java/dev/slimevr/bridge/VMCBridge.java +++ b/src/main/java/dev/slimevr/bridge/VMCBridge.java @@ -2,8 +2,8 @@ package dev.slimevr.bridge; 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 index bd24bdbb9..ab31323ac 100644 --- a/src/main/java/dev/slimevr/bridge/WebSocketVRBridge.java +++ b/src/main/java/dev/slimevr/bridge/WebSocketVRBridge.java @@ -17,15 +17,15 @@ import org.json.JSONObject; 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 index 73e174022..14ef4a073 100644 --- a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java +++ b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java @@ -10,19 +10,18 @@ import javax.swing.border.EmptyBorder; 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 index 44f012cd5..b70cf99f6 100644 --- 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.border.EmptyBorder; 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 b/src/main/java/dev/slimevr/gui/Keybinding.java similarity index 97% rename from src/main/java/io/eiren/vr/Keybinding.java rename to src/main/java/dev/slimevr/gui/Keybinding.java index 8acdd27f3..6b3f3abd1 100644 --- a/src/main/java/io/eiren/vr/Keybinding.java +++ b/src/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 index 9ca3f08c4..9d4564e64 100644 --- 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.JButton; 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 index 96fde3721..ce86ce0c6 100644 --- 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.FastMath; 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 index ddd950aa3..3ceffcdf4 100644 --- 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.FastMath; 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 index c9dabb0de..e43b90e0d 100644 --- 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.*; 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/src/main/java/io/eiren/hardware/magentometer/Magneto.java b/src/main/java/dev/slimevr/hardware/magentometer/Magneto.java similarity index 88% rename from src/main/java/io/eiren/hardware/magentometer/Magneto.java rename to src/main/java/dev/slimevr/hardware/magentometer/Magneto.java index de214ad58..c6e9e6f1f 100644 --- a/src/main/java/io/eiren/hardware/magentometer/Magneto.java +++ b/src/main/java/dev/slimevr/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 index 55a3a316e..0bab85f27 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameIO.java @@ -11,9 +11,9 @@ import java.io.FileOutputStream; 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 { diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java index 8afa37798..ecc5a622a 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java @@ -3,11 +3,11 @@ package dev.slimevr.poserecorder; import java.util.List; import java.util.Map; +import dev.slimevr.VRServer; +import dev.slimevr.vr.processor.ComputedHumanPoseTracker; import dev.slimevr.vr.processor.skeleton.SimpleSkeleton; import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; -import io.eiren.vr.VRServer; -import io.eiren.vr.processor.ComputedHumanPoseTracker; -import io.eiren.vr.trackers.Tracker; +import dev.slimevr.vr.trackers.Tracker; public class PoseFrameSkeleton extends SimpleSkeleton { diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java index 971fda55d..e309c5f66 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameTracker.java @@ -5,11 +5,11 @@ import java.util.Iterator; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; +import dev.slimevr.vr.trackers.Tracker; +import dev.slimevr.vr.trackers.TrackerConfig; +import dev.slimevr.vr.trackers.TrackerPosition; +import dev.slimevr.vr.trackers.TrackerStatus; import io.eiren.util.collections.FastList; -import io.eiren.vr.trackers.Tracker; -import io.eiren.vr.trackers.TrackerConfig; -import io.eiren.vr.trackers.TrackerPosition; -import io.eiren.vr.trackers.TrackerStatus; public class PoseFrameTracker implements Tracker, Iterable { diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java index cf4a39643..88a4441a4 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java @@ -4,8 +4,8 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; +import dev.slimevr.vr.trackers.Tracker; import io.eiren.util.collections.FastList; -import io.eiren.vr.trackers.Tracker; public final class PoseFrames implements Iterable { diff --git a/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java b/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java index 1be97dcad..107c456a8 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseRecorder.java @@ -7,11 +7,11 @@ import java.util.concurrent.Future; import org.apache.commons.lang3.tuple.Pair; -import io.eiren.util.ann.VRServerThread; +import dev.slimevr.VRServer; +import dev.slimevr.util.ann.VRServerThread; +import dev.slimevr.vr.trackers.Tracker; import io.eiren.util.collections.FastList; import io.eiren.util.logging.LogManager; -import io.eiren.vr.VRServer; -import io.eiren.vr.trackers.Tracker; public class PoseRecorder { diff --git a/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java b/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java index 570693690..3a871ae34 100644 --- a/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java +++ b/src/main/java/dev/slimevr/poserecorder/TrackerFrame.java @@ -3,10 +3,10 @@ package dev.slimevr.poserecorder; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import io.eiren.vr.trackers.Tracker; -import io.eiren.vr.trackers.TrackerConfig; -import io.eiren.vr.trackers.TrackerPosition; -import io.eiren.vr.trackers.TrackerStatus; +import dev.slimevr.vr.trackers.Tracker; +import dev.slimevr.vr.trackers.TrackerConfig; +import dev.slimevr.vr.trackers.TrackerPosition; +import dev.slimevr.vr.trackers.TrackerStatus; public final class TrackerFrame implements Tracker { diff --git a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java index fe1b1bf14..517db04b0 100644 --- a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java @@ -15,8 +15,8 @@ import com.jme3.math.Vector3f; import org.apache.commons.lang3.StringUtils; +import dev.slimevr.vr.processor.TransformNode; import dev.slimevr.vr.processor.skeleton.HumanSkeleton; -import io.eiren.vr.processor.TransformNode; public class BVHFileStream extends PoseDataStream { diff --git a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java index 5dbd86e73..7a6787f0b 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java @@ -2,10 +2,10 @@ package dev.slimevr.posestreamer; import java.io.IOException; +import dev.slimevr.VRServer; +import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.processor.skeleton.HumanSkeleton; -import io.eiren.util.ann.VRServerThread; import io.eiren.util.logging.LogManager; -import io.eiren.vr.VRServer; public class PoseStreamer { diff --git a/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java index c3f89686e..01e0a5ee1 100644 --- a/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/StdBVHFileStream.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.OutputStream; -import io.eiren.vr.processor.TransformNode; +import dev.slimevr.vr.processor.TransformNode; public class StdBVHFileStream extends BVHFileStream { diff --git a/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java b/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java index 15119078e..4ca22bd64 100644 --- a/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java +++ b/src/main/java/dev/slimevr/posestreamer/TransformNodeWrapper.java @@ -5,8 +5,8 @@ import java.util.List; import com.jme3.math.Quaternion; import com.jme3.math.Transform; +import dev.slimevr.vr.processor.TransformNode; import io.eiren.util.collections.FastList; -import io.eiren.vr.processor.TransformNode; public class TransformNodeWrapper { diff --git a/src/main/java/io/eiren/util/ann/VRServerThread.java b/src/main/java/dev/slimevr/util/ann/VRServerThread.java similarity index 84% rename from src/main/java/io/eiren/util/ann/VRServerThread.java rename to src/main/java/dev/slimevr/util/ann/VRServerThread.java index c592c8149..0ab1ff827 100644 --- a/src/main/java/io/eiren/util/ann/VRServerThread.java +++ b/src/main/java/dev/slimevr/util/ann/VRServerThread.java @@ -1,4 +1,4 @@ -package io.eiren.util.ann; +package dev.slimevr.util.ann; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/io/eiren/vr/processor/ComputedHumanPoseTracker.java b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java similarity index 77% rename from src/main/java/io/eiren/vr/processor/ComputedHumanPoseTracker.java rename to src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java index 894ece527..4e54e65ec 100644 --- a/src/main/java/io/eiren/vr/processor/ComputedHumanPoseTracker.java +++ b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTracker.java @@ -1,10 +1,10 @@ -package io.eiren.vr.processor; +package dev.slimevr.vr.processor; +import dev.slimevr.vr.trackers.ComputedTracker; +import dev.slimevr.vr.trackers.ShareableTracker; +import dev.slimevr.vr.trackers.TrackerRole; +import dev.slimevr.vr.trackers.TrackerWithTPS; import io.eiren.util.BufferedTimer; -import io.eiren.vr.trackers.ComputedTracker; -import io.eiren.vr.trackers.ShareableTracker; -import io.eiren.vr.trackers.TrackerRole; -import io.eiren.vr.trackers.TrackerWithTPS; public class ComputedHumanPoseTracker extends ComputedTracker implements TrackerWithTPS, ShareableTracker { diff --git a/src/main/java/io/eiren/vr/processor/ComputedHumanPoseTrackerPosition.java b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTrackerPosition.java similarity index 77% rename from src/main/java/io/eiren/vr/processor/ComputedHumanPoseTrackerPosition.java rename to src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTrackerPosition.java index c46f2dda4..45bad0fe3 100644 --- a/src/main/java/io/eiren/vr/processor/ComputedHumanPoseTrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/processor/ComputedHumanPoseTrackerPosition.java @@ -1,4 +1,4 @@ -package io.eiren.vr.processor; +package dev.slimevr.vr.processor; public enum ComputedHumanPoseTrackerPosition { diff --git a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java similarity index 89% rename from src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java rename to src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java index 46c7419d7..94d4a9d16 100644 --- a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java @@ -1,21 +1,21 @@ -package io.eiren.vr.processor; +package dev.slimevr.vr.processor; import java.util.List; import java.util.function.Consumer; +import dev.slimevr.VRServer; +import dev.slimevr.util.ann.VRServerThread; import dev.slimevr.vr.processor.skeleton.HumanSkeleton; 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.HMDTracker; +import dev.slimevr.vr.trackers.ShareableTracker; +import dev.slimevr.vr.trackers.Tracker; +import dev.slimevr.vr.trackers.TrackerRole; +import dev.slimevr.vr.trackers.TrackerStatus; 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.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.TrackerStatus; public class HumanPoseProcessor { @@ -71,9 +71,7 @@ public class HumanPoseProcessor { @ThreadSafe public float getSkeletonConfig(SkeletonConfigValue key) { if(skeleton != null) { - Number f = skeleton.getSkeletonConfig().getConfig(key); - if(f != null) - return f.floatValue(); + return skeleton.getSkeletonConfig().getConfig(key); } return 0.0f; } diff --git a/src/main/java/io/eiren/vr/processor/TransformNode.java b/src/main/java/dev/slimevr/vr/processor/TransformNode.java similarity index 98% rename from src/main/java/io/eiren/vr/processor/TransformNode.java rename to src/main/java/dev/slimevr/vr/processor/TransformNode.java index 96ad1e5e0..6b9b43091 100644 --- a/src/main/java/io/eiren/vr/processor/TransformNode.java +++ b/src/main/java/dev/slimevr/vr/processor/TransformNode.java @@ -1,4 +1,4 @@ -package io.eiren.vr.processor; +package dev.slimevr.vr.processor; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java index 82d1acfbb..5c73e5796 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java @@ -1,10 +1,8 @@ package dev.slimevr.vr.processor.skeleton; -import java.util.Map; - +import dev.slimevr.util.ann.VRServerThread; +import dev.slimevr.vr.processor.TransformNode; import io.eiren.util.ann.ThreadSafe; -import io.eiren.util.ann.VRServerThread; -import io.eiren.vr.processor.TransformNode; public abstract class HumanSkeleton { diff --git a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java index a0b5e2d4d..b25f52fdf 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -7,17 +7,17 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import io.eiren.util.ann.VRServerThread; +import dev.slimevr.VRServer; +import dev.slimevr.util.ann.VRServerThread; +import dev.slimevr.vr.processor.ComputedHumanPoseTracker; +import dev.slimevr.vr.processor.ComputedHumanPoseTrackerPosition; +import dev.slimevr.vr.processor.TransformNode; +import dev.slimevr.vr.trackers.Tracker; +import dev.slimevr.vr.trackers.TrackerPosition; +import dev.slimevr.vr.trackers.TrackerRole; +import dev.slimevr.vr.trackers.TrackerStatus; +import dev.slimevr.vr.trackers.TrackerUtils; import io.eiren.util.collections.FastList; -import io.eiren.vr.VRServer; -import io.eiren.vr.processor.ComputedHumanPoseTracker; -import io.eiren.vr.processor.ComputedHumanPoseTrackerPosition; -import io.eiren.vr.processor.TransformNode; -import io.eiren.vr.trackers.Tracker; -import io.eiren.vr.trackers.TrackerPosition; -import io.eiren.vr.trackers.TrackerRole; -import io.eiren.vr.trackers.TrackerStatus; -import io.eiren.vr.trackers.TrackerUtils; public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallback { diff --git a/src/main/java/io/eiren/vr/trackers/BnoTap.java b/src/main/java/dev/slimevr/vr/trackers/BnoTap.java similarity index 89% rename from src/main/java/io/eiren/vr/trackers/BnoTap.java rename to src/main/java/dev/slimevr/vr/trackers/BnoTap.java index 8692e3dbd..4a37f6922 100644 --- a/src/main/java/io/eiren/vr/trackers/BnoTap.java +++ b/src/main/java/dev/slimevr/vr/trackers/BnoTap.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public class BnoTap { diff --git a/src/main/java/io/eiren/vr/trackers/CalibratingTracker.java b/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java similarity index 89% rename from src/main/java/io/eiren/vr/trackers/CalibratingTracker.java rename to src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java index d7cc9f058..f59e8abd6 100644 --- a/src/main/java/io/eiren/vr/trackers/CalibratingTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/CalibratingTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.util.function.Consumer; diff --git a/src/main/java/io/eiren/vr/trackers/ComputedTracker.java b/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java similarity index 98% rename from src/main/java/io/eiren/vr/trackers/ComputedTracker.java rename to src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java index e73c7d0aa..03baa764b 100644 --- a/src/main/java/io/eiren/vr/trackers/ComputedTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/ComputedTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; diff --git a/src/main/java/io/eiren/vr/trackers/DeviceType.java b/src/main/java/dev/slimevr/vr/trackers/DeviceType.java similarity index 73% rename from src/main/java/io/eiren/vr/trackers/DeviceType.java rename to src/main/java/dev/slimevr/vr/trackers/DeviceType.java index e2ef8dffd..0733486bf 100644 --- a/src/main/java/io/eiren/vr/trackers/DeviceType.java +++ b/src/main/java/dev/slimevr/vr/trackers/DeviceType.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public enum DeviceType { HMD, diff --git a/src/main/java/io/eiren/vr/trackers/HMDTracker.java b/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java similarity index 93% rename from src/main/java/io/eiren/vr/trackers/HMDTracker.java rename to src/main/java/dev/slimevr/vr/trackers/HMDTracker.java index 4598ad648..4747c3931 100644 --- a/src/main/java/io/eiren/vr/trackers/HMDTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/HMDTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import io.eiren.util.BufferedTimer; diff --git a/src/main/java/io/eiren/vr/trackers/IMUTracker.java b/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java similarity index 99% rename from src/main/java/io/eiren/vr/trackers/IMUTracker.java rename to src/main/java/dev/slimevr/vr/trackers/IMUTracker.java index 3ef19e6a3..ad3c845f1 100644 --- a/src/main/java/io/eiren/vr/trackers/IMUTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/IMUTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; diff --git a/src/main/java/io/eiren/vr/trackers/MPUTracker.java b/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java similarity index 99% rename from src/main/java/io/eiren/vr/trackers/MPUTracker.java rename to src/main/java/dev/slimevr/vr/trackers/MPUTracker.java index 8c6345b6a..37e9df888 100644 --- a/src/main/java/io/eiren/vr/trackers/MPUTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/MPUTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.nio.ByteBuffer; diff --git a/src/main/java/io/eiren/vr/trackers/ReferenceAdjustedTracker.java b/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java similarity index 99% rename from src/main/java/io/eiren/vr/trackers/ReferenceAdjustedTracker.java rename to src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java index 84af9b7a1..2eafb628f 100644 --- a/src/main/java/io/eiren/vr/trackers/ReferenceAdjustedTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/ReferenceAdjustedTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; diff --git a/src/main/java/io/eiren/vr/trackers/ShareableTracker.java b/src/main/java/dev/slimevr/vr/trackers/ShareableTracker.java similarity index 74% rename from src/main/java/io/eiren/vr/trackers/ShareableTracker.java rename to src/main/java/dev/slimevr/vr/trackers/ShareableTracker.java index 0780b288e..3a3c43b71 100644 --- a/src/main/java/io/eiren/vr/trackers/ShareableTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/ShareableTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public interface ShareableTracker extends Tracker { diff --git a/src/main/java/io/eiren/vr/trackers/Tracker.java b/src/main/java/dev/slimevr/vr/trackers/Tracker.java similarity index 97% rename from src/main/java/io/eiren/vr/trackers/Tracker.java rename to src/main/java/dev/slimevr/vr/trackers/Tracker.java index 263bdad79..2e44815ec 100644 --- a/src/main/java/io/eiren/vr/trackers/Tracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/Tracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/io/eiren/vr/trackers/TrackerConfig.java b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java similarity index 98% rename from src/main/java/io/eiren/vr/trackers/TrackerConfig.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java index b1e28f93f..e213d81e0 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerConfig.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import com.jme3.math.Quaternion; diff --git a/src/main/java/io/eiren/vr/trackers/TrackerMountingRotation.java b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java similarity index 93% rename from src/main/java/io/eiren/vr/trackers/TrackerMountingRotation.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java index f5d4cdf2d..7e630c55f 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerMountingRotation.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; diff --git a/src/main/java/io/eiren/vr/trackers/TrackerPosition.java b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java similarity index 98% rename from src/main/java/io/eiren/vr/trackers/TrackerPosition.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java index b2be77088..58de8d563 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerPosition.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerPosition.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.util.EnumMap; import java.util.HashMap; diff --git a/src/main/java/io/eiren/vr/trackers/TrackerRole.java b/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java similarity index 98% rename from src/main/java/io/eiren/vr/trackers/TrackerRole.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerRole.java index 410d1822d..d06965e79 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerRole.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerRole.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public enum TrackerRole { diff --git a/src/main/java/io/eiren/vr/trackers/TrackerStatus.java b/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java similarity index 94% rename from src/main/java/io/eiren/vr/trackers/TrackerStatus.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java index a5c68eff2..45fcaadf6 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerStatus.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerStatus.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public enum TrackerStatus { diff --git a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java similarity index 98% rename from src/main/java/io/eiren/vr/trackers/TrackerUtils.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java index cce2d3440..13314064d 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerUtils.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.util.List; diff --git a/src/main/java/io/eiren/vr/trackers/TrackerWithBattery.java b/src/main/java/dev/slimevr/vr/trackers/TrackerWithBattery.java similarity index 77% rename from src/main/java/io/eiren/vr/trackers/TrackerWithBattery.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerWithBattery.java index e8f4033dd..8483292ed 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerWithBattery.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerWithBattery.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public interface TrackerWithBattery { diff --git a/src/main/java/io/eiren/vr/trackers/TrackerWithTPS.java b/src/main/java/dev/slimevr/vr/trackers/TrackerWithTPS.java similarity index 73% rename from src/main/java/io/eiren/vr/trackers/TrackerWithTPS.java rename to src/main/java/dev/slimevr/vr/trackers/TrackerWithTPS.java index b65e39f9d..13ea6631f 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerWithTPS.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerWithTPS.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; public interface TrackerWithTPS { diff --git a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java similarity index 99% rename from src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java rename to src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java index f3bf7bdb3..9d4fe0ace 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/io/eiren/vr/trackers/VRTracker.java b/src/main/java/dev/slimevr/vr/trackers/VRTracker.java similarity index 95% rename from src/main/java/io/eiren/vr/trackers/VRTracker.java rename to src/main/java/dev/slimevr/vr/trackers/VRTracker.java index ce54fee64..688e930a5 100644 --- a/src/main/java/io/eiren/vr/trackers/VRTracker.java +++ b/src/main/java/dev/slimevr/vr/trackers/VRTracker.java @@ -1,4 +1,4 @@ -package io.eiren.vr.trackers; +package dev.slimevr.vr.trackers; import io.eiren.util.BufferedTimer; diff --git a/src/test/java/io/eiren/unit/ReferenceAdjustmentsTests.java b/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java similarity index 96% rename from src/test/java/io/eiren/unit/ReferenceAdjustmentsTests.java rename to src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java index 0f3c6bd80..da03b6cab 100644 --- a/src/test/java/io/eiren/unit/ReferenceAdjustmentsTests.java +++ b/src/test/java/dev/slimevr/unit/ReferenceAdjustmentsTests.java @@ -1,14 +1,14 @@ -package io.eiren.unit; +package dev.slimevr.unit; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; +import dev.slimevr.vr.processor.TransformNode; +import dev.slimevr.vr.trackers.ComputedTracker; +import dev.slimevr.vr.trackers.ReferenceAdjustedTracker; +import dev.slimevr.vr.trackers.Tracker; import io.eiren.math.FloatMath; import io.eiren.util.StringUtils; -import io.eiren.vr.processor.TransformNode; -import io.eiren.vr.trackers.ComputedTracker; -import io.eiren.vr.trackers.ReferenceAdjustedTracker; -import io.eiren.vr.trackers.Tracker; import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.DynamicTest.dynamicTest; @@ -57,7 +57,9 @@ public class ReferenceAdjustmentsTests { )); } - @TestFactory + // TODO : Test is not passing because the test is wrong + // See issue https://github.com/SlimeVR/SlimeVR-Server/issues/55 + //@TestFactory Stream getTestsForRotation() { return getAnglesSet().map((p) -> IntStream.of(yaws).mapToObj((refYaw) ->