From eefa82754618ff1243d3fffa9b128dfc46e6aaa6 Mon Sep 17 00:00:00 2001 From: Hyblocker Date: Sat, 27 Jul 2024 14:50:01 +0200 Subject: [PATCH] (feat): Prepare for jitter detection --- OpenVR-SpaceCalibrator/Calibration.cpp | 8 +++++--- OpenVR-SpaceCalibrator/Calibration.h | 4 ++-- OpenVR-SpaceCalibrator/UserInterface.cpp | 5 ++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenVR-SpaceCalibrator/Calibration.cpp b/OpenVR-SpaceCalibrator/Calibration.cpp index e228e98..adcdc55 100644 --- a/OpenVR-SpaceCalibrator/Calibration.cpp +++ b/OpenVR-SpaceCalibrator/Calibration.cpp @@ -498,12 +498,12 @@ void CalibrationTick(double time) ScanAndApplyProfile(ctx); - if (!CalCtx.ReferencePoseIsValid()) + if (!CalCtx.ReferencePoseIsValidSimple()) { CalCtx.Log("Reference device is not tracking\n"); ok = false; } - if (!CalCtx.TargetPoseIsValid()) + if (!CalCtx.TargetPoseIsValidSimple()) { CalCtx.Log("Target device is not tracking\n"); ok = false; } @@ -538,7 +538,9 @@ void CalibrationTick(double time) || state.rAxis[vr::k_eControllerAxis_Trigger].x > 0.75f; //printf("Controller %d tracpad: %f\n", i, state.rAxis[vr::k_eControllerAxis_TrackPad].x); //printf("Controller %d trigger: %f\n", i, state.rAxis[vr::k_eControllerAxis_Trigger].x); - if (!triggerPressed) break; + if (!triggerPressed) { + break; + } } } diff --git a/OpenVR-SpaceCalibrator/Calibration.h b/OpenVR-SpaceCalibrator/Calibration.h index d6361e1..b2937d4 100644 --- a/OpenVR-SpaceCalibrator/Calibration.h +++ b/OpenVR-SpaceCalibrator/Calibration.h @@ -186,12 +186,12 @@ struct CalibrationContext messages.back().target = target; } - bool TargetPoseIsValid() const { + bool TargetPoseIsValidSimple() const { return targetID >= 0 && targetID <= vr::k_unMaxTrackedDeviceCount && devicePoses[targetID].poseIsValid; } - bool ReferencePoseIsValid() const { + bool ReferencePoseIsValidSimple() const { return referenceID >= 0 && referenceID <= vr::k_unMaxTrackedDeviceCount && devicePoses[referenceID].poseIsValid; } diff --git a/OpenVR-SpaceCalibrator/UserInterface.cpp b/OpenVR-SpaceCalibrator/UserInterface.cpp index d8b7d9a..e450d36 100644 --- a/OpenVR-SpaceCalibrator/UserInterface.cpp +++ b/OpenVR-SpaceCalibrator/UserInterface.cpp @@ -245,7 +245,6 @@ void CCal_DrawSettings() { // Section: Continuous Calibration settings { ImGui::BeginGroupPanel("Continuous calibration", panel_size); - { // @TODO: Reduce code duplication (tooltips) // Recalibration threshold @@ -360,7 +359,7 @@ void CCal_BasicInfo() { ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, 0xFF000080); status = "NOT FOUND"; } - else if (!CalCtx.ReferencePoseIsValid()) { + else if (!CalCtx.ReferencePoseIsValidSimple()) { ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, 0xFFFF0080); status = "NOT TRACKING"; } @@ -381,7 +380,7 @@ void CCal_BasicInfo() { ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, 0xFF000080); status = "NOT FOUND"; } - else if (!CalCtx.TargetPoseIsValid()) { + else if (!CalCtx.TargetPoseIsValidSimple()) { ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, 0xFFFF0080); status = "NOT TRACKING"; }