steam-frame/hyblocker--OpenVR-SpaceCalibrator
1
0 Fork 0
mirror of https://github.com/hyblocker/OpenVR-SpaceCalibrator.git synced 2026-10-17 14:00:45 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix: auto-detection

Browse Source
This commit is contained in:
Hyblocker committed 2026-08-15 02:59:47 +02:00
1 parent 3f5d0cf01a
commit c2368d7e69
2 files changed
+54 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/overlay/calibration.cpp
+49 -26
View File
@@ -791,8 +791,6 @@ namespace spacecal {
}
}
}
m_lastTick = currentTime;
// detect playspace jumps and try auto-correcting for it.
if (autoFixPlayspaceJumps) {
@@ -816,6 +814,20 @@ namespace spacecal {
}
}
if (state == CalibrationState::AUTO_DETECT_DEVICES_STANDARD || state == CalibrationState::AUTO_DETECT_DEVICES_CONTINUOUS) {
// @TODO: measure velocities, compare, determine devices
if (detectCorrelatingDevices(currentTime)) {
if (state == CalibrationState::AUTO_DETECT_DEVICES_STANDARD) {
state = CalibrationState::NONE;
}
else if (state == CalibrationState::AUTO_DETECT_DEVICES_CONTINUOUS) {
state = CalibrationState::CONTINUOUS_IDLE;
}
}
}
m_lastTick = currentTime;
if (state == CalibrationState::CONTINUOUS_IDLE) {
wantedUpdateInterval = 1.0;
if ((currentTime - m_lastScan) >= 1.0) {
@@ -847,18 +859,6 @@ namespace spacecal {
return;
}
if (state == CalibrationState::AUTO_DETECT_DEVICES_STANDARD || state == CalibrationState::AUTO_DETECT_DEVICES_CONTINUOUS) {
// @TODO: measure velocities, compare, determine devices
if (detectCorrelatingDevices(currentTime)) {
if (state == CalibrationState::AUTO_DETECT_DEVICES_STANDARD) {
state = CalibrationState::NONE;
} else if (state == CalibrationState::AUTO_DETECT_DEVICES_CONTINUOUS) {
state = CalibrationState::CONTINUOUS_IDLE;
}
}
}
if (state == CalibrationState::START || state == CalibrationState::CONTINUOUS_IDLE) {
bool ok = true;
@@ -999,9 +999,13 @@ namespace spacecal {
}
void TrackingSystemCalibration::autoDetectDevices() {
LOG_CALIB_INFO("Entering auto-detection mode...");
state = isContinuousCalibration() ? CalibrationState::AUTO_DETECT_DEVICES_CONTINUOUS : CalibrationState::AUTO_DETECT_DEVICES_STANDARD;
m_candidateScore = 0;
m_autoDetectStartTime = NAN;
for (vr::TrackedDeviceIndex_t i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
m_autoDetectSpeeds[i] = 0.0;
}
}
bool TrackingSystemCalibration::detectCorrelatingDevices(double currentTime) {
@@ -1014,20 +1018,27 @@ namespace spacecal {
vr::TrackedDeviceIndex_t frameTargetId = vr::k_unTrackedDeviceIndexInvalid;
double frameClosestSpeedDelta = 999.0;
// because some vendors (vd) do njot provide velocity we estimate it from first principles...
double deltaTime = currentTime - m_lastTick;
for (vr::TrackedDeviceIndex_t i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
const auto& poseI = CalibrationManager::getInstance()->m_poses[i];
if (!poseI.deviceIsConnected || !poseI.poseIsValid || poseI.result != vr::ETrackingResult::TrackingResult_Running_OK)
const auto& pose = CalibrationManager::getInstance()->m_poses[i];
const auto& lastPose = CalibrationManager::getInstance()->m_lastPoses[i];
if (!pose.deviceIsConnected || !pose.poseIsValid || pose.result != vr::ETrackingResult::TrackingResult_Running_OK)
continue;
if (!lastPose.deviceIsConnected || !lastPose.poseIsValid || lastPose.result != vr::ETrackingResult::TrackingResult_Running_OK)
continue;
double deltas[3] = { (pose.vecPosition[0] - lastPose.vecPosition[0]), (pose.vecPosition[1] - lastPose.vecPosition[1]), (pose.vecPosition[2] - lastPose.vecPosition[2]) };
m_autoDetectSpeeds[i] += (deltas[0] * deltas[0] + deltas[1] * deltas[1] + deltas[2] * deltas[2]) / deltaTime;
}
double speedI = Eigen::Vector3d(poseI.vecVelocity[0], poseI.vecVelocity[1], poseI.vecVelocity[2]).norm();
for (vr::TrackedDeviceIndex_t i = 0; i < vr::k_unMaxTrackedDeviceCount; i++) {
double speedI = m_autoDetectSpeeds[i];
if (isnan(speedI)) continue;
if (speedI < k_AUTO_DETECT_MIN_VELOCITY_THRESHOLD) continue;
for (vr::TrackedDeviceIndex_t j = i + 1; j < vr::k_unMaxTrackedDeviceCount; j++) {
const auto& poseJ = CalibrationManager::getInstance()->m_poses[j];
if (!poseJ.deviceIsConnected || !poseJ.poseIsValid || poseJ.result != vr::ETrackingResult::TrackingResult_Running_OK)
continue;
double speedJ = Eigen::Vector3d(poseJ.vecVelocity[0], poseJ.vecVelocity[1], poseJ.vecVelocity[2]).norm();
double speedJ = m_autoDetectSpeeds[j];
if (isnan(speedJ)) continue;
if (speedJ < k_AUTO_DETECT_MIN_VELOCITY_THRESHOLD) continue;
double speedDelta = std::abs(speedI - speedJ);
@@ -1046,10 +1057,12 @@ namespace spacecal {
m_candidateRefId = frameRefId;
m_candidateTargetId = frameTargetId;
m_candidateScore = 1;
} else if (m_candidateRefId == frameRefId && m_candidateTargetId == frameTargetId) {
}
else if (m_candidateRefId == frameRefId && m_candidateTargetId == frameTargetId) {
// the same pair we found earlier are moving together
m_candidateScore++;
} else {
}
else {
// a different pair was found, this may be a false positive so decrease score for now
m_candidateScore--;
if (m_candidateScore <= 0) {
@@ -1059,11 +1072,12 @@ namespace spacecal {
m_candidateScore = 1;
}
}
} else {
}
else {
// no devices generated a valid pair, did the user stop moving?
if (m_candidateScore > 0) m_candidateScore--;
}
if (currentTime - m_autoDetectStartTime >= k_AUTO_DETECT_DURATION) {
if (m_candidateRefId != vr::k_unTrackedDeviceIndexInvalid && m_candidateTargetId != vr::k_unTrackedDeviceIndexInvalid && m_candidateScore > k_AUTO_DETECT_MINIMUM_SCORE) {
const auto& refDevInfo = VRState::getInstance()->getVrDevice(m_candidateRefId);
@@ -1071,11 +1085,18 @@ namespace spacecal {
referenceDevice.deviceId = m_candidateRefId;
referenceDevice.trackingSystem = refDevInfo.szTrackingSystemId;
referenceDevice.deviceModel = refDevInfo.szModel;
referenceDevice.deviceSerialNumber = refDevInfo.szSerial;
targetDevice.deviceId = m_candidateTargetId;
targetDevice.trackingSystem = targetDevInfo.szTrackingSystemId;
targetDevice.deviceModel = targetDevInfo.szModel;
targetDevice.deviceSerialNumber = targetDevInfo.szSerial;
LOG_CALIB_INFO("Automatically detected devices; ref: ID {}, target: ID {}", m_candidateRefId, m_candidateTargetId);
// we found a new tracking system pair, update the settings
CalibrationManager::getInstance()->saveConfig();
return true;
} else {
LOG_CALIB_WARN("Failed to automatically detect devices. Did the user move them enough?");
@@ -1281,6 +1302,8 @@ namespace spacecal {
// @NOTE: is max better here?
m_wantedUpdateInterval = wantedInterval / countedCalibrations;
}
memcpy(m_lastPoses, m_poses, sizeof(m_lastPoses));
}
void CalibrationManager::apply() {
src/overlay/calibration.h
+5 -3
View File
@@ -13,9 +13,9 @@ namespace spacecal {
constexpr double k_TICK_RATE_HZ = 20.0; // tick rate spacecal's internal logic runs at
constexpr double k_MAX_INVALID_CALIBRATION_TIME_SEC = 60.0; // 60s between invalid calibrations
constexpr double k_IPC_CONNECTION_RETRY_INTERVAL_SEC = 0.25; // 250ms between IPC connection attempts
constexpr double k_AUTO_DETECT_DURATION = 2.0; // 2 seconds for auto-detection
constexpr double k_AUTO_DETECT_DURATION = 5.0; // 2 seconds for auto-detection
constexpr int k_AUTO_DETECT_MINIMUM_SCORE = 40;
constexpr float k_AUTO_DETECT_MIN_VELOCITY_THRESHOLD = 0.2f; // devices need to be moving enough for us to consider them
constexpr float k_AUTO_DETECT_MIN_VELOCITY_THRESHOLD = 0.1f; // devices need to be moving enough for us to consider them
constexpr float k_AUTO_DETECT_MAX_VELOCITY_DIFF = 0.15f; // speed tolerance between devices, we only allow for up to this much variance in speed due to hardware differences and unit to unit variance
constexpr double k_PLAYSPACE_JUMP_WORLD_FROM_DRIVER_ANGLE_THRESHOLD_RAD = 1.0 * (EIGEN_PI / 180.0); // the angular threshold of movement for detecting sudden playspace jumps from a device
constexpr double k_PLAYSPACE_JUMP_WORLD_FROM_DRIVER_POS_THRESHOLD_METERS = 0.005; // the threshold in metres for detecting sudden playspace jumps from a device
@@ -287,6 +287,7 @@ namespace spacecal {
float m_autoDetectStartTime = NAN;
vr::TrackedDeviceIndex_t m_candidateRefId = vr::k_unTrackedDeviceIndexInvalid;
vr::TrackedDeviceIndex_t m_candidateTargetId = vr::k_unTrackedDeviceIndexInvalid;
double m_autoDetectSpeeds[vr::k_unMaxTrackedDeviceCount] = {};
// for detecting if a device jumps from one playspace to another
Eigen::Quaterniond m_lastRefWorldFromDriverRot = Eigen::Quaterniond::Identity();
@@ -333,8 +334,9 @@ namespace spacecal {
double m_lastIpcConnectionAttemptTime = 0.0;
bool m_needToApplyTransformsAfterInit = false;
public: // @HACK: i just want something in the ui for now
public:
vr::DriverPose_t m_poses[vr::k_unMaxTrackedDeviceCount] = {};
vr::DriverPose_t m_lastPoses[vr::k_unMaxTrackedDeviceCount] = {};
private:
std::vector<TrackingSystemCalibration> m_calibrations;
VRState m_vrState;