Revert "Use rawAcceleration for Step Mounting"

This reverts commit d8e632a979.
This commit is contained in:
Butterscotch! committed 2026-10-02 04:28:58 -04:00
1 parent 943e5d4c12
commit 2c19f8a6ff
2 files changed
+3 -12

No files matched your search

@@ -8,7 +8,6 @@ import dev.slimevr.config.Settings
import dev.slimevr.context.Behaviour
import dev.slimevr.context.Context
import dev.slimevr.tracker.Tracker
import dev.slimevr.tracker.applyCalibration
import io.github.axisangles.ktmath.Quaternion
import io.github.axisangles.ktmath.Vector3
import kotlinx.coroutines.CoroutineScope
@@ -113,18 +112,9 @@ class StepMountingManager(
if (activeTrackers.isEmpty()) return emptyList()
return activeTrackers.map { controller ->
controller to controller.context.state.map { s ->
val accel = s.rawAcceleration ?: error("Trackers will always have acceleration in this case")
TrackerSnapshot(
rotation = s.rotation,
acceleration = applyCalibration(
accel,
s.rawRotation,
// TODO Stay Aligned does add to the headingCorrection not
// included here, so eventually this should just use
// s.acceleration.
s.sessionCalibration.headingCorrection,
// Leave headingALignment out of the equation
),
acceleration = s.acceleration ?: error("Trackers will always have acceleration in this case"),
)
}
}
@@ -264,8 +264,9 @@ fun reduce(
}
is TrackerActions.SetStepMounting -> {
val newHeadingAlignment = state.sessionCalibration.headingAlignment * action.headingAlignment
state.copy(
sessionCalibration = state.sessionCalibration.copy(headingAlignment = action.headingAlignment),
sessionCalibration = state.sessionCalibration.copy(headingAlignment = newHeadingAlignment),
lastMountingMethod = MountingMethod.STEP,
needsMountingReset = false,
rotationDirty = true,