diff --git a/src/main/java/dev/slimevr/gui/SkeletonList.java b/src/main/java/dev/slimevr/gui/SkeletonList.java index 5ede0d9dc..cf17cfe97 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonList.java +++ b/src/main/java/dev/slimevr/gui/SkeletonList.java @@ -52,19 +52,11 @@ public class SkeletonList extends EJBagNoStretch { add(new JLabel("Yaw"), c(5, 0, 2)); add(new JLabel("Roll"), c(6, 0, 2)); - newSkeleton.getRootNode().depthFirstTraversal((node) -> { - int n = nodes.size(); - nodes.add(new NodeStatus(node, n + 1)); - }); - newSkeleton.getLeftController().depthFirstTraversal((node) -> { - int n = nodes.size(); - nodes.add(new NodeStatus(node, n + 1)); - }); - newSkeleton.getRightController().depthFirstTraversal((node) -> { - int n = nodes.size(); - nodes.add(new NodeStatus(node, n + 1)); - }); - + TransformNode[] allNodes = newSkeleton.getAllNodes(); + + for(int i = 0; i < allNodes.length; i++){ + nodes.add(new NodeStatus(allNodes[i], i + 1)); + } gui.refresh(); }); 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 000d68d46..ebdd5503e 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/HumanSkeleton.java @@ -13,10 +13,7 @@ public abstract class HumanSkeleton { public abstract TransformNode getRootNode(); @ThreadSafe - public abstract TransformNode getLeftController(); - - @ThreadSafe - public abstract TransformNode getRightController(); + public abstract TransformNode[] getAllNodes(); @ThreadSafe public abstract SkeletonConfig getSkeletonConfig(); 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 e374385b0..b09d08ea2 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -5,6 +5,7 @@ import java.util.Map; import com.jme3.math.FastMath; import com.jme3.math.Quaternion; +import com.jme3.math.Transform; import com.jme3.math.Vector3f; import dev.slimevr.VRServer; @@ -767,13 +768,14 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } @Override - public TransformNode getLeftController() { - return leftHandNode; - } + public TransformNode[] getAllNodes() { + List nodesList = new FastList<>(); - @Override - public TransformNode getRightController() { - return rightHandNode; + hmdNode.depthFirstTraversal((node) -> {nodesList.add(node);}); + leftHandNode.depthFirstTraversal((node) -> {nodesList.add(node);}); + rightHandNode.depthFirstTraversal((node) -> {nodesList.add(node);}); + + return nodesList.toArray(new TransformNode[0]); } @Override