Skip to content

Commit 18fbe15

Browse files
ImSapphireButterscotchV
authored andcommitted
Basic step mounting ui
1 parent afedb97 commit 18fbe15

File tree

7 files changed

+14
-6
lines changed

7 files changed

+14
-6
lines changed

gui/src/components/tracker/TrackerCard.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ function TrackerSmol({
100100
'border-[3px] border-opacity-80 rounded-md overflow-clip',
101101
{
102102
'border-status-warning': warning,
103-
'border-transparent': !warning,
103+
'border-transparent': !warning && !tracker.accelRecordingInProgress,
104+
'border-status-recording': tracker.accelRecordingInProgress
104105
}
105106
)}
106107
>

gui/src/components/tracker/TrackersTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ export function TrackerNameCell({
6060
'border-[2px] border-opacity-80 rounded-md overflow-clip',
6161
{
6262
'border-status-warning': warning,
63-
'border-transparent': !warning,
63+
'border-transparent': !warning && !tracker.accelRecordingInProgress,
64+
'border-status-recording': tracker.accelRecordingInProgress
6465
}
6566
)}
6667
>

gui/src/hooks/datafeed-config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export function useDataFeedConfig() {
1919
trackerData.tps = true;
2020
trackerData.rawMagneticVector = true;
2121
trackerData.stayAligned = true;
22+
trackerData.accelRecordingInProgress = true;
2223

2324
const dataMask = new DeviceDataMaskT();
2425
dataMask.deviceData = true;

gui/src/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ body {
9494
--warning: 255, 225, 53;
9595
--critical: 223, 109, 140;
9696
--special: 164, 79, 237;
97+
--recording: 255, 84, 84;
9798
--window-icon-stroke: 192, 161, 216;
9899

99100
--default-color: 255, 255, 255;

gui/tailwind.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ const config = {
191191
warning: 'rgb(var(--warning), <alpha-value>)',
192192
critical: 'rgb(var(--critical), <alpha-value>)',
193193
special: 'rgb(var(--special), <alpha-value>)',
194+
recording: 'rgb(var(--recording), <alpha-value>)',
194195
},
195196
window: {
196197
icon: 'rgb(var(--window-icon-stroke), <alpha-value>)',

server/core/src/main/java/dev/slimevr/protocol/datafeed/DataFeedBuilder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ public static int createTrackerData(
253253
if (mask.getStayAligned()) {
254254
TrackerData.addStayAligned(fbb, stayAlignedOffset);
255255
}
256+
if (mask.getAccelRecordingInProgress()) {
257+
TrackerData.addAccelRecordingInProgress(fbb, tracker.getAccelMountInProgress());
258+
}
256259

257260
return TrackerData.endTrackerData(fbb);
258261
}

server/core/src/main/java/dev/slimevr/tracking/trackers/Tracker.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ class Tracker @JvmOverloads constructor(
293293
val lastSamples = CircularArrayList<AccelSample>(8)
294294
var curTimeline: AccelTimeline? = null
295295

296-
var resetNext = false
296+
var accelMountInProgress = false
297297

298298
fun accumSample(accum: AccelAccumulator, sample: AccelSample, lastSampleTime: Long = -1, accelBias: Vector3 = Vector3.NULL): Float {
299299
val delta = if (lastSampleTime >= 0) {
@@ -353,7 +353,7 @@ class Tracker @JvmOverloads constructor(
353353
}
354354

355355
fun startMounting() {
356-
resetNext = true
356+
accelMountInProgress = true
357357
startTime = System.currentTimeMillis()
358358
}
359359

@@ -368,7 +368,7 @@ class Tracker @JvmOverloads constructor(
368368
filteringHandler.dataTick(getAdjustedRotation())
369369
}
370370

371-
if (resetNext) {
371+
if (accelMountInProgress) {
372372
lastFrameRest = curFrameRest
373373

374374
val accel = getAcceleration()
@@ -444,7 +444,7 @@ class Tracker @JvmOverloads constructor(
444444

445445
LogManager.info("[Accel] Tracker $id (${trackerPosition?.designation}):\nTracker: $trackerOff\nHmd: $hmdOff\nErr: ${tracker.len() - hmd.len()}\nResult: $mountVec ($mountText)")
446446
resetsHandler.mountRotFix *= mountRot
447-
resetNext = false
447+
accelMountInProgress = false
448448
}
449449
curTimeline = null
450450
} else {

0 commit comments

Comments
 (0)