diff --git a/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt b/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt index 91d6b9efb..2920be7b7 100644 --- a/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt +++ b/server/android/src/main/java/dev/slimevr/android/ForegroundService.kt @@ -168,6 +168,7 @@ class ForegroundService : Service() { discoverServicesFlow = ::discoverServices, serviceFactory = ::createNetService, ) + val localizerManager = LocalizerManager.create(settings = config.settings, skeleton = skeleton, scope = this) val resetsManager = ResetsManager.create(ctx = phase1, skeleton = skeleton, scope = scope) val tapDetectionManager = TapDetectionManager.create(ctx = phase1, resetsManager = resetsManager, scope = scope) val keybindManager = KeybindManager.create(scope = scope) @@ -197,6 +198,7 @@ class ForegroundService : Service() { bvhManager = bvhManager, vmcManager = vmcManager, vrcOscManager = vrcOscManager, + localizerManager = localizerManager, resetsManager = resetsManager, tapDetectionManager = tapDetectionManager, ) diff --git a/server/core/src/main/java/dev/slimevr/app-context.kt b/server/core/src/main/java/dev/slimevr/app-context.kt index 41a0f0e74..4b6dfb821 100644 --- a/server/core/src/main/java/dev/slimevr/app-context.kt +++ b/server/core/src/main/java/dev/slimevr/app-context.kt @@ -5,6 +5,7 @@ import dev.slimevr.config.AppConfig import dev.slimevr.firmware.FirmwareManager import dev.slimevr.heightcalibration.HeightCalibrationManager import dev.slimevr.keybind.KeybindManager +import dev.slimevr.localizer.LocalizerManager import dev.slimevr.networkprofile.NetworkProfileManager import dev.slimevr.provisioning.ProvisioningManager import dev.slimevr.resets.ResetsManager @@ -47,6 +48,7 @@ interface AppContextProvider : Phase1ContextProvider { val bvhManager: BVHManager val vmcManager: VMCManager val vrcOscManager: VRCOSCManager + val localizerManager: LocalizerManager val resetsManager: ResetsManager val tapDetectionManager: TapDetectionManager fun startObserving() @@ -72,6 +74,7 @@ class AppContext( override val bvhManager: BVHManager, override val vmcManager: VMCManager, override val vrcOscManager: VRCOSCManager, + override val localizerManager: LocalizerManager, override val resetsManager: ResetsManager, override val tapDetectionManager: TapDetectionManager, ) : AppContextProvider { @@ -88,6 +91,7 @@ class AppContext( boneRouting.startObserving(this) vmcManager.startObserving(this) vrcOscManager.startObserving(this) + localizerManager.startObserving() resetsManager.startObserving() tapDetectionManager.startObserving() } diff --git a/server/core/src/main/java/dev/slimevr/localizer/behaviours.kt b/server/core/src/main/java/dev/slimevr/localizer/behaviours.kt new file mode 100644 index 000000000..45ec9c23d --- /dev/null +++ b/server/core/src/main/java/dev/slimevr/localizer/behaviours.kt @@ -0,0 +1,9 @@ +package dev.slimevr.localizer + +import dev.slimevr.config.Settings +import dev.slimevr.skeleton.Skeleton + +class LocalizerBasicBehaviour(val settings: Settings, val skeleton: Skeleton) : LocalizerBehaviour { + override fun observe(receiver: LocalizerManager) { + } +} diff --git a/server/core/src/main/java/dev/slimevr/localizer/module.kt b/server/core/src/main/java/dev/slimevr/localizer/module.kt new file mode 100644 index 000000000..e82af61ae --- /dev/null +++ b/server/core/src/main/java/dev/slimevr/localizer/module.kt @@ -0,0 +1,40 @@ +package dev.slimevr.localizer + +import dev.slimevr.config.Settings +import dev.slimevr.context.Behaviour +import dev.slimevr.context.Context +import dev.slimevr.skeleton.Skeleton +import io.github.axisangles.ktmath.Vector3 +import kotlinx.coroutines.CoroutineScope +import kotlin.collections.listOf + +data class LocalizerState( + val headPosition: Vector3, +) + +sealed interface LocalizerActions { + data object Reset : LocalizerActions + data class SetHeadPosition(val position: Vector3) : LocalizerActions +} + +typealias LocalizerContext = Context +typealias LocalizerBehaviour = Behaviour + +class LocalizerManager(val context: LocalizerContext, val settings: Settings, val skeleton: Skeleton) { + fun startObserving() = context.observeAll(this) + + companion object { + fun create(settings: Settings, skeleton: Skeleton, scope: CoroutineScope): LocalizerManager { + val context = Context.create( + initialState = LocalizerState( + headPosition = Vector3.NULL + ), + scope = scope, + reducer = ::reduce, + behaviours = listOf(LocalizerBasicBehaviour(settings, skeleton)), + name = "LocalizerManager", + ) + return LocalizerManager(context, settings, skeleton) + } + } +} diff --git a/server/core/src/main/java/dev/slimevr/localizer/reducer.kt b/server/core/src/main/java/dev/slimevr/localizer/reducer.kt new file mode 100644 index 000000000..e22a89a55 --- /dev/null +++ b/server/core/src/main/java/dev/slimevr/localizer/reducer.kt @@ -0,0 +1,7 @@ +package dev.slimevr.localizer + +fun reduce(state: LocalizerState, action: LocalizerActions): LocalizerState = when (action) { + is LocalizerActions.Reset -> state // TODO + + is LocalizerActions.SetHeadPosition -> state.copy(headPosition = action.position) +} diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt index 6d20a29c8..1e78d4b95 100644 --- a/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt +++ b/server/desktop/src/main/java/dev/slimevr/desktop/Main.kt @@ -32,6 +32,7 @@ import dev.slimevr.desktop.vrchat.resolveDesktopLocalIpAddress import dev.slimevr.firmware.FirmwareManager import dev.slimevr.heightcalibration.HeightCalibrationManager import dev.slimevr.keybind.KeybindManager +import dev.slimevr.localizer.LocalizerManager import dev.slimevr.networkprofile.NetworkProfileManager import dev.slimevr.provisioning.ProvisioningManager import dev.slimevr.resets.ResetsManager @@ -145,6 +146,7 @@ fun main(args: Array) = runBlocking(appCoroutineExceptionHandler + discoverServicesFlow = ::discoverServices, serviceFactory = ::createNetService, ) + val localizerManager = LocalizerManager.create(settings = config.settings, skeleton = skeleton, scope = this) val resetsManager = ResetsManager.create(ctx = phase1, skeleton = skeleton, scope = this) val tapDetectionManager = TapDetectionManager.create(ctx = phase1, resetsManager = resetsManager, scope = this) val keybindManager = KeybindManager.create(scope = this) @@ -169,6 +171,7 @@ fun main(args: Array) = runBlocking(appCoroutineExceptionHandler + bvhManager = bvhManager, vmcManager = vmcManager, vrcOscManager = vrcOscManager, + localizerManager = localizerManager, resetsManager = resetsManager, tapDetectionManager = tapDetectionManager, )