From 3336f6dff102ea2ae6029d9f38ba331f33e59b83 Mon Sep 17 00:00:00 2001 From: loucass003 Date: Tue, 21 Apr 2026 06:49:08 +0200 Subject: [PATCH] Consistency --- server/core/src/main/java/dev/slimevr/context/context.kt | 2 +- .../main/java/dev/slimevr/context/debug/DebugMiddleware.kt | 2 +- .../java/dev/slimevr/context/debug/LoggingMiddleware.kt | 2 +- server/core/src/main/java/dev/slimevr/tracker/module.kt | 7 ++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/core/src/main/java/dev/slimevr/context/context.kt b/server/core/src/main/java/dev/slimevr/context/context.kt index 292cd8d41..0b16ce7e2 100644 --- a/server/core/src/main/java/dev/slimevr/context/context.kt +++ b/server/core/src/main/java/dev/slimevr/context/context.kt @@ -45,7 +45,7 @@ class Context( mutableStateFlow.update { currentState -> actions.fold(currentState) { s, action -> reducer(s, action) } } - debugMiddleware.onDispatchBatch(caller, before, actions, mutableStateFlow.value) + debugMiddleware.onDispatchAll(caller, before, actions, mutableStateFlow.value) } fun observeAll(receiver: C) = behaviours.forEach { behaviour -> diff --git a/server/core/src/main/java/dev/slimevr/context/debug/DebugMiddleware.kt b/server/core/src/main/java/dev/slimevr/context/debug/DebugMiddleware.kt index 918778d22..a2a0f0a67 100644 --- a/server/core/src/main/java/dev/slimevr/context/debug/DebugMiddleware.kt +++ b/server/core/src/main/java/dev/slimevr/context/debug/DebugMiddleware.kt @@ -2,5 +2,5 @@ package dev.slimevr.context.debug interface DebugMiddleware { fun onDispatch(caller: String?, before: S, action: A, after: S) - fun onDispatchBatch(caller: String?, before: S, actions: List, after: S) + fun onDispatchAll(caller: String?, before: S, actions: List, after: S) } diff --git a/server/core/src/main/java/dev/slimevr/context/debug/LoggingMiddleware.kt b/server/core/src/main/java/dev/slimevr/context/debug/LoggingMiddleware.kt index 10542e14e..4dbbe1a9d 100644 --- a/server/core/src/main/java/dev/slimevr/context/debug/LoggingMiddleware.kt +++ b/server/core/src/main/java/dev/slimevr/context/debug/LoggingMiddleware.kt @@ -39,7 +39,7 @@ class LoggingMiddleware( println(formatLine("$tag $actionName$callerSuffix", before, after)) } - override fun onDispatchBatch(caller: String?, before: S, actions: List, after: S) { + override fun onDispatchAll(caller: String?, before: S, actions: List, after: S) { val visible = actions.filter { action -> isAllowed(action) } if (visible.isEmpty()) return if (!logNoOps && before == after) return diff --git a/server/core/src/main/java/dev/slimevr/tracker/module.kt b/server/core/src/main/java/dev/slimevr/tracker/module.kt index 7469a8a89..2b2854f0b 100644 --- a/server/core/src/main/java/dev/slimevr/tracker/module.kt +++ b/server/core/src/main/java/dev/slimevr/tracker/module.kt @@ -2,9 +2,9 @@ package dev.slimevr.tracker import dev.slimevr.VRServer import dev.slimevr.config.Settings -import dev.slimevr.config.TrackerConfig import dev.slimevr.context.Behaviour import dev.slimevr.context.Context +import dev.slimevr.context.debug.DiffStyle import dev.slimevr.context.debug.LoggingMiddleware import dev.slimevr.device.DeviceOrigin import io.github.axisangles.ktmath.Quaternion @@ -99,9 +99,10 @@ class Tracker( initialState = trackerState, scope = scope, behaviours = behaviours, - LoggingMiddleware( + debugMiddleware = LoggingMiddleware( "Tracker[$hardwareId]", -// block = setOf(TrackerActions.SetRotation::class) + block = setOf(TrackerActions.SetRotation::class), + diffStyle = DiffStyle.MULTILINE ), ) val tracker = Tracker(context = context, server)