From 8609fb9e97cb6f3d0a12cb94729f4808d3069945 Mon Sep 17 00:00:00 2001 From: lucas lelievre Date: Wed, 27 Apr 2022 21:30:43 +0200 Subject: [PATCH 1/2] Fix Converting FORWARD rotation to FRON --- .../slimevr/vr/trackers/TrackerConfig.java | 27 ++++++++++--------- .../vr/trackers/TrackerMountingRotation.java | 14 +++++++--- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java index f1ce2f041..9de3ad778 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerConfig.java @@ -4,8 +4,10 @@ import com.jme3.math.Quaternion; import io.eiren.yaml.YamlNode; +import java.util.Objects; + public class TrackerConfig { - + public final String trackerName; public String designation; public String description; @@ -19,7 +21,7 @@ public class TrackerConfig { this.description = tracker.getDescriptiveName(); this.designation = tracker.getBodyPosition() != null ? tracker.getBodyPosition().designation : null; } - + public TrackerConfig(YamlNode node) { this.trackerName = node.getString("name"); this.description = node.getString("description"); @@ -37,11 +39,12 @@ public class TrackerConfig { } if (oldMountingRotation != null) { - mountingRotation = TrackerMountingRotation.valueOf(oldMountingRotation).quaternion; + TrackerMountingRotation rot = TrackerMountingRotation.fromName(oldMountingRotation); + mountingRotation = Objects.requireNonNullElse(rot, TrackerMountingRotation.FRONT).quaternion; } YamlNode adjNode = node.getNode("adjustment"); - if(adjNode != null) { + if (adjNode != null) { adjustment = new Quaternion( adjNode.getFloat("x", 0), adjNode.getFloat("y", 0), @@ -50,22 +53,22 @@ public class TrackerConfig { ); } } - + public void setDesignation(String newDesignation) { this.designation = newDesignation; } - + public void saveConfig(YamlNode configNode) { configNode.setProperty("name", trackerName); - if(designation != null) + if (designation != null) configNode.setProperty("designation", designation); else configNode.removeProperty("designation"); - if(hide) + if (hide) configNode.setProperty("hide", hide); else configNode.removeProperty("hide"); - if(adjustment != null) { + if (adjustment != null) { configNode.setProperty("adj.x", adjustment.getX()); configNode.setProperty("adj.y", adjustment.getY()); configNode.setProperty("adj.z", adjustment.getZ()); @@ -73,11 +76,11 @@ public class TrackerConfig { } else { configNode.removeProperty("adj"); } - if(oldMountingRotation != null) { + if (oldMountingRotation != null) { configNode.removeProperty("rotation"); } - if(mountingRotation != null) { + if (mountingRotation != null) { configNode.setProperty("mountingRotation.x", mountingRotation.getX()); configNode.setProperty("mountingRotation.y", mountingRotation.getY()); configNode.setProperty("mountingRotation.z", mountingRotation.getZ()); @@ -86,7 +89,7 @@ public class TrackerConfig { configNode.removeProperty("mountingRotation"); } - if(description != null) { + if (description != null) { configNode.setProperty("description", description); } else { configNode.removeProperty("description"); diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java index f93c5aa0e..2f3f5dcb3 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackerMountingRotation.java @@ -4,7 +4,7 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; public enum TrackerMountingRotation { - + FRONT(180), LEFT(90), BACK(0), @@ -13,13 +13,21 @@ public enum TrackerMountingRotation { public final Quaternion quaternion; public static final TrackerMountingRotation[] values = values(); - + TrackerMountingRotation(float angle) { this.quaternion = new Quaternion().fromAngles(0, angle * FastMath.DEG_TO_RAD, 0); } + public static TrackerMountingRotation fromName(String name) { + for (TrackerMountingRotation r : values) { + if (r.name().equals(name)) + return r; + } + return null; + } + public static TrackerMountingRotation fromQuaternion(Quaternion q) { - for (TrackerMountingRotation r : values()) { + for (TrackerMountingRotation r : values) { if (r.quaternion.equals(q)) return r; } From 9f883dccece8d7908b4d7e4865dd18b7c218d631 Mon Sep 17 00:00:00 2001 From: Eiren Rain Date: Wed, 27 Apr 2022 23:42:16 +0300 Subject: [PATCH 2/2] Fix eclipse prefs --- .settings/org.eclipse.jdt.core.prefs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index cafa1cd08..5a2cf4639 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -27,6 +27,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=info org.eclipse.jdt.core.compiler.problem.emptyStatement=warning +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning @@ -72,6 +73,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -108,7 +110,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.11 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0