Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix centaur pose bug #1282

Closed
wants to merge 2 commits into from
Closed

Fix centaur pose bug #1282

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
066b25c
Reset temporality before reset math
Erimelowo Jan 18, 2025
03447b2
don't reset temporality on mounting reset
Erimelowo Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions server/core/src/main/java/dev/slimevr/tracking/trackers/TrackerResetsHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,14 +215,17 @@ class TrackerResetsHandler(val tracker: Tracker) {
*/
fun resetFull(reference: Quaternion) {
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE) {
tracker.resetFilteringQuats()
tracker.trackerFlexHandler.resetMin()
postProcessResetFull()
clearRequireResetStatus()
return
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE) {
postProcessResetFull()
return
}

// Reset the tracking of temporality before the reset
tracker.resetFilteringQuats()

// Adjust for T-Pose (down)
tposeDownFix = if (((isLeftArmTracker() || isLeftFingerTracker()) && armsResetMode == ArmsResetModes.TPOSE_DOWN)) {
EulerAngles(EulerOrder.YZX, 0f, 0f, -FastMath.HALF_PI).toQuaternion()
Expand Down Expand Up @@ -286,16 +289,14 @@ class TrackerResetsHandler(val tracker: Tracker) {

calculateDrift(oldRot)

postProcessResetFull()
clearRequireResetStatus()
}

private fun postProcessResetFull() {
private fun clearRequireResetStatus() {
if (this.tracker.lastResetStatus != 0u) {
VRServer.instance.statusSystem.removeStatus(this.tracker.lastResetStatus)
this.tracker.lastResetStatus = 0u
}

tracker.resetFilteringQuats()
}

/**
Expand All @@ -311,6 +312,9 @@ class TrackerResetsHandler(val tracker: Tracker) {
return
}

// Reset the tracking of temporality before the reset
tracker.resetFilteringQuats()

// Old rot for drift compensation
val oldRot = adjustToReference(tracker.getRawRotation())
lastResetQuaternion = oldRot
Expand All @@ -336,8 +340,6 @@ class TrackerResetsHandler(val tracker: Tracker) {
this.tracker.statusResetRecently = false
this.tracker.lastResetStatus = 0u
}

tracker.resetFilteringQuats()
}

/**
Expand All @@ -347,11 +349,8 @@ class TrackerResetsHandler(val tracker: Tracker) {
fun resetMounting(reference: Quaternion) {
if (tracker.trackerDataType == TrackerDataType.FLEX_RESISTANCE) {
tracker.trackerFlexHandler.resetMax()
tracker.resetFilteringQuats()
return
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE) {
return
} else if (!resetMountingFeet && isFootTracker()) {
} else if (tracker.trackerDataType == TrackerDataType.FLEX_ANGLE || (!resetMountingFeet && isFootTracker())) {
return
}

Expand Down Expand Up @@ -399,8 +398,6 @@ class TrackerResetsHandler(val tracker: Tracker) {

// save mounting reset
if (saveMountingReset) tracker.saveMountingResetOrientation(mountRotFix)

tracker.resetFilteringQuats()
}

fun clearMounting() {
Expand Down
Loading