Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,4 @@ imgui.ini
/out/install/x64-Release
/out_old/install

/.gitmodules
1 change: 1 addition & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
[submodule "3rdparty/imgui"]
path = 3rdparty/imgui
url = https://github.com/ocornut/imgui.git
branch = docking
[submodule "3rdparty/ImGuizmo"]
path = 3rdparty/ImGuizmo
url = https://github.com/CedricGuillemet/ImGuizmo.git
Expand Down
50 changes: 50 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"variables": [
{
"name": "CMAKE_C_FLAGS",
"value": "/DWIN32 /D_WINDOWS",
"type": "STRING"
},
{
"name": "CMAKE_CXX_FLAGS",
"value": "/DWIN32 /D_WINDOWS /GR /EHsc /bigobj",
"type": "STRING"
}
]
},
{
"name": "x64-Release",
"generator": "Ninja",
"configurationType": "Release",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ],
"variables": [
{
"name": "CMAKE_C_FLAGS",
"value": "/DWIN32 /D_WINDOWS",
"type": "STRING"
},
{
"name": "CMAKE_CXX_FLAGS",
"value": "/DWIN32 /D_WINDOWS /GR /EHsc /bigobj",
"type": "STRING"
}
]
}
]
}
4 changes: 2 additions & 2 deletions apps/lidar_odometry_step_1/lidar_odometry_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ void save_results(bool info, double elapsed_seconds)

void project_gui()
{
if (ImGui::Begin("full_lidar_odometry_gui", &full_lidar_odometry_gui))
if (ImGui::Begin("Settings", &full_lidar_odometry_gui))
{
ImGui::Checkbox("simple_gui", &simple_gui);
if (ImGui::IsItemHovered())
Expand Down Expand Up @@ -2112,7 +2112,7 @@ void display()

ImGui::Text("Colors:");

ImGui::ColorEdit3("Background color", (float *)&params.clear_color, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Background", (float *)&params.clear_color, ImGuiColorEditFlags_NoInputs);

bg_color = params.clear_color;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -853,16 +853,16 @@ void display()
ImGui::Separator();
ImGui::Text("Colors:");

ImGui::ColorEdit3("Background color", (float*)&bg_color, 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("Cloud 1 color", (float*)&pc_color, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Cloud 2 color", (float*)&pc_color2, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Point cloud 1", (float*)&pc_color, ImGuiColorEditFlags_NoInputs);
ImGui::ColorEdit3("Point cloud 2", (float*)&pc_color2, ImGuiColorEditFlags_NoInputs);
}

ImGui::EndMenu();
Expand Down
Loading