From 17f74c693c10b3d026b57c82d632b4fedd34c40f Mon Sep 17 00:00:00 2001 From: Yury Date: Sat, 30 Apr 2022 20:34:13 +0300 Subject: [PATCH] Refactor for to foreach --- src/main/java/dev/slimevr/VRServer.java | 58 ++++++++++--------- .../java/dev/slimevr/autobone/AutoBone.java | 8 +-- .../dev/slimevr/bridge/ProtobufBridge.java | 7 +-- .../java/dev/slimevr/gui/SkeletonList.java | 5 +- .../java/dev/slimevr/gui/TrackersList.java | 8 +-- .../windows/WindowsNamedPipeBridge.java | 9 +-- .../windows/WindowsNamedPipeVRBridge.java | 13 +++-- .../WindowsSteamVRPipeInputBridge.java | 6 +- .../dev/slimevr/poserecorder/PoseFrames.java | 14 ++--- .../vr/processor/HumanPoseProcessor.java | 8 +-- .../slimevr/vr/processor/TransformNode.java | 9 +-- .../vr/processor/skeleton/SimpleSkeleton.java | 4 +- .../dev/slimevr/vr/trackers/TrackerUtils.java | 3 +- .../vr/trackers/udp/TrackersUDPServer.java | 3 +- .../websocketapi/WebSocketVRBridge.java | 3 +- 15 files changed, 74 insertions(+), 84 deletions(-) diff --git a/src/main/java/dev/slimevr/VRServer.java b/src/main/java/dev/slimevr/VRServer.java index 48bd6f30a..9fff52c28 100644 --- a/src/main/java/dev/slimevr/VRServer.java +++ b/src/main/java/dev/slimevr/VRServer.java @@ -99,24 +99,26 @@ public class VRServer extends Thread { bvhRecorder = new BVHRecorder(this); registerTracker(hmdTracker); - for (int i = 0; i < shareTrackers.size(); ++i) - registerTracker(shareTrackers.get(i)); + for (Tracker tracker : shareTrackers) { + registerTracker(tracker); + } } public boolean hasBridge(Class bridgeClass) { - for (int i = 0; i < bridges.size(); ++i) { - if (bridgeClass.isAssignableFrom(bridges.get(i).getClass())) + for (Bridge bridge : bridges) { + if (bridgeClass.isAssignableFrom(bridge.getClass())) { return true; + } } return false; } @ThreadSafe public E getVRBridge(Class bridgeClass) { - for (int i = 0; i < bridges.size(); ++i) { - Bridge b = bridges.get(i); - if (bridgeClass.isAssignableFrom(b.getClass())) - return bridgeClass.cast(b); + for (Bridge bridge : bridges) { + if (bridgeClass.isAssignableFrom(bridge.getClass())) { + return bridgeClass.cast(bridge); + } } return null; } @@ -142,8 +144,8 @@ public class VRServer extends Thread { e.printStackTrace(); } List trackersConfig = config.getNodeList("trackers", null); - for (int i = 0; i < trackersConfig.size(); ++i) { - TrackerConfig cfg = new TrackerConfig(trackersConfig.get(i)); + for (YamlNode node : trackersConfig) { + TrackerConfig cfg = new TrackerConfig(node); synchronized (configuration) { configuration.put(cfg.trackerName, cfg); } @@ -158,8 +160,9 @@ public class VRServer extends Thread { public void addNewTrackerConsumer(Consumer consumer) { queueTask(() -> { newTrackersConsumers.add(consumer); - for (int i = 0; i < trackers.size(); ++i) - consumer.accept(trackers.get(i)); + for (Tracker tracker : trackers) { + consumer.accept(tracker); + } }); } @@ -184,8 +187,8 @@ public class VRServer extends Thread { public synchronized void saveConfig() { List nodes = config.getNodeList("trackers", null); List> trackersConfig = new FastList<>(nodes.size()); - for (int i = 0; i < nodes.size(); ++i) { - trackersConfig.add(nodes.get(i).root); + for (YamlNode node : nodes) { + trackersConfig.add(node.root); } config.setProperty("trackers", trackersConfig); synchronized (configuration) { @@ -193,8 +196,7 @@ public class VRServer extends Thread { while (iterator.hasNext()) { TrackerConfig tc = iterator.next(); Map cfg = null; - for (int i = 0; i < trackersConfig.size(); ++i) { - Map c = trackersConfig.get(i); + for (Map c : trackersConfig) { if (tc.trackerName.equals(c.get("name"))) { cfg = c; break; @@ -227,16 +229,19 @@ public class VRServer extends Thread { break; task.run(); } while (true); - for (int i = 0; i < onTick.size(); ++i) { - this.onTick.get(i).run(); + for (Runnable task : onTick) { + task.run(); + } + for (Bridge bridge : bridges) { + bridge.dataRead(); + } + for (Tracker tracker : trackers) { + tracker.tick(); } - for (int i = 0; i < bridges.size(); ++i) - bridges.get(i).dataRead(); - for (int i = 0; i < trackers.size(); ++i) - trackers.get(i).tick(); humanPoseProcessor.update(); - for (int i = 0; i < bridges.size(); ++i) - bridges.get(i).dataWrite(); + for (Bridge bridge : bridges) { + bridge.dataWrite(); + } // final long time = System.currentTimeMillis() - start; try { Thread.sleep(1); // 1000Hz @@ -262,8 +267,9 @@ public class VRServer extends Thread { queueTask(() -> { trackers.add(tracker); trackerAdded(tracker); - for (int i = 0; i < newTrackersConsumers.size(); ++i) - newTrackersConsumers.get(i).accept(tracker); + for (Consumer tc : newTrackersConsumers) { + tc.accept(tracker); + } }); } diff --git a/src/main/java/dev/slimevr/autobone/AutoBone.java b/src/main/java/dev/slimevr/autobone/AutoBone.java index e50d9bafd..8a5d50f0d 100644 --- a/src/main/java/dev/slimevr/autobone/AutoBone.java +++ b/src/main/java/dev/slimevr/autobone/AutoBone.java @@ -484,9 +484,7 @@ public class AutoBone { int offsetCount = 0; List trackers = frames.getTrackers(); - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); - + for (PoseFrameTracker tracker : trackers) { TrackerFrame trackerFrame = tracker.safeGetFrame(cursor); if (trackerFrame == null || !trackerFrame.hasData(TrackerFrameData.POSITION)) { continue; @@ -508,9 +506,7 @@ public class AutoBone { int offsetCount = 0; List trackers = frames.getTrackers(); - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); - + for (PoseFrameTracker tracker : trackers) { TrackerFrame trackerFrame1 = tracker.safeGetFrame(cursor1); if (trackerFrame1 == null || !trackerFrame1.hasData(TrackerFrameData.POSITION)) { continue; diff --git a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java index 1b75fdd83..99e74bbee 100644 --- a/src/main/java/dev/slimevr/bridge/ProtobufBridge.java +++ b/src/main/java/dev/slimevr/bridge/ProtobufBridge.java @@ -88,8 +88,8 @@ public abstract class ProtobufBridge implements Bridge { public void dataWrite() { 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)); + for (ShareableTracker tracker : sharedTrackers) { + writeTrackerUpdate(tracker); } } @@ -187,8 +187,7 @@ public abstract class ProtobufBridge implements Bridge { @VRServerThread protected void reconnected() { - for (int i = 0; i < sharedTrackers.size(); ++i) { - ShareableTracker tracker = sharedTrackers.get(i); + for (ShareableTracker tracker : sharedTrackers) { TrackerAdded.Builder builder = TrackerAdded.newBuilder().setTrackerId(tracker.getTrackerId()).setTrackerName(tracker.getDescriptiveName()).setTrackerSerial(tracker.getName()).setTrackerRole(tracker.getTrackerRole().id); sendMessage(ProtobufMessage.newBuilder().setTrackerAdded(builder).build()); } diff --git a/src/main/java/dev/slimevr/gui/SkeletonList.java b/src/main/java/dev/slimevr/gui/SkeletonList.java index 98a0fda87..f7451a444 100644 --- a/src/main/java/dev/slimevr/gui/SkeletonList.java +++ b/src/main/java/dev/slimevr/gui/SkeletonList.java @@ -64,8 +64,9 @@ public class SkeletonList extends EJBagNoStretch { return; lastUpdate = System.currentTimeMillis(); java.awt.EventQueue.invokeLater(() -> { - for (int i = 0; i < nodes.size(); ++i) - nodes.get(i).update(); + for (NodeStatus node : nodes) { + node.update(); + } }); } diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java index 14d91d119..344f4b755 100644 --- a/src/main/java/dev/slimevr/gui/TrackersList.java +++ b/src/main/java/dev/slimevr/gui/TrackersList.java @@ -70,8 +70,7 @@ public class TrackersList extends EJBoxNoStretch { EJBoxNoStretch line = null; boolean first = true; - for (int i = 0; i < trackers.size(); ++i) { - TrackerPanel tr = trackers.get(i); + for (TrackerPanel tr : trackers) { Tracker t = tr.t; if (t instanceof ReferenceAdjustedTracker) t = ((ReferenceAdjustedTracker) t).getTracker(); @@ -114,8 +113,9 @@ public class TrackersList extends EJBoxNoStretch { return; lastUpdate = System.currentTimeMillis(); java.awt.EventQueue.invokeLater(() -> { - for (int i = 0; i < trackers.size(); ++i) - trackers.get(i).update(); + for (TrackerPanel tr : trackers) { + tr.update(); + } }); } diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java index 041c14c07..ee161e71f 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeBridge.java @@ -42,8 +42,7 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements for (TrackerRole role : defaultRoles) { changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), true)); } - for (int i = 0; i < shareableTrackers.size(); ++i) { - ShareableTracker tr = shareableTrackers.get(i); + for (ShareableTracker tr : shareableTrackers) { TrackerRole role = tr.getTrackerRole(); changeShareSettings(role, Main.vrServer.config.getBoolean("bridge." + bridgeSettingsKey + ".trackers." + role.name().toLowerCase(), false)); } @@ -52,8 +51,7 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements @VRServerThread public boolean getShareSetting(TrackerRole role) { - for (int i = 0; i < shareableTrackers.size(); ++i) { - ShareableTracker tr = shareableTrackers.get(i); + for (ShareableTracker tr : shareableTrackers) { if (tr.getTrackerRole() == role) { return sharedTrackers.contains(tr); } @@ -65,8 +63,7 @@ public class WindowsNamedPipeBridge extends ProtobufBridge implements public void changeShareSettings(TrackerRole role, boolean share) { if (role == null) return; - for (int i = 0; i < shareableTrackers.size(); ++i) { - ShareableTracker tr = shareableTrackers.get(i); + for (ShareableTracker tr : shareableTrackers) { if (tr.getTrackerRole() == role) { if (share) { addSharedTracker(tr); diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java index d29b9125d..61fbf46eb 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsNamedPipeVRBridge.java @@ -46,8 +46,7 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { this.shareTrackers = new FastList<>(shareTrackers); this.trackerPipes = new FastList<>(shareTrackers.size()); this.internalTrackers = new FastList<>(shareTrackers.size()); - for (int i = 0; i < shareTrackers.size(); ++i) { - Tracker t = shareTrackers.get(i); + for (Tracker t : shareTrackers) { ComputedTracker ct = new ComputedTracker(t.getTrackerId(), "internal://" + t.getName(), true, true); ct.setStatus(TrackerStatus.OK); this.internalTrackers.add(ct); @@ -222,9 +221,10 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { if (hmdPipe == null || hmdPipe.state == PipeState.CREATED) { return false; } - for (int i = 0; i < trackerPipes.size(); ++i) { - if (trackerPipes.get(i).state == PipeState.CREATED) + for (WindowsPipe pipe : trackerPipes) { + if (pipe.state == PipeState.CREATED) { return false; + } } return true; } @@ -258,8 +258,9 @@ public class WindowsNamedPipeVRBridge extends Thread implements Bridge { LogManager.log.info("[VRBridge] Pipes are open"); } catch (IOException e) { safeDisconnect(hmdPipe); - for (int i = 0; i < trackerPipes.size(); ++i) - safeDisconnect(trackerPipes.get(i)); + for (WindowsPipe pipe : trackerPipes) { + safeDisconnect(pipe); + } trackerPipes.clear(); throw e; } diff --git a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java index e51eaea1f..1fea1e295 100644 --- a/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java +++ b/src/main/java/dev/slimevr/platform/windows/WindowsSteamVRPipeInputBridge.java @@ -180,8 +180,7 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { internal: while (iterator.hasNext()) { VRTracker internalTracker = iterator.next(); - for (int i = 0; i < trackers.size(); ++i) { - VRTracker t = trackers.get(i); + for (VRTracker t : trackers) { if (t.getTrackerId() == internalTracker.getTrackerId()) continue internal; } @@ -193,8 +192,7 @@ public class WindowsSteamVRPipeInputBridge extends Thread implements Bridge { } } } - for (int i = 0; i < trackers.size(); ++i) { - VRTracker tracker = trackers.get(i); + for (VRTracker tracker : trackers) { 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 diff --git a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java index c2199569e..ecbd82d56 100644 --- a/src/main/java/dev/slimevr/poserecorder/PoseFrames.java +++ b/src/main/java/dev/slimevr/poserecorder/PoseFrames.java @@ -148,8 +148,7 @@ public final class PoseFrames implements Iterable { public int getMaxFrameCount() { int maxFrames = 0; - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); + for (PoseFrameTracker tracker : trackers) { if (tracker != null && tracker.getFrameCount() > maxFrames) { maxFrames = tracker.getFrameCount(); } @@ -167,9 +166,7 @@ public final class PoseFrames implements Iterable { public int getFrames(int frameIndex, TrackerFrame[] buffer) { int frameCount = 0; - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); - + for (PoseFrameTracker tracker : trackers) { if (tracker == null) { continue; } @@ -195,9 +192,7 @@ public final class PoseFrames implements Iterable { public int getFrames(int frameIndex, List buffer) { int frameCount = 0; - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); - + for (PoseFrameTracker tracker : trackers) { if (tracker == null) { continue; } @@ -247,8 +242,7 @@ public final class PoseFrames implements Iterable { return false; } - for (int i = 0; i < trackers.size(); i++) { - PoseFrameTracker tracker = trackers.get(i); + for (PoseFrameTracker tracker : trackers) { if (tracker != null && cursor < tracker.getFrameCount()) { return true; } diff --git a/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java index 8a86e2aec..1f7e2e892 100644 --- a/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java +++ b/src/main/java/dev/slimevr/vr/processor/HumanPoseProcessor.java @@ -95,14 +95,14 @@ public class HumanPoseProcessor { private void updateSekeltonModel() { disconnectAllTrackers(); skeleton = new SimpleSkeleton(server, computedTrackers); - for (int i = 0; i < onSkeletonUpdated.size(); ++i) - onSkeletonUpdated.get(i).accept(skeleton); + for (Consumer sc : onSkeletonUpdated) + sc.accept(skeleton); } @VRServerThread private void disconnectAllTrackers() { - for (int i = 0; i < computedTrackers.size(); ++i) { - computedTrackers.get(i).setStatus(TrackerStatus.DISCONNECTED); + for (ComputedHumanPoseTracker t : computedTrackers) { + t.setStatus(TrackerStatus.DISCONNECTED); } } diff --git a/src/main/java/dev/slimevr/vr/processor/TransformNode.java b/src/main/java/dev/slimevr/vr/processor/TransformNode.java index 335523fa6..c31347578 100644 --- a/src/main/java/dev/slimevr/vr/processor/TransformNode.java +++ b/src/main/java/dev/slimevr/vr/processor/TransformNode.java @@ -39,8 +39,9 @@ public class TransformNode { public void update() { updateWorldTransforms(); // Call update on each frame because we have relatively few nodes - for (int i = 0; i < children.size(); ++i) - children.get(i).update(); + for (TransformNode node : children) { + node.update(); + } } protected synchronized void updateWorldTransforms() { @@ -56,8 +57,8 @@ public class TransformNode { } public void depthFirstTraversal(Consumer visitor) { - for (int i = 0; i < children.size(); ++i) { - children.get(i).depthFirstTraversal(visitor); + for (TransformNode node : children) { + node.depthFirstTraversal(visitor); } visitor.accept(this); } 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 0ed95315a..dcb01c9d9 100644 --- a/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java +++ b/src/main/java/dev/slimevr/vr/processor/skeleton/SimpleSkeleton.java @@ -315,8 +315,8 @@ public class SimpleSkeleton extends HumanSkeleton implements SkeletonConfigCallb } public void setComputedTrackers(List trackers) { - for (int i = 0; i < trackers.size(); ++i) { - setComputedTracker(trackers.get(i)); + for (ComputedHumanPoseTracker t : trackers) { + setComputedTracker(t); } } //#endregion diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java index 95f98d674..7f9ee779c 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerUtils.java @@ -21,8 +21,7 @@ public class TrackerUtils { public static T findTrackerForBodyPosition(List allTrackers, TrackerPosition position) { if (position == null) return null; - for (int i = 0; i < allTrackers.size(); ++i) { - T t = allTrackers.get(i); + for (T t : allTrackers) { if (t != null && t.getBodyPosition() == position) return t; } diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java b/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java index c80887b90..57b7760ae 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/TrackersUDPServer.java @@ -207,8 +207,7 @@ public class TrackersUDPServer extends Thread { if (lastKeepup + 500 < System.currentTimeMillis()) { lastKeepup = System.currentTimeMillis(); synchronized (connections) { - for (int i = 0; i < connections.size(); ++i) { - Device conn = connections.get(i); + for (Device conn : connections) { bb.limit(bb.capacity()); bb.rewind(); parser.write(bb, conn, new UDPPacket1Heartbeat()); diff --git a/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java b/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java index 607ccea70..3ee198513 100644 --- a/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java +++ b/src/main/java/dev/slimevr/websocketapi/WebSocketVRBridge.java @@ -33,8 +33,7 @@ public class WebSocketVRBridge extends WebsocketAPI implements Bridge { this.hmd = hmd; this.shareTrackers = new FastList<>(shareTrackers); this.internalTrackers = new FastList<>(shareTrackers.size()); - for (int i = 0; i < shareTrackers.size(); ++i) { - Tracker t = shareTrackers.get(i); + for (Tracker t : shareTrackers) { ComputedTracker ct = new ComputedTracker(t.getTrackerId(), "internal://" + t.getName(), true, true); ct.setStatus(TrackerStatus.OK); ct.bodyPosition = t.getBodyPosition();