GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Georg Hagen
2025-05-27 19:40:05 +02:00
parent f042c5f37a
commit bb65670f48
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openVulkanoCpp/AR/ArFrame.cpp
View File

@@ -12,10 +12,10 @@
namespace OpenVulkano::AR namespace OpenVulkano::AR
{ {
float ArFrame::GetConfidenceNormalisationFactor() const ArFrame::ArFrame(const std::shared_ptr<ArSession>& session, size_t frameId)
{ : m_session(session), m_frameId(frameId)
return m_session->GetSessionMetadata().GetConfidenceNormalisationFactor(); , m_confidenceNormalisationFactor(session ? session->GetSessionMetadata().GetConfidenceNormalisationFactor() : 0.5f)
} {}
void ArFrame::Save() void ArFrame::Save()
{ {

6
openVulkanoCpp/AR/ArFrame.hpp
View File

@@ -107,14 +107,14 @@ namespace OpenVulkano::AR
std::shared_ptr<ArSession> m_session; std::shared_ptr<ArSession> m_session;
size_t m_frameId; size_t m_frameId;
Scene::Texture* m_texture = nullptr; Scene::Texture* m_texture = nullptr;
const float m_confidenceNormalisationFactor;
bool m_saved = false; bool m_saved = false;
bool m_highRes = false; bool m_highRes = false;
protected: protected:
ArFrameMetadata frameMetadata; ArFrameMetadata frameMetadata;
ArFrame(const std::shared_ptr<ArSession>& session, size_t frameId) : m_session(session), m_frameId(frameId) ArFrame(const std::shared_ptr<ArSession>& session, size_t frameId);
{}
public: public:
virtual ~ArFrame(); virtual ~ArFrame();
@@ -160,7 +160,7 @@ namespace OpenVulkano::AR
[[nodiscard]] virtual Math::Matrix4f GetCameraProjection(Math::Vector2f viewportSize, float near = 0.25f, float far = 250.0f) = 0; [[nodiscard]] virtual Math::Matrix4f GetCameraProjection(Math::Vector2f viewportSize, float near = 0.25f, float far = 250.0f) = 0;
[[nodiscard]] float GetConfidenceNormalisationFactor() const; [[nodiscard]] float GetConfidenceNormalisationFactor() const { return m_confidenceNormalisationFactor; }
[[nodiscard]] float GetColorTemperature() const { return frameMetadata.lightColorTemp; }; [[nodiscard]] float GetColorTemperature() const { return frameMetadata.lightColorTemp; };

1
openVulkanoCpp/AR/Provider/Playback/ArFramePlayback.cpp
View File

@@ -57,6 +57,7 @@ namespace OpenVulkano::AR::Playback
} }
colorImgData.channels = ColorImg::RGBA; // TODO test if defaulting to NV12 colorImgData.channels = ColorImg::RGBA; // TODO test if defaulting to NV12
colorImgData.Decode(Utils::ReadFile(imagePath)); colorImgData.Decode(Utils::ReadFile(imagePath));
SetColorImgInfo();
SetDepthImgInfo(dImage); SetDepthImgInfo(dImage);
SetSaved(); SetSaved();
} }

7
openVulkanoCpp/AR/Provider/Playback/ArPlaybackReader.hpp
View File

@@ -74,10 +74,15 @@ namespace OpenVulkano::AR::Playback
{ {
ColorImg img; ColorImg img;
img.channels = ColorImg::RGBA; // TODO test if defaulting to NV12 img.channels = ColorImg::RGBA; // TODO test if defaulting to NV12
ReadColorImage(img);
return img;
}
void ReadColorImage(ColorImg& img)
{
std::optional<std::pair<FileDescription, Array<char>>> file = ReadColorImageRaw(); std::optional<std::pair<FileDescription, Array<char>>> file = ReadColorImageRaw();
img.Decode(file->second); img.Decode(file->second);
m_imgReadSize += 1000 + file.value().first.size; m_imgReadSize += 1000 + file.value().first.size;
return img;
} }
std::optional<std::pair<FileDescription, Array<char>>> ReadColorImageRaw() { return m_archiveColor.GetNextFile(); } std::optional<std::pair<FileDescription, Array<char>>> ReadColorImageRaw() { return m_archiveColor.GetNextFile(); }