SpotlessApply

This commit is contained in:
Erimel committed 2026-07-17 14:51:21 -04:00
1 parent a1c4de8152
commit 349666b8cd
6 files changed
+262 -260

No files matched your search

@@ -16,7 +16,7 @@ data class RawBone(
val offset: Vector3,
val rawRotation: Quaternion,
val rawPosition: Vector3,
val isReceivingData : Boolean, // TODO set it with an action or whatever
val isReceivingData: Boolean, // TODO set it with an action or whatever
)
data class BoneState(
@@ -102,7 +102,7 @@ class Skeleton(
processors = listOf(
FallbackProcessor(),
ImputeSpineProcessor(ctx.config.settings),
PredictionProcessor(ctx.config.settings),
PredictionProcessor(ctx.config.settings),
SmoothingProcessor(ctx.config.settings),
),
),
@@ -11,15 +11,11 @@ interface SkeletonProcessor {
}
class FallbackProcessor : SkeletonProcessor {
override fun process(state: SkeletonState): SkeletonState {
return state
}
override fun process(state: SkeletonState): SkeletonState = state
}
class ImputeSpineProcessor(val settings: Settings) : SkeletonProcessor {
override fun process(state: SkeletonState): SkeletonState {
return state
}
override fun process(state: SkeletonState): SkeletonState = state
}
class SmoothingProcessor(val settings: Settings) : SkeletonProcessor {
@@ -50,10 +46,10 @@ class SmoothingProcessor(val settings: Settings) : SkeletonProcessor {
)
}
companion object {
private const val SMOOTH_MIN = 0.7f
private const val SMOOTH_MAX = 0.95f
}
companion object {
private const val SMOOTH_MIN = 0.63f
private const val SMOOTH_MAX = 0.94f
}
}
class PredictionProcessor(val settings: Settings) : SkeletonProcessor {
@@ -91,8 +91,8 @@ class TapDetectionBasicBehaviour : TapDetectionBehaviour {
if (setupMode) {
receiver.server.sendSolarxrRpc(
TapDetectionSetupNotification(
trackerTapDetectionState.trackerId.toUShort()
)
trackerTapDetectionState.trackerId.toUShort(),
),
)
}
@@ -217,12 +217,12 @@ class TapDetectionBasicBehaviour : TapDetectionBehaviour {
}
}
companion object {
const val NS_CONVERTER = 1.0e9f
companion object {
const val NS_CONVERTER = 1.0e9f
const val ACCEL_WINDOW_NS = 0.06f * NS_CONVERTER
const val TAP_WINDOW_PER_TAP_NS = 0.3f * NS_CONVERTER
const val NEEDED_ACCEL_DELTA = 6.0f
const val ALLOWED_BODY_ACCEL = 2.5f
const val ALLOWED_BODY_ACCEL_SQUARED = ALLOWED_BODY_ACCEL * ALLOWED_BODY_ACCEL
}
}
}
@@ -6,153 +6,153 @@ import kotlin.test.Test
import kotlin.test.assertEquals
class OutputTrackerToggleTest {
@Test
fun `Output trackers are automatically determined based off body parts`() {
data class TestCase(
val name: String,
val okBodyParts: Set<BodyPart?>,
val configuredTrackers: List<BodyPart>,
val expected: Set<BodyPart>,
)
@Test
fun `Output trackers are automatically determined based off body parts`() {
data class TestCase(
val name: String,
val okBodyParts: Set<BodyPart?>,
val configuredTrackers: List<BodyPart>,
val expected: Set<BodyPart>,
)
val testCases = listOf(
TestCase(
name = "no body part",
okBodyParts = emptySet(),
configuredTrackers = emptyList(),
expected = emptySet(),
),
TestCase(
name = "upper chest enables chest and hip",
okBodyParts = setOf(BodyPart.UPPER_CHEST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.CHEST,
BodyPart.HIP,
),
),
TestCase(
name = "chest enables chest and hip",
okBodyParts = setOf(BodyPart.CHEST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.CHEST,
BodyPart.HIP,
),
),
TestCase(
name = "waist enables hip",
okBodyParts = setOf(BodyPart.WAIST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.HIP,
),
),
TestCase(
name = "hip enables hip",
okBodyParts = setOf(BodyPart.HIP),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.HIP,
),
),
TestCase(
name = "left lower arm enables left upper arm",
okBodyParts = setOf(BodyPart.LEFT_LOWER_ARM),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_UPPER_ARM,
),
),
TestCase(
name = "right lower arm enables right upper arm",
okBodyParts = setOf(BodyPart.RIGHT_LOWER_ARM),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.RIGHT_UPPER_ARM,
),
),
TestCase(
name = "left lower leg enables left foot",
okBodyParts = setOf(BodyPart.LEFT_LOWER_LEG),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_FOOT,
),
),
TestCase(
name = "right lower leg enables right foot",
okBodyParts = setOf(BodyPart.RIGHT_LOWER_LEG),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.RIGHT_FOOT,
),
),
TestCase(
name = "multiple automatic trackers",
okBodyParts = setOf(
BodyPart.LEFT_UPPER_ARM,
BodyPart.RIGHT_FOOT,
BodyPart.HIP,
),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_UPPER_ARM,
BodyPart.RIGHT_FOOT,
BodyPart.HIP,
),
),
TestCase(
name = "hands are always included from config",
okBodyParts = emptySet(),
configuredTrackers = listOf(
BodyPart.LEFT_HAND,
BodyPart.RIGHT_HAND,
),
expected = setOf(
BodyPart.LEFT_HAND,
BodyPart.RIGHT_HAND,
),
),
TestCase(
name = "non-hand manual trackers are ignored",
okBodyParts = emptySet(),
configuredTrackers = listOf(
BodyPart.CHEST,
BodyPart.WAIST,
BodyPart.LEFT_HAND,
),
expected = setOf(
BodyPart.LEFT_HAND,
),
),
TestCase(
name = "automatic trackers combined with hands",
okBodyParts = setOf(
BodyPart.LEFT_FOOT,
),
configuredTrackers = listOf(
BodyPart.RIGHT_HAND,
),
expected = setOf(
BodyPart.LEFT_FOOT,
BodyPart.RIGHT_HAND,
),
),
)
val testCases = listOf(
TestCase(
name = "no body part",
okBodyParts = emptySet(),
configuredTrackers = emptyList(),
expected = emptySet(),
),
TestCase(
name = "upper chest enables chest and hip",
okBodyParts = setOf(BodyPart.UPPER_CHEST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.CHEST,
BodyPart.HIP,
),
),
TestCase(
name = "chest enables chest and hip",
okBodyParts = setOf(BodyPart.CHEST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.CHEST,
BodyPart.HIP,
),
),
TestCase(
name = "waist enables hip",
okBodyParts = setOf(BodyPart.WAIST),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.HIP,
),
),
TestCase(
name = "hip enables hip",
okBodyParts = setOf(BodyPart.HIP),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.HIP,
),
),
TestCase(
name = "left lower arm enables left upper arm",
okBodyParts = setOf(BodyPart.LEFT_LOWER_ARM),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_UPPER_ARM,
),
),
TestCase(
name = "right lower arm enables right upper arm",
okBodyParts = setOf(BodyPart.RIGHT_LOWER_ARM),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.RIGHT_UPPER_ARM,
),
),
TestCase(
name = "left lower leg enables left foot",
okBodyParts = setOf(BodyPart.LEFT_LOWER_LEG),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_FOOT,
),
),
TestCase(
name = "right lower leg enables right foot",
okBodyParts = setOf(BodyPart.RIGHT_LOWER_LEG),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.RIGHT_FOOT,
),
),
TestCase(
name = "multiple automatic trackers",
okBodyParts = setOf(
BodyPart.LEFT_UPPER_ARM,
BodyPart.RIGHT_FOOT,
BodyPart.HIP,
),
configuredTrackers = emptyList(),
expected = setOf(
BodyPart.LEFT_UPPER_ARM,
BodyPart.RIGHT_FOOT,
BodyPart.HIP,
),
),
TestCase(
name = "hands are always included from config",
okBodyParts = emptySet(),
configuredTrackers = listOf(
BodyPart.LEFT_HAND,
BodyPart.RIGHT_HAND,
),
expected = setOf(
BodyPart.LEFT_HAND,
BodyPart.RIGHT_HAND,
),
),
TestCase(
name = "non-hand manual trackers are ignored",
okBodyParts = emptySet(),
configuredTrackers = listOf(
BodyPart.CHEST,
BodyPart.WAIST,
BodyPart.LEFT_HAND,
),
expected = setOf(
BodyPart.LEFT_HAND,
),
),
TestCase(
name = "automatic trackers combined with hands",
okBodyParts = setOf(
BodyPart.LEFT_FOOT,
),
configuredTrackers = listOf(
BodyPart.RIGHT_HAND,
),
expected = setOf(
BodyPart.LEFT_FOOT,
BodyPart.RIGHT_HAND,
),
),
)
val behaviour = OutputTrackerToggleBasicBehaviour()
testCases.forEach { case ->
val result = behaviour.determineAutomaticOutputTrackers(
config = OutputTrackersConfig(trackers = case.configuredTrackers),
okBodyParts = case.okBodyParts,
)
val behaviour = OutputTrackerToggleBasicBehaviour()
testCases.forEach { case ->
val result = behaviour.determineAutomaticOutputTrackers(
config = OutputTrackersConfig(trackers = case.configuredTrackers),
okBodyParts = case.okBodyParts,
)
assertEquals(
expected = case.expected,
actual = result.toSet(),
message = case.name,
)
}
}
assertEquals(
expected = case.expected,
actual = result.toSet(),
message = case.name,
)
}
}
}
@@ -5,107 +5,113 @@ import kotlin.test.Test
import kotlin.test.assertEquals
class TapDetectionTest {
data class AccelEvent(
val delaySincePrevious: Long,
val accel: Vector3,
val expectedTap: Boolean,
)
data class AccelEvent(
val delaySincePrevious: Long,
val accel: Vector3,
val expectedTap: Boolean,
)
val highAccel = Vector3(0f, 0f, TapDetectionBasicBehaviour.NEEDED_ACCEL_DELTA * 3f)
val lowAccel = Vector3(0f, 0f, 0f)
// Accelerations needed for a tap happen with this delay
val accelDelay = (TapDetectionBasicBehaviour.ACCEL_WINDOW_NS * 0.9f).toLong()
// Delay between several taps
val tapDelay = (TapDetectionBasicBehaviour.TAP_WINDOW_PER_TAP_NS * 0.9f).toLong()
// Too long of a delay between several taps
val tapTimeoutDelay = (TapDetectionBasicBehaviour.TAP_WINDOW_PER_TAP_NS * 1.1f).toLong()
// Accel high enough to trigger a tap
val highAccel = Vector3(0f, 0f, TapDetectionBasicBehaviour.NEEDED_ACCEL_DELTA * 3f)
/**
* Runs a sequence of tap events through TapDetection, asserting the results.
*/
private fun runTapSequence(
tapsNeeded: Int,
events: List<AccelEvent>,
) {
val state = TapDetectionBasicBehaviour.TrackerTapDetectionState(
trackerId = 1,
tapsNeeded = tapsNeeded,
)
val trackersOverThreshold = mutableSetOf<Int>()
val behaviour = TapDetectionBasicBehaviour()
// Low accel needed as rest between taps
val lowAccel = Vector3(0f, 0f, 0f)
var now = 0L
events.forEach { event ->
now += event.delaySincePrevious
assertEquals(
event.expectedTap,
behaviour.runTapDetection(
now = now,
trackersOverThreshold = trackersOverThreshold,
trackerTapDetectionState = state,
trackerAcceleration = event.accel,
),
)
}
}
// Accelerations needed for a tap happen with this delay
val accelDelay = (TapDetectionBasicBehaviour.ACCEL_WINDOW_NS * 0.9f).toLong()
@Test
fun `Detect double tap`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = true),
),
)
// Delay between several taps
val tapDelay = (TapDetectionBasicBehaviour.TAP_WINDOW_PER_TAP_NS * 0.9f).toLong()
@Test
fun `Double tap timed out`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
),
)
// Too long of a delay between several taps
val tapTimeoutDelay = (TapDetectionBasicBehaviour.TAP_WINDOW_PER_TAP_NS * 1.1f).toLong()
@Test
fun `Detect triple tap`() = runTapSequence(
tapsNeeded = 3,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = true),
),
)
/**
* Runs a sequence of tap events through TapDetection, asserting the results.
*/
private fun runTapSequence(
tapsNeeded: Int,
events: List<AccelEvent>,
) {
val state = TapDetectionBasicBehaviour.TrackerTapDetectionState(
trackerId = 1,
tapsNeeded = tapsNeeded,
)
val trackersOverThreshold = mutableSetOf<Int>()
val behaviour = TapDetectionBasicBehaviour()
@Test
fun `Triple tap timed out`() = runTapSequence(
tapsNeeded = 3,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
),
)
var now = 0L
events.forEach { event ->
now += event.delaySincePrevious
assertEquals(
event.expectedTap,
behaviour.runTapDetection(
now = now,
trackersOverThreshold = trackersOverThreshold,
trackerTapDetectionState = state,
trackerAcceleration = event.accel,
),
)
}
}
@Test
fun `Tap not repeated while accel stays high`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, highAccel, expectedTap = false),
),
)
}
@Test
fun `Detect double tap`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = true),
),
)
@Test
fun `Double tap timed out`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
),
)
@Test
fun `Detect triple tap`() = runTapSequence(
tapsNeeded = 3,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = true),
),
)
@Test
fun `Triple tap timed out`() = runTapSequence(
tapsNeeded = 3,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
),
)
@Test
fun `Tap not repeated while accel stays high`() = runTapSequence(
tapsNeeded = 2,
events = listOf(
AccelEvent(0L, lowAccel, expectedTap = false),
AccelEvent(accelDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, highAccel, expectedTap = false),
AccelEvent(tapDelay, highAccel, expectedTap = false),
AccelEvent(tapTimeoutDelay, highAccel, expectedTap = false),
),
)
}
@@ -144,7 +144,7 @@ suspend fun handleDriverConnection(
ProtobufMessage(
tracker_added = TrackerAdded(
tracker_id = event.trackerId,
tracker_serial = "human://${trackerRole}",
tracker_serial = "human://$trackerRole",
tracker_name = event.name,
tracker_role = trackerRole.value.toInt(),
manufacturer = event.manufacturer,