diff --git a/_Update.bat b/_Update.bat new file mode 100644 index 00000000..02b9e337 --- /dev/null +++ b/_Update.bat @@ -0,0 +1,3 @@ +git pull --recurse-submodules +git submodule update --init --recursive +pause \ No newline at end of file diff --git a/apps/lidar_odometry_step_1/resource.rc b/apps/lidar_odometry_step_1/resource.rc index accd06be..3bad5857 100644 --- a/apps/lidar_odometry_step_1/resource.rc +++ b/apps/lidar_odometry_step_1/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 0, 9, 7 -PRODUCTVERSION 0, 0, 9, 7 +FILEVERSION 0, 0, 100, 1 +PRODUCTVERSION 0, 0, 100, 1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BLOCK "040904B0" BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping Step 1\0" -VALUE "FileVersion", "0.9.7\0" +VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Odometry\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "lidar_odometry_step_1.exe\0" -VALUE "ProductVersion", "0.9.7\0" +VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END diff --git a/apps/mandeye_mission_recorder_calibration/mandeye_mission_recorder_calibration.cpp b/apps/mandeye_mission_recorder_calibration/mandeye_mission_recorder_calibration.cpp index 8d5869c7..e9e05e6f 100644 --- a/apps/mandeye_mission_recorder_calibration/mandeye_mission_recorder_calibration.cpp +++ b/apps/mandeye_mission_recorder_calibration/mandeye_mission_recorder_calibration.cpp @@ -808,18 +808,21 @@ void display() ImGui::MenuItem("Lock Z", "Shift + Z", &lock_z, !is_ortho); ImGui::Separator(); - ImGui::Text("Colors:"); - - ImGui::ColorEdit3("Background", (float*)&bg_color, ImGuiColorEditFlags_NoInputs); - if (idToSn.size() == 2) + if (ImGui::BeginMenu("Colors")) { - ImGui::ColorEdit3(idToSn.at(0).c_str(), (float*)&pc_color, ImGuiColorEditFlags_NoInputs); - ImGui::ColorEdit3(idToSn.at(1).c_str(), (float*)&pc_color2, ImGuiColorEditFlags_NoInputs); - } - else - { - ImGui::ColorEdit3("Point cloud 1", (float*)&pc_color, ImGuiColorEditFlags_NoInputs); - ImGui::ColorEdit3("Point cloud 2", (float*)&pc_color2, ImGuiColorEditFlags_NoInputs); + ImGui::ColorEdit3("Background", (float*)&bg_color, ImGuiColorEditFlags_NoInputs); + if (idToSn.size() == 2) + { + ImGui::ColorEdit3(idToSn.at(0).c_str(), (float*)&pc_color, ImGuiColorEditFlags_NoInputs); + ImGui::ColorEdit3(idToSn.at(1).c_str(), (float*)&pc_color2, ImGuiColorEditFlags_NoInputs); + } + else + { + ImGui::ColorEdit3("Point cloud 1", (float*)&pc_color, ImGuiColorEditFlags_NoInputs); + ImGui::ColorEdit3("Point cloud 2", (float*)&pc_color2, ImGuiColorEditFlags_NoInputs); + } + + ImGui::EndMenu(); } ImGui::EndMenu(); diff --git a/apps/mandeye_mission_recorder_calibration/resource.rc b/apps/mandeye_mission_recorder_calibration/resource.rc index f4a78bff..16006d48 100644 --- a/apps/mandeye_mission_recorder_calibration/resource.rc +++ b/apps/mandeye_mission_recorder_calibration/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,9,7 - PRODUCTVERSION 0,0,9,7 + FILEVERSION 0,0,100,1 + PRODUCTVERSION 0,0,100,1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BEGIN BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping MR Calibration\0" - VALUE "FileVersion", "0.9.7\0" + VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Mission Recorder Calibration\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "mandeye_mission_recorder_calibration.exe\0" - VALUE "ProductVersion", "0.9.7\0" + VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END diff --git a/apps/mandeye_raw_data_viewer/resource.rc b/apps/mandeye_raw_data_viewer/resource.rc index 9e27a586..fcf8049b 100644 --- a/apps/mandeye_raw_data_viewer/resource.rc +++ b/apps/mandeye_raw_data_viewer/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,9,7 - PRODUCTVERSION 0,0,9,7 + FILEVERSION 0,0,100,1 + PRODUCTVERSION 0,0,100,1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BEGIN BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping Raw Data Viewer\0" - VALUE "FileVersion", "0.9.7\0" + VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Raw data viewer\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "mandeye_raw_data_viewer.exe\0" - VALUE "ProductVersion", "0.9.7\0" + VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END diff --git a/apps/mandeye_single_session_viewer/resource.rc b/apps/mandeye_single_session_viewer/resource.rc index 51d5aa89..16a52b74 100644 --- a/apps/mandeye_single_session_viewer/resource.rc +++ b/apps/mandeye_single_session_viewer/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,9,7 - PRODUCTVERSION 0,0,9,7 + FILEVERSION 0,0,100,1 + PRODUCTVERSION 0,0,100,1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BEGIN BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping Session Viewer\0" - VALUE "FileVersion", "0.9.7\0" + VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Single session viewer\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "mandeye_single_session_viewer.exe\0" - VALUE "ProductVersion", "0.9.7\0" + VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END diff --git a/apps/multi_session_registration/resource.rc b/apps/multi_session_registration/resource.rc index c7f59bd8..e8821486 100644 --- a/apps/multi_session_registration/resource.rc +++ b/apps/multi_session_registration/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 0, 9, 7 -PRODUCTVERSION 0, 0, 9, 7 +FILEVERSION 0, 0, 100, 1 +PRODUCTVERSION 0, 0, 100, 1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BLOCK "040904B0" BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping Step 3\0" -VALUE "FileVersion", "0.9.7\0" +VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Multi session registration\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "multi_session_registration_step_3.exe\0" -VALUE "ProductVersion", "0.9.7\0" +VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END diff --git a/apps/multi_view_tls_registration/multi_view_tls_registration_gui.cpp b/apps/multi_view_tls_registration/multi_view_tls_registration_gui.cpp index d077b0f4..02a9d4ce 100644 --- a/apps/multi_view_tls_registration/multi_view_tls_registration_gui.cpp +++ b/apps/multi_view_tls_registration/multi_view_tls_registration_gui.cpp @@ -114,7 +114,7 @@ static const std::vector appShortcuts = { { "Normal keys", "A", " { "", "Ctrl+S", "Save session" }, { "", "Ctrl+Shift+S", "Save subsession" }, { "", "T", "" }, - { "", "Ctrl+T", "" }, + { "", "Ctrl+T", "Solid cloud color" }, { "", "U", "" }, { "", "Ctrl+U", "" }, { "", "V", "" }, @@ -2670,6 +2670,37 @@ void display() io.AddKeyEvent(ImGuiMod_Ctrl, false); } + if (io.KeyCtrl && ImGui::IsKeyPressed(ImGuiKey_T)) // solid colors + { + csPointCloud = CS_SOLID; + + float color[3]; + if (session_loaded) + { + color[0] = session.point_clouds_container.point_clouds[0].render_color[0]; + color[1] = session.point_clouds_container.point_clouds[0].render_color[1]; + color[2] = session.point_clouds_container.point_clouds[0].render_color[2]; + } + + for (auto& pc : session.point_clouds_container.point_clouds) + { + pc.render_color[0] = color[0]; + pc.render_color[1] = color[1]; + pc.render_color[2] = color[2]; + + if (csTrajectory == CS_FOLLOW) + { + pc.traj_color[0] = pc.render_color[0]; + pc.traj_color[1] = pc.render_color[1]; + pc.traj_color[2] = pc.render_color[2]; + } + } + + // workaround + io.AddKeyEvent(ImGuiKey_T, false); + io.AddKeyEvent(ImGuiMod_Ctrl, false); + } + if (ImGui::BeginMainMenuBar()) { if (!session_loaded) diff --git a/apps/multi_view_tls_registration/resource.rc b/apps/multi_view_tls_registration/resource.rc index da63eab9..77dce10d 100644 --- a/apps/multi_view_tls_registration/resource.rc +++ b/apps/multi_view_tls_registration/resource.rc @@ -20,8 +20,8 @@ IDI_ICON1 ICON "icon.ico" // VS_VERSION_INFO VERSIONINFO -FILEVERSION 0, 0, 9, 7 -PRODUCTVERSION 0, 0, 9, 7 +FILEVERSION 0, 0, 100, 1 +PRODUCTVERSION 0, 0, 100, 1 FILEFLAGSMASK 0x3fL FILEOS 0x40004 FILETYPE 0x1 @@ -32,11 +32,11 @@ BLOCK "040904B0" BEGIN VALUE "CompanyName", "Mandeye\0" VALUE "FileDescription", "HDMapping Step 2\0" -VALUE "FileVersion", "0.9.7\0" +VALUE "FileVersion", "0.100.1\0" VALUE "InternalName", "Multi view TLS registration\0" VALUE "LegalCopyright", "(c) 2026 github.com/MapsHD/HDMapping\0" VALUE "OriginalFilename", "multi_view_tls_registration_step_2.exe\0" -VALUE "ProductVersion", "0.9.7\0" +VALUE "ProductVersion", "0.100.1\0" VALUE "ProgramID", "github.com/MapsHD/HDMapping\0" VALUE "ProductName", "HDMapping\0" END