From db5e406b33d311d7c0175aacbf1f4fe83d5edbd6 Mon Sep 17 00:00:00 2001 From: magnus Date: Thu, 14 Nov 2024 10:12:17 +0100 Subject: [PATCH] Disabled camera loading script Removed IMU GUI controls --- include/Viewer/ImGui/MainLayerExt/Preview3DExt.h | 5 +++-- include/Viewer/Scripts/MultiSenseRenderer/MultiSenseCamera.h | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/Viewer/ImGui/MainLayerExt/Preview3DExt.h b/include/Viewer/ImGui/MainLayerExt/Preview3DExt.h index d8c0792c..41be2ebc 100644 --- a/include/Viewer/ImGui/MainLayerExt/Preview3DExt.h +++ b/include/Viewer/ImGui/MainLayerExt/Preview3DExt.h @@ -49,8 +49,8 @@ class Preview3DExt : public VkRender::Layer { ImGui::PushStyleColor(ImGuiCol_HeaderHovered, VkRender::Colors::CRLRedHover); ImGui::PushStyleVar(ImGuiStyleVar_IndentSpacing, 10.0f); - createIMUHeader(handles, dev); - ImGui::Dummy(ImVec2()); + //createIMUHeader(handles, dev); + //ImGui::Dummy(ImVec2()); createPointCloudHeader(handles, dev); @@ -186,6 +186,7 @@ class Preview3DExt : public VkRender::Layer { ImGui::BeginDisabled(); } + // IMU ImGui::Dummy(ImVec2(0.0f, 15.0)); ImGui::Dummy(ImVec2(pos.paddingX, 0.0)); diff --git a/include/Viewer/Scripts/MultiSenseRenderer/MultiSenseCamera.h b/include/Viewer/Scripts/MultiSenseRenderer/MultiSenseCamera.h index d9eef8a0..4d7c06d2 100644 --- a/include/Viewer/Scripts/MultiSenseRenderer/MultiSenseCamera.h +++ b/include/Viewer/Scripts/MultiSenseRenderer/MultiSenseCamera.h @@ -55,6 +55,7 @@ class MultiSenseCamera: public VkRender::Base, public VkRender::RegisteredInFact ~MultiSenseCamera()= default; void onDestroy() override{ + /* cancelLoadModels = true; // Wait for async models to finish loading before destorying script. // So we dont rush cleaning up vulkan resources for old window before this script finished loading @@ -63,6 +64,7 @@ class MultiSenseCamera: public VkRender::Base, public VkRender::RegisteredInFact S30.reset(); KS21.reset(); delete deviceCopy; + */ } /** @brief Static method to create class, returns a unique ptr of Terrain **/ @@ -85,7 +87,7 @@ class MultiSenseCamera: public VkRender::Base, public VkRender::RegisteredInFact /** @brief public string to determine if this script should be attaced to an object, * create a new object or do nothing. Types: Render | None | Name of object in object folder **/ - VkRender::ScriptTypeFlags type = VkRender::CRL_SCRIPT_TYPE_DEFAULT; + VkRender::ScriptTypeFlags type = VkRender::CRL_SCRIPT_TYPE_DISABLED; VkRender::CRL_SCRIPT_DRAW_METHOD drawMethod = VkRender::CRL_SCRIPT_DONT_DRAW; std::unique_ptr S27; std::unique_ptr S30;