diff --git a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java index b885df14d4..9042f2c5ea 100644 --- a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java +++ b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.node.*; import com.github.jonpeterson.jackson.module.versioning.VersionedModelConverter; import dev.slimevr.tracking.processor.config.SkeletonConfigOffsets; +import dev.slimevr.tracking.trackers.TrackerPosition; import io.eiren.util.logging.LogManager; import java.util.Map; @@ -254,6 +255,22 @@ public ObjectNode convert( } } } + if (version < 11) { + // Sets HMD's designation to "body:head" + ObjectNode trackersNode = (ObjectNode) modelData.get("trackers"); + if (trackersNode != null) { + ObjectNode HMDNode = (ObjectNode) trackersNode.get("HMD"); + if (HMDNode != null) { + HMDNode + .set( + "designation", + new TextNode(TrackerPosition.HEAD.getDesignation()) + ); + trackersNode.set("HMD", HMDNode); + modelData.set("trackers", trackersNode); + } + } + } } catch (Exception e) { LogManager.severe("Error during config migration: " + e); } diff --git a/server/core/src/main/java/dev/slimevr/config/VRConfig.java b/server/core/src/main/java/dev/slimevr/config/VRConfig.java index 40cc6bad17..8627cd9c4e 100644 --- a/server/core/src/main/java/dev/slimevr/config/VRConfig.java +++ b/server/core/src/main/java/dev/slimevr/config/VRConfig.java @@ -14,7 +14,7 @@ @JsonVersionedModel( - currentVersion = "10", defaultDeserializeToVersion = "10", toCurrentConverterClass = CurrentVRConfigConverter.class + currentVersion = "11", defaultDeserializeToVersion = "11", toCurrentConverterClass = CurrentVRConfigConverter.class ) public class VRConfig { diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/platform/SteamVRBridge.java b/server/desktop/src/main/java/dev/slimevr/desktop/platform/SteamVRBridge.java index ee79d57a54..148e0f519d 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/platform/SteamVRBridge.java +++ b/server/desktop/src/main/java/dev/slimevr/desktop/platform/SteamVRBridge.java @@ -84,7 +84,6 @@ public void changeShareSettings(TrackerRole role, boolean share) { @Override @VRServerThread protected Tracker createNewTracker(ProtobufMessages.TrackerAdded trackerAdded) { - // Todo: We need the manufacturer Device device = VRServer.Companion.getInstance().deviceManager .createDevice( trackerAdded.getTrackerName(), @@ -99,7 +98,7 @@ protected Tracker createNewTracker(ProtobufMessages.TrackerAdded trackerAdded) { displayName = "SteamVR Driver HMD"; else displayName = "Feeder App HMD"; - // TODO support needsReset = true if HMD isn't assigned to head + // TODO support needsReset = true for VTubing (GUI toggle?) needsReset = false; } else { displayName = trackerAdded.getTrackerName();