From f42c481308e5a92cb6e86f8c3a351b248e5b0d59 Mon Sep 17 00:00:00 2001 From: Vasily Date: Thu, 27 Dec 2018 14:29:22 +0100 Subject: [PATCH] Add brackets around intialization of 2D array inside struct 2 brackets are necessary because it's initialization of a struct, intializing an 3 member array of 4 floats. --- src/tabcontrollers/AudioTabController.cpp | 12 ++++++------ src/tabcontrollers/UtilitiesTabController.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp index e743566..84c89d4 100644 --- a/src/tabcontrollers/AudioTabController.cpp +++ b/src/tabcontrollers/AudioTabController.cpp @@ -54,12 +54,12 @@ namespace advsettings { std::string notifIconPath = QApplication::applicationDirPath().toStdString() + "/res/qml/ptt_notification.png"; if (QFile::exists(QString::fromStdString(notifIconPath))) { vr::VROverlay()->SetOverlayFromFile(m_ulNotificationOverlayHandle, notifIconPath.c_str()); - vr::VROverlay()->SetOverlayWidthInMeters(m_ulNotificationOverlayHandle, 0.02f); - vr::HmdMatrix34_t notificationTransform = { - 1.0f, 0.0f, 0.0f, 0.12f, - 0.0f, 1.0f, 0.0f, 0.08f, - 0.0f, 0.0f, 1.0f, -0.3f - }; + vr::VROverlay()->SetOverlayWidthInMeters(m_ulNotificationOverlayHandle, 0.02f); + vr::HmdMatrix34_t notificationTransform = {{ + {1.0f, 0.0f, 0.0f, 0.12f}, + {0.0f, 1.0f, 0.0f, 0.08f}, + {0.0f, 0.0f, 1.0f, -0.3f} + }}; vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(m_ulNotificationOverlayHandle, vr::k_unTrackedDeviceIndex_Hmd, ¬ificationTransform); } else { LOG(ERROR) << "Could not find notification icon \"" << notifIconPath << "\""; diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp index 4cd203e..705999a 100644 --- a/src/tabcontrollers/UtilitiesTabController.cpp +++ b/src/tabcontrollers/UtilitiesTabController.cpp @@ -210,11 +210,11 @@ namespace advsettings { if (QFile::exists(QString::fromStdString(batteryIconPath))) { vr::VROverlay()->SetOverlayFromFile(handle, batteryIconPath.c_str()); vr::VROverlay()->SetOverlayWidthInMeters(handle, 0.05f); - vr::HmdMatrix34_t notificationTransform = { - 1.0f, 0.0f, 0.0f, 0.00f, - 0.0f, -1.0f, 0.0f, 0.01f, - 0.0f, 0.0f, -1.0f, -0.013f - }; + vr::HmdMatrix34_t notificationTransform = {{ + {1.0f, 0.0f, 0.0f, 0.00f}, + {0.0f, -1.0f, 0.0f, 0.01f}, + {0.0f, 0.0f, -1.0f, -0.013f} + }}; vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(handle, index, ¬ificationTransform); LOG(INFO) << "Created battery overlay for device " << index; } else {