Server Guards: Mounting timeout and yaw reset guard (#1628)

Co-authored-by: sctanf <[email protected]>
Co-authored-by: Butterscotch! <[email protected]>
Co-authored-by: Aed <[email protected]>
This commit is contained in:
authored and GitHub committed 2025-12-02 15:13:54 +01:00
1 parent 2e1ec07b23
commit a5160fbb8a
15 files changed
+127 -35

No files matched your search

@@ -10,6 +10,7 @@ import dev.slimevr.firmware.SerialFlashingHandler
import dev.slimevr.games.vrchat.VRCConfigHandler
import dev.slimevr.games.vrchat.VRCConfigHandlerStub
import dev.slimevr.games.vrchat.VRChatConfigManager
import dev.slimevr.guards.ServerGuards
import dev.slimevr.osc.OSCHandler
import dev.slimevr.osc.OSCRouter
import dev.slimevr.osc.VMCHandler
@@ -122,6 +123,8 @@ class VRServer @JvmOverloads constructor(
val networkProfileChecker: NetworkProfileChecker
val serverGuards = ServerGuards()
init {
// UwU
deviceManager = DeviceManager(this)
@@ -0,0 +1,27 @@
package dev.slimevr.guards
import java.util.Timer
import java.util.TimerTask
import kotlin.concurrent.schedule
class ServerGuards {
var canDoMounting: Boolean = false
var canDoYawReset: Boolean = false
private val timer = Timer()
private var mountingTimeoutTask: TimerTask? = null
fun onFullReset() {
canDoMounting = true
canDoYawReset = true
mountingTimeoutTask?.cancel()
mountingTimeoutTask = timer.schedule(MOUNTING_RESET_TIMEOUT) {
canDoMounting = false
}
}
companion object {
const val MOUNTING_RESET_TIMEOUT = 2 * 60 * 1000L
}
}
@@ -1,6 +1,7 @@
package dev.slimevr.protocol.datafeed
import com.google.flatbuffers.FlatBufferBuilder
import dev.slimevr.guards.ServerGuards
import dev.slimevr.tracking.processor.skeleton.HumanSkeleton
import dev.slimevr.tracking.processor.stayaligned.poses.RelaxedPose
import dev.slimevr.tracking.processor.stayaligned.trackers.RestDetector
@@ -39,4 +40,6 @@ object DataFeedBuilderKotlin {
return StayAlignedTracker.endStayAlignedTracker(fbb)
}
fun createServerGuard(fbb: FlatBufferBuilder, serverGuards: ServerGuards): Int = solarxr_protocol.data_feed.server.ServerGuards.createServerGuards(fbb, serverGuards.canDoMounting, serverGuards.canDoYawReset)
}
@@ -107,6 +107,12 @@ public class DataFeedHandler extends ProtocolHandler<DataFeedMessageHeader> {
.createStayAlignedPose(fbb, this.api.server.humanPoseManager.skeleton);
}
int serverGuardsOffset = 0;
if (config.getServerGuardsMask()) {
serverGuardsOffset = DataFeedBuilderKotlin.INSTANCE
.createServerGuard(fbb, this.api.server.getServerGuards());
}
return DataFeedUpdate
.createDataFeedUpdate(
fbb,
@@ -114,7 +120,8 @@ public class DataFeedHandler extends ProtocolHandler<DataFeedMessageHeader> {
trackersOffset,
bonesOffset,
stayAlignedPoseOffset,
index
index,
serverGuardsOffset
);
}
@@ -1541,6 +1541,8 @@ class HumanSkeleton(
@JvmOverloads
fun resetTrackersFull(resetSourceName: String?, bodyParts: List<Int> = ArrayList()) {
humanPoseManager.server?.serverGuards?.onFullReset()
var referenceRotation = IDENTITY
headTracker?.let {
if (bodyParts.isEmpty() || bodyParts.contains(BodyPart.HEAD)) {
@@ -370,8 +370,6 @@ class TrackerResetsHandler(val tracker: Tracker) {
)
}
this.tracker.needReset = false
// Reset Stay Aligned (before resetting filtering, which depends on the
// tracker's rotation)
tracker.stayAligned.reset()
@@ -196,7 +196,10 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
val trackerRequireReset = imuTrackers.filter {
it.status !== TrackerStatus.ERROR && !it.isInternal && it.allowReset && it.needReset
}
updateValidity(TrackingChecklistStepId.FULL_RESET, trackerRequireReset.isEmpty()) {
// We ask for a full reset if you need to do mounting calibration but cant because you haven't done full reset in a while
// or if you have trackers that need reset after re-assigning
val needFullReset = (!resetMountingCompleted && !vrServer.serverGuards.canDoMounting) || trackerRequireReset.isNotEmpty()
updateValidity(TrackingChecklistStepId.FULL_RESET, !needFullReset) {
if (trackerRequireReset.isNotEmpty()) {
it.extraData = TrackingChecklistExtraDataUnion().apply {
type = TrackingChecklistExtraData.TrackingChecklistTrackerReset
@@ -210,7 +213,6 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
it.extraData = null
}
}
val hmd =
assignedTrackers.firstOrNull { it.isHmd && !it.isInternal && it.status.sendData }
val assignedHmd = hmd == null || vrServer.humanPoseManager.skeleton.headTracker != null