diff --git a/.classpath b/.classpath index 2f30af680..b9a4605a6 100644 --- a/.classpath +++ b/.classpath @@ -28,6 +28,6 @@ - + diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2e0b6b357..1e2545541 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,13 +11,8 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - - name: Clone Slime Java Commons - uses: actions/checkout@v2.3.4 with: - repository: Eirenliel/slime-java-commons - # Relative path under $GITHUB_WORKSPACE to place the repository - path: Slime Java Commons + submodules: recursive - name: Set up JDK 8 uses: actions/setup-java@v2.1.0 @@ -37,13 +32,8 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - - name: Clone Slime Java Commons - uses: actions/checkout@v2.3.4 with: - repository: Eirenliel/slime-java-commons - # Relative path under $GITHUB_WORKSPACE to place the repository - path: Slime Java Commons + submodules: recursive - name: Set up JDK 8 uses: actions/setup-java@v2.1.0 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..6ef9c1aa2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "slime-java-commons"] + path = slime-java-commons + url = https://github.com/Eirenliel/slime-java-commons.git diff --git a/README.md b/README.md index 0a0300725..9df75ab56 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,7 @@ You need to execute these commands in the folder where you want this project. ```bash # Clone repositories -git clone https://github.com/SlimeVR/SlimeVR-Server.git -git clone https://github.com/Eirenliel/slime-java-commons.git +git clone --recursive https://github.com/SlimeVR/SlimeVR-Server.git # Enter the directory and build the runnable server JAR cd SlimeVR-Server diff --git a/build.gradle b/build.gradle index 450846e17..8d4a29483 100644 --- a/build.gradle +++ b/build.gradle @@ -34,15 +34,17 @@ tasks.withType(Javadoc) { options.encoding = 'UTF-8' } -repositories { - // Use jcenter for resolving dependencies. - // You can declare any Maven/Ivy/file repository here. - jcenter() - mavenCentral() +allprojects { + repositories { + // Use jcenter for resolving dependencies. + // You can declare any Maven/Ivy/file repository here. + jcenter() + mavenCentral() + } } dependencies { - compile project(':Slime Java Commons') + compile project(':slime-java-commons') // This dependency is exported to consumers, that is to say found on their compile classpath. compile 'org.apache.commons:commons-math3:3.6.1' @@ -53,6 +55,7 @@ dependencies { compile 'com.fazecast:jSerialComm:[2.0.0,3.0.0)' compile 'com.google.protobuf:protobuf-java:3.17.3' compile "org.java-websocket:Java-WebSocket:1.5.1" + compile 'com.melloware:jintellitype:1.4.0' // This dependency is used internally, and not exposed to consumers on their own compile classpath. implementation 'com.google.guava:guava:28.2-jre' diff --git a/settings.gradle b/settings.gradle index 5962aec48..e204e193f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,19 +8,4 @@ */ rootProject.name = 'SlimeVR Server' -include('Slime Java Commons') - -def commonsDirs = [ - new File(settingsDir, 'Slime Java Commons'), - new File(settingsDir, 'slime-java-commons'), - new File(settingsDir, '../Slime Java Commons'), - new File(settingsDir, '../slime-java-commons') -] - -for (commonsDir in commonsDirs) { - if (commonsDir.isDirectory()) { - logger.info('\"Slime Java Commons\" subproject detected at \"{}\"', commonsDir.getCanonicalPath()) - project(':Slime Java Commons').projectDir = commonsDir - break - } -} \ No newline at end of file +include ':slime-java-commons' diff --git a/slime-java-commons b/slime-java-commons new file mode 160000 index 000000000..e3d14a0ff --- /dev/null +++ b/slime-java-commons @@ -0,0 +1 @@ +Subproject commit e3d14a0ffebcb20685555ff0775f59799e153dcd diff --git a/src/main/java/io/eiren/vr/Keybinding.java b/src/main/java/io/eiren/vr/Keybinding.java new file mode 100644 index 000000000..14719c865 --- /dev/null +++ b/src/main/java/io/eiren/vr/Keybinding.java @@ -0,0 +1,52 @@ +package io.eiren.vr; + +import com.melloware.jintellitype.JIntellitype; +import com.melloware.jintellitype.HotkeyListener; +import io.eiren.util.ann.AWTThread; +import io.eiren.util.logging.LogManager; + +public class Keybinding implements HotkeyListener { + public final VRServer server; + private static final int RESET = 1; + private static final int QUICK_RESET = 2; + + @AWTThread + public Keybinding(VRServer server) { + this.server = server; + + if(JIntellitype.isJIntellitypeSupported()) { + JIntellitype.getInstance().addHotKeyListener(this); + + String resetBinding = this.server.config.getString("keybindings.reset"); + if(resetBinding == null) { + resetBinding = "CTRL+ALT+SHIFT+Y"; + this.server.config.setProperty("keybindings.reset", resetBinding); + } + JIntellitype.getInstance().registerHotKey(RESET, resetBinding); + LogManager.log.info("[Keybinding] Bound reset to " + resetBinding); + + String quickResetBinding = this.server.config.getString("keybindings.quickReset"); + if(quickResetBinding == null) { + quickResetBinding = "CTRL+ALT+SHIFT+U"; + this.server.config.setProperty("keybindings.quickReset", quickResetBinding); + } + JIntellitype.getInstance().registerHotKey(QUICK_RESET, quickResetBinding); + LogManager.log.info("[Keybinding] Bound quick reset to " + quickResetBinding); + } + } + + @AWTThread + @Override + public void onHotKey(int identifier) { + switch(identifier) { + case RESET: + LogManager.log.info("[Keybinding] Reset pressed"); + server.resetTrackersYaw(); + break; + case QUICK_RESET: + LogManager.log.info("[Keybinding] Quick reset pressed"); + server.resetTrackers(); + break; + } + } +} diff --git a/src/main/java/io/eiren/vr/Main.java b/src/main/java/io/eiren/vr/Main.java index 058eedacb..89df1b037 100644 --- a/src/main/java/io/eiren/vr/Main.java +++ b/src/main/java/io/eiren/vr/Main.java @@ -26,6 +26,7 @@ public class Main { try { vrServer = new VRServer(); vrServer.start(); + new Keybinding(vrServer); new VRServerGUI(vrServer); } catch(Throwable e) { e.printStackTrace(); diff --git a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java b/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java index 2a9c1b1af..996ad546b 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java +++ b/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java @@ -104,7 +104,7 @@ public class TrackersUDPServer extends Thread { firmware.append("owoTrack"); isOwo = true; } - String trackerName = macString != null ? "upd://" + macString : "udp:/" + handshakePacket.getAddress().toString(); + String trackerName = macString != null ? "udp://" + macString : "udp:/" + handshakePacket.getAddress().toString(); String descriptiveName = "udp:/" + handshakePacket.getAddress().toString(); IMUTracker imu = new IMUTracker(Tracker.getNextLocalTrackerId(), trackerName, descriptiveName, this); ReferenceAdjustedTracker adjustedTracker = new ReferenceAdjustedTracker<>(imu);