SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Floor Fix now works correctly regardless of controller facing up or down.

Browse Source
This commit is contained in:
matzman
2016-12-20 20:31:54 +01:00
parent a93bdeb063
commit 930c99a341
2 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/FixFloorTabController.cpp
+44 -12
View File
@@ -60,23 +60,55 @@ void FixFloorTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses)
} else { } else {
referenceController = rightId; referenceController = rightId;
} }
tempOffset = (double)devicePoses[referenceController].mDeviceToAbsoluteTracking.m[1][3];
auto& m = devicePoses[referenceController].mDeviceToAbsoluteTracking.m;
tempOffsetY = (double)m[1][3];
/*
| Intrinsic y-x'-z" rotation matrix:
| cr*cy+sp*sr*sy | cr*sp*sy-cy*sr | cp*sy |
| cp*sr | cp*cr |-sp |
| cy*sp*sr-cr*sy | cr*cy*sp+sr*sy | cp*cy |
yaw = atan2(cp*sy, cp*cy) [pi, -pi], CCW
pitch = -asin(-sp) [pi/2, -pi/2]
roll = atan2(cp*sr, cp*cr) [pi, -pi], CW
*/
tempRoll = std::atan2((double)m[1][0], (double)m[1][1]);
measurementCount = 1; measurementCount = 1;
} }
} else if (measurementCount >= 25) {
floorOffset = -controllerUpOffsetCorrection + (float)(tempOffset / (double)measurementCount);
LOG(INFO) << "Fix Floor: Floor Offset = " << floorOffset;
parent->AddOffsetToUniverseCenter(vr::TrackingUniverseStanding, 1, floorOffset, false);
statusMessage = "Fixing ... OK";
statusMessageTimeout = 1.0;
emit statusMessageSignal();
emit measureEndSignal();
setCanUndo(true);
state = 0;
} else { } else {
tempOffset += (double)devicePoses[referenceController].mDeviceToAbsoluteTracking.m[1][3];
measurementCount++; measurementCount++;
auto& m = devicePoses[referenceController].mDeviceToAbsoluteTracking.m;
double rollDiff = std::atan2((double)m[1][0], (double)m[1][1]) - tempRoll;
if (rollDiff > M_PI) {
rollDiff -= 2.0 * M_PI;
} else if (rollDiff < -M_PI) {
rollDiff += 2.0 * M_PI;
}
tempRoll += rollDiff / (double)measurementCount;
if (tempRoll > M_PI) {
tempRoll -= 2.0 * M_PI;
} else if (tempRoll < -M_PI) {
tempRoll += 2.0 * M_PI;
}
if (measurementCount >= 25) {
if (std::abs(tempRoll) <= M_PI_2) {
floorOffset = tempOffsetY - controllerUpOffsetCorrection;
} else {
floorOffset = tempOffsetY - controllerDownOffsetCorrection;
}
LOG(INFO) << "Fix Floor: Floor Offset = " << floorOffset;
parent->AddOffsetToUniverseCenter(vr::TrackingUniverseStanding, 1, floorOffset, false);
statusMessage = "Fixing ... OK";
statusMessageTimeout = 1.0;
emit statusMessageSignal();
emit measureEndSignal();
setCanUndo(true);
state = 0;
}
} }
} }
} }
src/tabcontrollers/FixFloorTabController.h
+4 -3
View File
@@ -19,13 +19,14 @@ private:
OverlayController* parent; OverlayController* parent;
QQuickWindow* widget; QQuickWindow* widget;
float controllerUpOffsetCorrection = 0.06f; // Controller touchpad facing upwards float controllerUpOffsetCorrection = 0.062f; // Controller touchpad facing upwards
float controllerDownOffsetCorrection = 0.0f; // Controller touchpad facing downwards (not implemented yet) float controllerDownOffsetCorrection = 0.006f; // Controller touchpad facing downwards
int state = 0; // 0 .. idle, 1 .. measurement in progress int state = 0; // 0 .. idle, 1 .. measurement in progress
vr::TrackedDeviceIndex_t referenceController = vr::k_unTrackedDeviceIndexInvalid; vr::TrackedDeviceIndex_t referenceController = vr::k_unTrackedDeviceIndexInvalid;
unsigned measurementCount = 0; unsigned measurementCount = 0;
double tempOffset = 0.0; double tempOffsetY = 0.0;
double tempRoll = 0.0;
float floorOffset = 0.0f; float floorOffset = 0.0f;
QString statusMessage = ""; QString statusMessage = "";
float statusMessageTimeout = 0.0f; float statusMessageTimeout = 0.0f;