diff --git a/server/core/src/main/java/dev/slimevr/VRServer.kt b/server/core/src/main/java/dev/slimevr/VRServer.kt index 4db758d06..094bd2413 100644 --- a/server/core/src/main/java/dev/slimevr/VRServer.kt +++ b/server/core/src/main/java/dev/slimevr/VRServer.kt @@ -26,7 +26,6 @@ import dev.slimevr.serial.SerialHandler import dev.slimevr.serial.SerialHandlerStub import dev.slimevr.setup.HandshakeHandler import dev.slimevr.setup.TapSetupHandler -import dev.slimevr.status.StatusSystem import dev.slimevr.tracking.processor.HumanPoseManager import dev.slimevr.tracking.processor.skeleton.HumanSkeleton import dev.slimevr.tracking.trackers.* @@ -113,9 +112,6 @@ class VRServer @JvmOverloads constructor( @JvmField val resetHandler: ResetHandler - @JvmField - val statusSystem = StatusSystem() - @JvmField val handshakeHandler = HandshakeHandler() diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.kt b/server/core/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.kt index d1c63d76f..d71008c95 100644 --- a/server/core/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.kt +++ b/server/core/src/main/java/dev/slimevr/protocol/rpc/RPCHandler.kt @@ -18,7 +18,6 @@ import dev.slimevr.protocol.rpc.settings.createSettingsResponse import dev.slimevr.protocol.rpc.setup.RPCHandshakeHandler import dev.slimevr.protocol.rpc.setup.RPCTapSetupHandler import dev.slimevr.protocol.rpc.setup.RPCUtil.getLocalIp -import dev.slimevr.protocol.rpc.status.RPCStatusHandler import dev.slimevr.protocol.rpc.trackingchecklist.RPCTrackingChecklistHandler import dev.slimevr.protocol.rpc.trackingpause.RPCTrackingPause import dev.slimevr.tracking.processor.config.SkeletonConfigOffsets @@ -44,7 +43,6 @@ class RPCHandler(private val api: ProtocolAPI) : ProtocolHandler - apiServer.apiConnections.forEach { it.send(fbb.dataBuffer()) } - } - } - - override fun onStatusRemoved(id: UInt) { - val fbb = FlatBufferBuilder(4) - - StatusSystemFixed.startStatusSystemFixed(fbb) - StatusSystemFixed.addFixedStatusId(fbb, id.toLong()) - val update = StatusSystemFixed.endStatusSystemFixed(fbb) - - val outbound = this.rpcHandler.createRPCMessage( - fbb, - RpcMessage.StatusSystemFixed, - update, - ) - fbb.finish(outbound) - - this.api.apiServers.forEach { apiServer -> - apiServer.apiConnections.forEach { it.send(fbb.dataBuffer()) } - } - } - - companion object { - const val STATUS_EXPECTED_SIZE = 32 - } -} diff --git a/server/core/src/main/java/dev/slimevr/status/StatusSystem.kt b/server/core/src/main/java/dev/slimevr/status/StatusSystem.kt deleted file mode 100644 index bd521f9a8..000000000 --- a/server/core/src/main/java/dev/slimevr/status/StatusSystem.kt +++ /dev/null @@ -1,39 +0,0 @@ -package dev.slimevr.status - -import solarxr_protocol.rpc.StatusDataUnion -import solarxr_protocol.rpc.StatusMessageT -import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.atomic.AtomicInteger - -class StatusSystem { - private val listeners: MutableList = CopyOnWriteArrayList() - private val statuses: MutableMap = ConcurrentHashMap() - private val prioritizedStatuses: MutableSet = ConcurrentHashMap.newKeySet() - private val idCounter = AtomicInteger(1) - - fun addListener(listener: StatusListener) { - listeners.add(listener) - } - - fun removeListener(listener: StatusListener) { - listeners.remove(listener) - } - - fun getStatuses(): Array = statuses.map { (id, message) -> - val status = StatusMessageT() - status.id = id.toUInt().toLong() - status.data = message - status.prioritized = prioritizedStatuses.contains(id) - status - }.toTypedArray() - - fun hasStatusType(dataType: Byte): Boolean = statuses.any { - it.value.type == dataType - } -} - -interface StatusListener { - fun onStatusChanged(id: UInt, message: StatusDataUnion, prioritized: Boolean) - fun onStatusRemoved(id: UInt) -}