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

Add brackets around intialization of 2D array inside struct

Browse Source 
2 brackets are necessary because it's initialization of a struct,
intializing an 3 member array of 4 floats.
This commit is contained in:
Vasily
2018-12-27 14:29:22 +01:00
parent e7e7272d52
commit f42c481308
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/AudioTabController.cpp
+6 -6
View File
@@ -54,12 +54,12 @@ namespace advsettings {
std::string notifIconPath = QApplication::applicationDirPath().toStdString() + "/res/qml/ptt_notification.png"; std::string notifIconPath = QApplication::applicationDirPath().toStdString() + "/res/qml/ptt_notification.png";
if (QFile::exists(QString::fromStdString(notifIconPath))) { if (QFile::exists(QString::fromStdString(notifIconPath))) {
vr::VROverlay()->SetOverlayFromFile(m_ulNotificationOverlayHandle, notifIconPath.c_str()); vr::VROverlay()->SetOverlayFromFile(m_ulNotificationOverlayHandle, notifIconPath.c_str());
vr::VROverlay()->SetOverlayWidthInMeters(m_ulNotificationOverlayHandle, 0.02f); vr::VROverlay()->SetOverlayWidthInMeters(m_ulNotificationOverlayHandle, 0.02f);
vr::HmdMatrix34_t notificationTransform = { vr::HmdMatrix34_t notificationTransform = {{
1.0f, 0.0f, 0.0f, 0.12f, {1.0f, 0.0f, 0.0f, 0.12f},
0.0f, 1.0f, 0.0f, 0.08f, {0.0f, 1.0f, 0.0f, 0.08f},
0.0f, 0.0f, 1.0f, -0.3f {0.0f, 0.0f, 1.0f, -0.3f}
}; }};
vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(m_ulNotificationOverlayHandle, vr::k_unTrackedDeviceIndex_Hmd, &notificationTransform); vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(m_ulNotificationOverlayHandle, vr::k_unTrackedDeviceIndex_Hmd, &notificationTransform);
} else { } else {
LOG(ERROR) << "Could not find notification icon \"" << notifIconPath << "\""; LOG(ERROR) << "Could not find notification icon \"" << notifIconPath << "\"";
src/tabcontrollers/UtilitiesTabController.cpp
+5 -5
View File
@@ -210,11 +210,11 @@ namespace advsettings {
if (QFile::exists(QString::fromStdString(batteryIconPath))) { if (QFile::exists(QString::fromStdString(batteryIconPath))) {
vr::VROverlay()->SetOverlayFromFile(handle, batteryIconPath.c_str()); vr::VROverlay()->SetOverlayFromFile(handle, batteryIconPath.c_str());
vr::VROverlay()->SetOverlayWidthInMeters(handle, 0.05f); vr::VROverlay()->SetOverlayWidthInMeters(handle, 0.05f);
vr::HmdMatrix34_t notificationTransform = { vr::HmdMatrix34_t notificationTransform = {{
1.0f, 0.0f, 0.0f, 0.00f, {1.0f, 0.0f, 0.0f, 0.00f},
0.0f, -1.0f, 0.0f, 0.01f, {0.0f, -1.0f, 0.0f, 0.01f},
0.0f, 0.0f, -1.0f, -0.013f {0.0f, 0.0f, -1.0f, -0.013f}
}; }};
vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(handle, index, &notificationTransform); vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(handle, index, &notificationTransform);
LOG(INFO) << "Created battery overlay for device " << index; LOG(INFO) << "Created battery overlay for device " << index;
} else { } else {