diff --git a/CMakeLists.txt b/CMakeLists.txt index d9a6f196..c246506d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25) +cmake_minimum_required(VERSION 3.22) #set(CMAKE_CXX_COMPILER "clang++") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsycl") @@ -310,4 +310,4 @@ else() target_compile_definitions(VulkanRenderer PRIVATE MULTISENSE_VIEWER_DEBUG) target_compile_definitions(ScriptLibrary PRIVATE MULTISENSE_VIEWER_DEBUG) target_compile_definitions(MultiSense-Viewer PRIVATE MULTISENSE_VIEWER_DEBUG) -endif() \ No newline at end of file +endif() diff --git a/docs/BUILD.md b/docs/BUILD.md index 94507797..b368d029 100644 --- a/docs/BUILD.md +++ b/docs/BUILD.md @@ -14,12 +14,16 @@ Install Dependencies: Open your terminal and type in ```sh -$ apt update -$ apt install build-essential cmake git libzstd-dev libsdl2-dev libgl1-mesa-glx libgl1-mesa-dev libvulkan1 libvulkan-dev libassimp-dev opencl-c-headers libfmt-dev libgtk-3-dev +$ sudo apt update +$ sudo apt install build-essential cmake git libzstd-dev libsdl2-dev libgl1-mesa-glx libgl1-mesa-dev libvulkan1 libvulkan-dev libassimp-dev opencl-c-headers libfmt-dev libgtk-3-dev -$ apt install pkg-config libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libtbb-dev libssl-dev +$ sudo apt install pkg-config libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libtbb-dev libssl-dev libwebp-dev libsystemd-dev +``` +Make sure you have a recent version of the Vulkan SDK installed. Note that some linux distributions provide this natively. For example, on Ubuntu 22.04, you can simply run +```sh +$ sudo apt install libvulkan-dev ``` -To get the latest vulkan SDK for Ubuntu 20.04. use the following (Copied from https://vulkan.lunarg.com/sdk/home#linux): +You can also get the vulkan SDK from the Vulkan homepage (https://vulkan.lunarg.com/sdk/home#linux). For example, here are instructions for installing version 1.3.215 of the Vulkan SDK under Ubuntu 20.04, copied directly from that page: ```sh $ sudo apt install wget $ wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - @@ -27,7 +31,7 @@ $ sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-1.3.216-focal.list https:/ $ sudo apt update $ sudo apt install vulkan-sdk ``` -Clone the git repo and build the MultiSense Viewer +Clone the git repo and build the MultiSense Viewer. ```sh $ git clone --recurse-submodule https://github.com/carnegierobotics/multisense_viewer $ cd MultiSense-Viewer @@ -35,6 +39,12 @@ $ mkdir build && cd build $ cmake .. $ make -j12 # j-parallell jobs (Same number as cores on your cpu for faster compile) ``` +Note that for some Ubuntu versions, you may need to allow some warnings in order to achieve a successful build. +```sh +$ git clone --recurse-submodule https://github.com/carnegierobotics/multisense_viewer +$ cmake -DWARNINGS_AS_ERRORS=FALSE .. +$ make -j12 +``` In your build folder there is a executable called Multisense-viewer. Launch this to start the application. To be able to use the auto connect feature, launch with root/admin privileges. diff --git a/include/Viewer/ImGui/SideBarLayer.h b/include/Viewer/ImGui/SideBarLayer.h index bd3daf16..315f10f5 100644 --- a/include/Viewer/ImGui/SideBarLayer.h +++ b/include/Viewer/ImGui/SideBarLayer.h @@ -922,7 +922,7 @@ class SideBarLayer : public VkRender::Layer { for (size_t n = 0; n < entryConnectDeviceList.size(); n++) { if (entryConnectDeviceList[n].cameraName.empty()) continue; if (ImGui::Selectable((entryConnectDeviceList[n].cameraName + "##" + std::to_string(n)).c_str(), - resultsComboIndex == n, + resultsComboIndex == static_cast(n), ImGuiSelectableFlags_DontClosePopups, ImVec2(handles->info->popupWidth - (20.0f * 2), 15.0f))) { handles->usageMonitor->userClickAction(entryConnectDeviceList[n].cameraName, "Selectable",