Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,9 @@ build/
# Ignore Android local properties
local.properties

# Ignore temporary config
# Ignore vrconfig
vrconfig.yml
vrconfig.yml.tmp
vrconfig.yml.bak
vrconfig.yml.*.bak.tmp
vrconfig.yml.*.bak
1 change: 0 additions & 1 deletion server/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ build
*/bin/

MagnetoLib.dll
vrconfig.yml

# BVH
BVH Recordings
Expand Down
7 changes: 4 additions & 3 deletions server/core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,19 @@ dependencies {
// and not exposed to consumers on their own compile classpath.
implementation("com.google.flatbuffers:flatbuffers-java:22.10.26")
implementation("commons-cli:commons-cli:1.8.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.15.1")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.1")

implementation("com.github.jonpeterson:jackson-module-model-versioning:1.2.2")
implementation("org.apache.commons:commons-math3:3.6.1")
implementation("org.apache.commons:commons-lang3:3.15.0")
implementation("org.apache.commons:commons-collections4:4.4")

implementation("com.illposed.osc:javaosc-core:0.8")
implementation("org.java-websocket:Java-WebSocket:1.+")
implementation("com.melloware:jintellitype:1.+")

implementation("com.squareup.okio:okio:3.10.2")
implementation("net.mamoe.yamlkt:yamlkt:0.13.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
implementation("com.mayakapps.kache:kache:2.1.0")

Expand Down
1 change: 0 additions & 1 deletion server/core/src/main/java/dev/slimevr/Keybinding.kt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ class Keybinding @AWTThread constructor(val server: VRServer) : HotkeyListener {
}
}

@AWTThread
override fun onHotKey(identifier: Int) {
when (identifier) {
FULL_RESET -> server.scheduleResetTrackersFull(RESET_SOURCE_NAME, config.fullResetDelay)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package dev.slimevr.config

import kotlinx.serialization.Serializable

@Serializable
class AutoBoneConfig {
var cursorIncrement = 2
var minDataDistance = 1
Expand Down
33 changes: 0 additions & 33 deletions server/core/src/main/java/dev/slimevr/config/BridgeConfig.java

This file was deleted.

17 changes: 17 additions & 0 deletions server/core/src/main/java/dev/slimevr/config/BridgeConfig.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package dev.slimevr.config

import dev.slimevr.tracking.trackers.TrackerRole
import kotlinx.serialization.Serializable
import java.util.*

@Serializable
class BridgeConfig {
var trackers: MutableMap<String, Boolean> = HashMap<String, Boolean>()
var automaticSharedTrackersToggling: Boolean = true

fun getBridgeTrackerRole(role: TrackerRole, def: Boolean): Boolean = trackers.getOrDefault(role.name.lowercase(Locale.getDefault()), def)!!

fun setBridgeTrackerRole(role: TrackerRole, `val`: Boolean) {
this.trackers[role.name.lowercase(Locale.getDefault())] = `val`
}
}
176 changes: 0 additions & 176 deletions server/core/src/main/java/dev/slimevr/config/ConfigManager.java

This file was deleted.

Loading