mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-04-06 02:01:58 +02:00
Basic step mounting ui
This commit is contained in:
@@ -100,7 +100,9 @@ function TrackerSmol({
|
||||
'border-[3px] border-opacity-80 rounded-md overflow-clip',
|
||||
{
|
||||
'border-status-warning': warning,
|
||||
'border-transparent': !warning,
|
||||
'border-transparent':
|
||||
!warning && !tracker.accelRecordingInProgress,
|
||||
'border-status-recording': tracker.accelRecordingInProgress,
|
||||
}
|
||||
)}
|
||||
>
|
||||
|
||||
@@ -60,7 +60,9 @@ export function TrackerNameCell({
|
||||
'border-[2px] border-opacity-80 rounded-md overflow-clip',
|
||||
{
|
||||
'border-status-warning': warning,
|
||||
'border-transparent': !warning,
|
||||
'border-transparent':
|
||||
!warning && !tracker.accelRecordingInProgress,
|
||||
'border-status-recording': tracker.accelRecordingInProgress,
|
||||
}
|
||||
)}
|
||||
>
|
||||
|
||||
@@ -19,6 +19,7 @@ export function useDataFeedConfig() {
|
||||
trackerData.tps = true;
|
||||
trackerData.rawMagneticVector = true;
|
||||
trackerData.stayAligned = true;
|
||||
trackerData.accelRecordingInProgress = true;
|
||||
|
||||
const dataMask = new DeviceDataMaskT();
|
||||
dataMask.deviceData = true;
|
||||
|
||||
@@ -95,6 +95,7 @@ body {
|
||||
--warning: 255, 225, 53;
|
||||
--critical: 223, 109, 140;
|
||||
--special: 164, 79, 237;
|
||||
--recording: 255, 84, 84;
|
||||
--window-icon-stroke: 192, 161, 216;
|
||||
|
||||
--default-color: 255, 255, 255;
|
||||
|
||||
@@ -191,6 +191,7 @@ const config = {
|
||||
warning: 'rgb(var(--warning), <alpha-value>)',
|
||||
critical: 'rgb(var(--critical), <alpha-value>)',
|
||||
special: 'rgb(var(--special), <alpha-value>)',
|
||||
recording: 'rgb(var(--recording), <alpha-value>)',
|
||||
},
|
||||
window: {
|
||||
icon: 'rgb(var(--window-icon-stroke), <alpha-value>)',
|
||||
|
||||
@@ -275,6 +275,9 @@ fun createTrackerData(
|
||||
if (mask.stayAligned) {
|
||||
TrackerData.addStayAligned(fbb, stayAlignedOffset)
|
||||
}
|
||||
if (mask.accelRecordingInProgress) {
|
||||
TrackerData.addAccelRecordingInProgress(fbb, tracker.accelMountInProgress)
|
||||
}
|
||||
|
||||
return TrackerData.endTrackerData(fbb)
|
||||
}
|
||||
|
||||
@@ -296,7 +296,7 @@ class Tracker @JvmOverloads constructor(
|
||||
val lastSamples = CircularArrayList<AccelSample>(8)
|
||||
var curTimeline: AccelTimeline? = null
|
||||
|
||||
var resetNext = false
|
||||
var accelMountInProgress = false
|
||||
|
||||
fun accumSample(accum: AccelAccumulator, sample: AccelSample, lastSampleTime: Long = -1, accelBias: Vector3 = Vector3.NULL): Float {
|
||||
val delta = if (lastSampleTime >= 0) {
|
||||
@@ -356,7 +356,7 @@ class Tracker @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
fun startMounting() {
|
||||
resetNext = true
|
||||
accelMountInProgress = true
|
||||
startTime = System.currentTimeMillis()
|
||||
}
|
||||
|
||||
@@ -371,7 +371,7 @@ class Tracker @JvmOverloads constructor(
|
||||
filteringHandler.dataTick(getAdjustedRotation())
|
||||
}
|
||||
|
||||
if (resetNext) {
|
||||
if (accelMountInProgress) {
|
||||
lastFrameRest = curFrameRest
|
||||
|
||||
val accel = getAcceleration()
|
||||
@@ -447,7 +447,7 @@ class Tracker @JvmOverloads constructor(
|
||||
|
||||
LogManager.info("[Accel] Tracker $id (${trackerPosition?.designation}):\nTracker: $trackerOff\nHmd: $hmdOff\nErr: ${tracker.len() - hmd.len()}\nResult: $mountVec ($mountText)")
|
||||
resetsHandler.mountRotFix *= mountRot
|
||||
resetNext = false
|
||||
accelMountInProgress = false
|
||||
}
|
||||
curTimeline = null
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user