From 473550ba079335f4f4782a3ded5a09cd6b17f1fb Mon Sep 17 00:00:00 2001 From: ButterscotchVanilla Date: Wed, 8 Dec 2021 23:12:43 -0500 Subject: [PATCH] Move skeleton namespace --- src/main/java/dev/slimevr/autobone/AutoBone.java | 6 +++--- src/main/java/dev/slimevr/gui/AutoBoneWindow.java | 2 +- src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java | 2 +- src/main/java/dev/slimevr/gui/SkeletonList.java | 2 +- .../java/dev/slimevr/poserecorder/PoseFrameSkeleton.java | 4 ++-- src/main/java/dev/slimevr/posestreamer/BVHFileStream.java | 2 +- src/main/java/dev/slimevr/posestreamer/PoseDataStream.java | 2 +- src/main/java/dev/slimevr/posestreamer/PoseStreamer.java | 2 +- .../slimevr/vr/processor/skeleton}/HumanSkeleton.java | 5 ++--- .../slimevr/vr/processor/{ => skeleton}/SimpleSkeleton.java | 3 +-- .../slimevr/vr/processor/{ => skeleton}/SkeletonConfig.java | 2 +- .../vr/processor/{ => skeleton}/SkeletonConfigCallback.java | 2 +- .../vr/processor/{ => skeleton}/SkeletonConfigToggle.java | 2 +- .../vr/processor/{ => skeleton}/SkeletonConfigValue.java | 2 +- .../vr/processor/{ => skeleton}/SkeletonNodeOffset.java | 2 +- src/main/java/io/eiren/vr/VRServer.java | 2 +- src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java | 1 + .../java/io/eiren/vr/processor/HumanSkeletonWithWaist.java | 5 +++-- 18 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/{io/eiren/vr/processor => dev/slimevr/vr/processor/skeleton}/HumanSkeleton.java (86%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SimpleSkeleton.java (99%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SkeletonConfig.java (99%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SkeletonConfigCallback.java (88%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SkeletonConfigToggle.java (96%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SkeletonConfigValue.java (98%) rename src/main/java/dev/slimevr/vr/processor/{ => skeleton}/SkeletonNodeOffset.java (82%) diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index 00d94cfb2..b1db32fa1 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -15,13 +15,13 @@ import dev.slimevr.poserecorder.PoseFrameTracker; import dev.slimevr.poserecorder.PoseFrames; import dev.slimevr.poserecorder.TrackerFrame; import dev.slimevr.poserecorder.TrackerFrameData; -import dev.slimevr.vr.processor.SkeletonConfig; -import dev.slimevr.vr.processor.SkeletonConfigValue; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; +import dev.slimevr.vr.processor.skeleton.SkeletonConfig; +import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; 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.processor.HumanSkeleton; import io.eiren.vr.processor.HumanSkeletonWithLegs; import io.eiren.vr.processor.HumanSkeletonWithWaist; import io.eiren.vr.trackers.TrackerPosition; diff --git a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java index 0f1025365..881748ca6 100644 --- a/src/main/java/dev/slimevr/gui/AutoBoneWindow.java +++ b/src/main/java/dev/slimevr/gui/AutoBoneWindow.java @@ -28,7 +28,7 @@ import dev.slimevr.gui.swing.EJBox; import dev.slimevr.poserecorder.PoseFrames; import dev.slimevr.poserecorder.PoseFrameIO; import dev.slimevr.poserecorder.PoseRecorder; -import dev.slimevr.vr.processor.SkeletonConfigValue; +import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; public class AutoBoneWindow extends JFrame { diff --git a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java index 67527a369..ff270ebe4 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java +++ b/src/main/java/dev/slimevr/gui/SkeletonConfigGUI.java @@ -10,10 +10,10 @@ import javax.swing.event.MouseInputAdapter; import dev.slimevr.gui.swing.ButtonTimer; import dev.slimevr.gui.swing.EJBagNoStretch; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; import io.eiren.util.StringUtils; import io.eiren.util.ann.ThreadSafe; import io.eiren.vr.VRServer; -import io.eiren.vr.processor.HumanSkeleton; 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 cca075871..96fde3721 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonList.java +++ b/src/main/java/dev/slimevr/gui/SkeletonList.java @@ -10,12 +10,12 @@ import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import dev.slimevr.gui.swing.EJBagNoStretch; +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.HumanSkeleton; import io.eiren.vr.processor.TransformNode; public class SkeletonList extends EJBagNoStretch { diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java index 88800a0d9..8afa37798 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrameSkeleton.java @@ -3,8 +3,8 @@ package dev.slimevr.poserecorder; import java.util.List; import java.util.Map; -import dev.slimevr.vr.processor.SimpleSkeleton; -import dev.slimevr.vr.processor.SkeletonConfigValue; +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; diff --git a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java index 508f021f1..fe1b1bf14 100644 --- a/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java +++ b/src/main/java/dev/slimevr/posestreamer/BVHFileStream.java @@ -15,7 +15,7 @@ import com.jme3.math.Vector3f; import org.apache.commons.lang3.StringUtils; -import io.eiren.vr.processor.HumanSkeleton; +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/PoseDataStream.java b/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java index dc23038b6..b92a6aa22 100644 --- a/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java +++ b/src/main/java/dev/slimevr/posestreamer/PoseDataStream.java @@ -6,7 +6,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import io.eiren.vr.processor.HumanSkeleton; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; public abstract class PoseDataStream implements AutoCloseable { diff --git a/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java b/src/main/java/dev/slimevr/posestreamer/PoseStreamer.java index a95fb066e..5dbd86e73 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.vr.processor.skeleton.HumanSkeleton; import io.eiren.util.ann.VRServerThread; import io.eiren.util.logging.LogManager; import io.eiren.vr.VRServer; -import io.eiren.vr.processor.HumanSkeleton; public class PoseStreamer { diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java similarity index 86% rename from src/main/java/io/eiren/vr/processor/HumanSkeleton.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java index 6011757ea..2652b2df8 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java @@ -1,11 +1,10 @@ -package io.eiren.vr.processor; +package dev.slimevr.vr.processor.skeleton; import java.util.Map; -import dev.slimevr.vr.processor.SkeletonConfig; -import dev.slimevr.vr.processor.SkeletonConfigValue; 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/SimpleSkeleton.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java similarity index 99% rename from src/main/java/dev/slimevr/vr/processor/SimpleSkeleton.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java index ef73d4b68..c9d07c93e 100644 --- a/src/main/java/dev/slimevr/vr/processor/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; import java.util.List; import java.util.Map; @@ -12,7 +12,6 @@ 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.HumanSkeleton; import io.eiren.vr.processor.TransformNode; import io.eiren.vr.trackers.Tracker; import io.eiren.vr.trackers.TrackerPosition; diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java similarity index 99% rename from src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java index 80e65f6a8..2b11742fb 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonConfig.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfig.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; import java.util.EnumMap; import java.util.Map; diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigCallback.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java similarity index 88% rename from src/main/java/dev/slimevr/vr/processor/SkeletonConfigCallback.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java index 0e2bbcfcc..780534fc8 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigCallback.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigCallback.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; import com.jme3.math.Vector3f; diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigToggle.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java similarity index 96% rename from src/main/java/dev/slimevr/vr/processor/SkeletonConfigToggle.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java index 8e125b8cd..e6e316052 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigToggle.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigToggle.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigValue.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java similarity index 98% rename from src/main/java/dev/slimevr/vr/processor/SkeletonConfigValue.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java index 4b16767b2..aa17ff1f8 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonConfigValue.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonConfigValue.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/dev/slimevr/vr/processor/SkeletonNodeOffset.java b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonNodeOffset.java similarity index 82% rename from src/main/java/dev/slimevr/vr/processor/SkeletonNodeOffset.java rename to src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonNodeOffset.java index 2f7622717..45ed9fe92 100644 --- a/src/main/java/dev/slimevr/vr/processor/SkeletonNodeOffset.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SkeletonNodeOffset.java @@ -1,4 +1,4 @@ -package dev.slimevr.vr.processor; +package dev.slimevr.vr.processor.skeleton; public enum SkeletonNodeOffset { diff --git a/src/main/java/io/eiren/vr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java index 7890cdb9b..3216dd368 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/src/main/java/io/eiren/vr/VRServer.java @@ -20,13 +20,13 @@ import dev.slimevr.bridge.NamedPipeBridge; import dev.slimevr.bridge.SteamVRPipeInputBridge; import dev.slimevr.bridge.VMCBridge; import dev.slimevr.bridge.WebSocketVRBridge; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; 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.processor.HumanSkeleton; import io.eiren.vr.trackers.HMDTracker; import io.eiren.vr.trackers.ShareableTracker; import io.eiren.vr.trackers.TrackersUDPServer; diff --git a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java index 926f1a7c5..b4347d595 100644 --- a/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/io/eiren/vr/processor/HumanPoseProcessor.java @@ -3,6 +3,7 @@ package io.eiren.vr.processor; import java.util.List; import java.util.function.Consumer; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; import io.eiren.util.ann.ThreadSafe; import io.eiren.util.ann.VRServerThread; import io.eiren.util.collections.FastList; diff --git a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java index 17abadd95..3758be1e5 100644 --- a/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java +++ b/src/main/java/io/eiren/vr/processor/HumanSkeletonWithWaist.java @@ -7,8 +7,9 @@ import java.util.Map; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; -import dev.slimevr.vr.processor.SkeletonConfig; -import dev.slimevr.vr.processor.SkeletonConfigValue; +import dev.slimevr.vr.processor.skeleton.HumanSkeleton; +import dev.slimevr.vr.processor.skeleton.SkeletonConfig; +import dev.slimevr.vr.processor.skeleton.SkeletonConfigValue; import io.eiren.util.ann.VRServerThread; import io.eiren.vr.VRServer; import io.eiren.vr.trackers.HMDTracker;