Fine-tuned granularity of spinner boxes on revive page.
Added check for outdated OpenVR installation. Changed version string to v2.2.
This commit is contained in:
@@ -530,7 +530,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "-"
|
text: "-"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchX((ReviveTabController.touchX - 0.001).toFixed(3))
|
ReviveTabController.setTouchX((ReviveTabController.touchX - 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -559,7 +559,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "+"
|
text: "+"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchX((ReviveTabController.touchX + 0.001).toFixed(3))
|
ReviveTabController.setTouchX((ReviveTabController.touchX + 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -576,7 +576,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "-"
|
text: "-"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchY((ReviveTabController.touchY - 0.001).toFixed(3))
|
ReviveTabController.setTouchY((ReviveTabController.touchY - 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -605,7 +605,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "+"
|
text: "+"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchY((ReviveTabController.touchY + 0.001).toFixed(3))
|
ReviveTabController.setTouchY((ReviveTabController.touchY + 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -622,7 +622,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "-"
|
text: "-"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchZ((ReviveTabController.touchZ - 0.001).toFixed(3))
|
ReviveTabController.setTouchZ((ReviveTabController.touchZ - 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -651,7 +651,7 @@ MyStackViewPage {
|
|||||||
Layout.preferredWidth: 40
|
Layout.preferredWidth: 40
|
||||||
text: "+"
|
text: "+"
|
||||||
onClicked: {
|
onClicked: {
|
||||||
ReviveTabController.setTouchZ((ReviveTabController.touchZ + 0.001).toFixed(3))
|
ReviveTabController.setTouchZ((ReviveTabController.touchZ + 0.005).toFixed(3))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,12 +43,39 @@ void OverlayController::Init(QQmlEngine* qmlEngine) {
|
|||||||
if (initError == vr::VRInitError_Init_HmdNotFound || initError == vr::VRInitError_Init_HmdNotFoundPresenceFailed) {
|
if (initError == vr::VRInitError_Init_HmdNotFound || initError == vr::VRInitError_Init_HmdNotFoundPresenceFailed) {
|
||||||
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "Could not find HMD!");
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "Could not find HMD!");
|
||||||
}
|
}
|
||||||
throw std::runtime_error(std::string("Failed to initialize OpenVR: " + std::string(vr::VR_GetVRInitErrorAsEnglishDescription(initError))));
|
throw std::runtime_error(std::string("Failed to initialize OpenVR: ") + std::string(vr::VR_GetVRInitErrorAsEnglishDescription(initError)));
|
||||||
}
|
}
|
||||||
|
|
||||||
m_runtimePathUrl = QUrl::fromLocalFile(vr::VR_RuntimePath());
|
m_runtimePathUrl = QUrl::fromLocalFile(vr::VR_RuntimePath());
|
||||||
LOG(INFO) << "VR Runtime Path: " << m_runtimePathUrl.toLocalFile();
|
LOG(INFO) << "VR Runtime Path: " << m_runtimePathUrl.toLocalFile();
|
||||||
|
|
||||||
|
// Check whether OpenVR is too outdated
|
||||||
|
if (!vr::VR_IsInterfaceVersionValid(vr::IVRSystem_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRSystem_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRSettings_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRSettings_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVROverlay_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVROverlay_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRApplications_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRApplications_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRChaperone_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRChaperone_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRChaperoneSetup_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRChaperoneSetup_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRCompositor_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRCompositor_Version) + std::string(" not found."));
|
||||||
|
} else if (!vr::VR_IsInterfaceVersionValid(vr::IVRNotifications_Version)) {
|
||||||
|
QMessageBox::critical(nullptr, "OpenVR Advanced Settings Overlay", "OpenVR version is too outdated. Please update OpenVR.");
|
||||||
|
throw std::runtime_error(std::string("OpenVR version is too outdated: Interface version ") + std::string(vr::IVRNotifications_Version) + std::string(" not found."));
|
||||||
|
}
|
||||||
|
|
||||||
QSurfaceFormat format;
|
QSurfaceFormat format;
|
||||||
// Qt's QOpenGLPaintDevice is not compatible with OpenGL versions >= 3.0
|
// Qt's QOpenGLPaintDevice is not compatible with OpenGL versions >= 3.0
|
||||||
// NVIDIA does not care, but unfortunately AMD does
|
// NVIDIA does not care, but unfortunately AMD does
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class OverlayController : public QObject {
|
|||||||
public:
|
public:
|
||||||
static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
|
static constexpr const char* applicationKey = "matzman666.AdvancedSettings";
|
||||||
static constexpr const char* applicationName = "Advanced Settings";
|
static constexpr const char* applicationName = "Advanced Settings";
|
||||||
static constexpr const char* applicationVersionString = "v2.2a";
|
static constexpr const char* applicationVersionString = "v2.2";
|
||||||
|
|
||||||
private:
|
private:
|
||||||
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
|
vr::VROverlayHandle_t m_ulOverlayHandle = vr::k_ulOverlayHandleInvalid;
|
||||||
|
|||||||
Reference in New Issue
Block a user