From 88144df4901442536510aad7282c5c807de7ade2 Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Mon, 21 Jun 2021 16:12:31 +0200 Subject: [PATCH] Rename files --- openVulkanoCpp/AR/ArFrame.cpp | 4 ++-- openVulkanoCpp/AR/{ArFrame.h => ArFrame.hpp} | 0 openVulkanoCpp/AR/{ArRecorder.h => ArRecorder.hpp} | 2 +- openVulkanoCpp/AR/ArSession.cpp | 4 +--- openVulkanoCpp/AR/{ArSession.h => ArSession.hpp} | 0 openVulkanoCpp/AR/ArSessionMetadata.hpp | 2 +- openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h | 2 +- openVulkanoCpp/AR/Provider/ArSessionNull.hpp | 2 +- openVulkanoCpp/AR/Provider/Network/ArSessionStream.h | 2 +- openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp | 2 +- openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp | 1 + openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.h | 2 +- 12 files changed, 11 insertions(+), 12 deletions(-) rename openVulkanoCpp/AR/{ArFrame.h => ArFrame.hpp} (100%) rename openVulkanoCpp/AR/{ArRecorder.h => ArRecorder.hpp} (97%) rename openVulkanoCpp/AR/{ArSession.h => ArSession.hpp} (100%) diff --git a/openVulkanoCpp/AR/ArFrame.cpp b/openVulkanoCpp/AR/ArFrame.cpp index 0de779c..4b72b6f 100644 --- a/openVulkanoCpp/AR/ArFrame.cpp +++ b/openVulkanoCpp/AR/ArFrame.cpp @@ -4,8 +4,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "ArFrame.h" -#include "ArSession.h" +#include "ArFrame.hpp" +#include "ArSession.hpp" namespace openVulkanoCpp::AR { diff --git a/openVulkanoCpp/AR/ArFrame.h b/openVulkanoCpp/AR/ArFrame.hpp similarity index 100% rename from openVulkanoCpp/AR/ArFrame.h rename to openVulkanoCpp/AR/ArFrame.hpp diff --git a/openVulkanoCpp/AR/ArRecorder.h b/openVulkanoCpp/AR/ArRecorder.hpp similarity index 97% rename from openVulkanoCpp/AR/ArRecorder.h rename to openVulkanoCpp/AR/ArRecorder.hpp index 5b20b62..e6175e6 100644 --- a/openVulkanoCpp/AR/ArRecorder.h +++ b/openVulkanoCpp/AR/ArRecorder.hpp @@ -79,7 +79,7 @@ namespace openVulkanoCpp::AR void SetRecordingMode(RecordingMode mode) { recordingMode = mode; } /** - * Chceks the currently used recording mode for the AR session + * Checks the currently used recording mode for the AR session * @return The currently used recording mode */ [[nodiscard]] RecordingMode SetRecordingMode() { return recordingMode; } diff --git a/openVulkanoCpp/AR/ArSession.cpp b/openVulkanoCpp/AR/ArSession.cpp index 456c1c8..5237fa2 100644 --- a/openVulkanoCpp/AR/ArSession.cpp +++ b/openVulkanoCpp/AR/ArSession.cpp @@ -4,10 +4,8 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "ArSession.h" -#ifndef __APPLE__ +#include "ArSession.hpp" #include "Provider/Playback/ArSessionPlayback.h" -#endif #include "Provider/Network/ArSessionStream.h" #ifdef __APPLE__ #include "Provider/ArKit/ArSessionArKit.h" diff --git a/openVulkanoCpp/AR/ArSession.h b/openVulkanoCpp/AR/ArSession.hpp similarity index 100% rename from openVulkanoCpp/AR/ArSession.h rename to openVulkanoCpp/AR/ArSession.hpp diff --git a/openVulkanoCpp/AR/ArSessionMetadata.hpp b/openVulkanoCpp/AR/ArSessionMetadata.hpp index 9f52b32..8a1931a 100644 --- a/openVulkanoCpp/AR/ArSessionMetadata.hpp +++ b/openVulkanoCpp/AR/ArSessionMetadata.hpp @@ -32,7 +32,7 @@ namespace openVulkanoCpp::AR [[nodiscard]] std::string ToYaml() const; - float GetConfidenceNormalisationFactor() const + [[nodiscard]] float GetConfidenceNormalisationFactor() const { return 1.0f / static_cast(confidenceRange.max); } diff --git a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h index 955607e..8aaef53 100644 --- a/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h +++ b/openVulkanoCpp/AR/Provider/ArCore/ArSessionArCore.h @@ -6,7 +6,7 @@ #pragma once -#include "AR/ArSession.h" +#include "AR/ArSession.hpp" // Define the class of the native AR session to be used #define NATIVE_AR_SESSION_CLASS ArCore::ArSessionArCore diff --git a/openVulkanoCpp/AR/Provider/ArSessionNull.hpp b/openVulkanoCpp/AR/Provider/ArSessionNull.hpp index 8d788fa..bd5e821 100644 --- a/openVulkanoCpp/AR/Provider/ArSessionNull.hpp +++ b/openVulkanoCpp/AR/Provider/ArSessionNull.hpp @@ -6,7 +6,7 @@ #pragma once -#include "AR/ArSession.h" +#include "AR/ArSession.hpp" // Define the class of the native AR session to be used #define NATIVE_AR_SESSION_CLASS ArSessionNull diff --git a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h index f960e8b..d56970b 100644 --- a/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h +++ b/openVulkanoCpp/AR/Provider/Network/ArSessionStream.h @@ -6,7 +6,7 @@ #pragma once -#include "AR/ArSession.h" +#include "AR/ArSession.hpp" namespace openVulkanoCpp::AR::Network { diff --git a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp index 62f6faf..058bc64 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.hpp @@ -6,7 +6,7 @@ #pragma once -#include "AR/ArFrame.h" +#include "AR/ArFrame.hpp" #include "ArPlaybackReader.hpp" namespace openVulkanoCpp::AR::Playback diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp index 7be9708..57c4ceb 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.cpp @@ -70,6 +70,7 @@ namespace openVulkanoCpp::AR::Playback Logger::AR->error("Failed to read AR frame: {}", e.what()); } Stop(); + OnSessionInterruptionChange(true); return nullptr; } diff --git a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.h b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.h index f9446ad..01699ea 100644 --- a/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.h +++ b/openVulkanoCpp/AR/Provider/Playback/ArSessionPlayback.h @@ -6,7 +6,7 @@ #pragma once -#include "AR/ArSession.h" +#include "AR/ArSession.hpp" #include "ArPlaybackReader.hpp" #include "Math/Timestamp.hpp"