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
14 changes: 4 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
cmake_minimum_required(VERSION 4.0.0)

project(hd-mapping)
project(hd-mapping VERSION 0.105.0)

# Common settings
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Versioning settings
set(HDMAPPING_VERSION_MAJOR 0)
set(HDMAPPING_VERSION_MINOR 105)
set(HDMAPPING_VERSION_PATCH 0)

# Set up common paths
get_filename_component(REPOSITORY_DIRECTORY ${CMAKE_CURRENT_LIST_DIR} ABSOLUTE)
Expand All @@ -37,11 +33,6 @@ option(BUILD_WITH_BUNDLED_ONETBB "Build with bundled oneTBB" ON)
option(BUILD_WITH_PYBIND "Enable pybind11 bindings" OFF)
option(HDMAPPING_ASSERT_ALWAYS_ABORT "Make HDMAPPING_ASSERT() abort on failure even in release (NDEBUG) builds" OFF)

# Add definitions for all projects
add_definitions(-DHDMAPPING_VERSION_MAJOR=${HDMAPPING_VERSION_MAJOR})
add_definitions(-DHDMAPPING_VERSION_MINOR=${HDMAPPING_VERSION_MINOR})
add_definitions(-DHDMAPPING_VERSION_PATCH=${HDMAPPING_VERSION_PATCH})

add_definitions(-D_USE_MATH_DEFINES)

if (MSVC)
Expand Down Expand Up @@ -92,6 +83,9 @@ endif()
# set(CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# endif()

# Configure shared header
include(${REPOSITORY_DIRECTORY}/cmake/configure.cmake)

# Include cmake configs
include(cmake/cpu_optimizations.cmake)
include(cmake/disable_target_warnings.cmake)
Expand Down
4 changes: 2 additions & 2 deletions apps/camera_lidar_calibration/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "raymath.h"
#include "rlImGui.h"
#include <CalibCore/CameraCalibrationSolver.h>
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <RaylibWidgets/CompassRuler.h>
#include <RaylibWidgets/PointPicking.h>
#include <RaylibWidgets/WindowFit.h>
Expand Down Expand Up @@ -739,7 +739,7 @@ void App::run()
// rendered as flat-shaded point sprites (no polygon edges to smooth),
// so the visual benefit was marginal anyway.
SetConfigFlags(FLAG_WINDOW_RESIZABLE);
InitWindow(W, H, ("LiDAR-Camera Calibration " HDMAPPING_VERSION_STRING));
InitWindow(W, H, ("LiDAR-Camera Calibration " HDMAPPING_CONFIGURE_PROJECT_VERSION));
raylib_widgets::fitWindowToScreen();
// The 340px-wide side panel is fixed-width; below this the 3D/image
// views and the panel start overlapping instead of scrolling.
Expand Down
4 changes: 2 additions & 2 deletions apps/camera_lidar_intrinsics_calib/IntrinsicsCalib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "rlImGui.h"
#include <CalibCore/CliArgs.h>
#include <Core/pfd_wrapper.hpp>
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <RaylibWidgets/WindowFit.h>
#include <cstdio>
#include <opencv2/calib3d.hpp>
Expand Down Expand Up @@ -358,7 +358,7 @@ int main(int argc, char* argv[])
}

SetConfigFlags(FLAG_WINDOW_RESIZABLE | FLAG_MSAA_4X_HINT);
InitWindow(1280, 800, ("Intrinsics Calibration " HDMAPPING_VERSION_STRING));
InitWindow(1280, 800, ("Intrinsics Calibration " HDMAPPING_CONFIGURE_PROJECT_VERSION));
raylib_widgets::fitWindowToScreen();
// PANEL_W below (330) is fixed; below this the image view and panel
// start overlapping instead of scrolling.
Expand Down
9 changes: 5 additions & 4 deletions apps/camera_lidar_trajectory_viewer/TrajectoryViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
#include <CalibCore/Trajectory.h>
#include <Core/e57_utils.h>
#include <Core/pfd_wrapper.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <HDMapping/PoseInterpolation.h>
#include <HDMapping/Version.hpp>
#include <RaylibWidgets/CenterOfRotationWindow.h>
#include <RaylibWidgets/CompassRuler.h>
#include <RaylibWidgets/OrbitCamera.h>
Expand Down Expand Up @@ -1661,7 +1661,7 @@ static void exportE57(AppState& s)

mandeye::e57io::E57WriteScan scan;
scan.name = "colored_cloud";
scan.description = std::string("HDMapping ") + HDMAPPING_VERSION_STRING + " camera_lidar_trajectory_viewer";
scan.description = std::string("HDMapping ") + HDMAPPING_CONFIGURE_PROJECT_VERSION + " camera_lidar_trajectory_viewer";
scan.points = &pts;
scan.colors = &cols;
scan.intensities = &inten;
Expand All @@ -1685,7 +1685,8 @@ static void exportE57Session(AppState& s)
return;
}

const std::string description = std::string("HDMapping ") + HDMAPPING_VERSION_STRING + " camera_lidar_trajectory_viewer segment";
const std::string description =
std::string("HDMapping ") + HDMAPPING_CONFIGURE_PROJECT_VERSION + " camera_lidar_trajectory_viewer segment";

const size_t nSeg = s.exportSegments.size();
std::vector<std::vector<Eigen::Vector3d>> segPts(nSeg), segCols(nSeg);
Expand Down Expand Up @@ -2272,7 +2273,7 @@ int main(int argc, char* argv[])
strncpy(s.maskBuf, args.get("mask").c_str(), sizeof(s.maskBuf) - 1);

SetConfigFlags(FLAG_WINDOW_RESIZABLE | FLAG_MSAA_4X_HINT);
InitWindow(1400, 900, ("Trajectory Viewer " HDMAPPING_VERSION_STRING));
InitWindow(1400, 900, ("Trajectory Viewer " HDMAPPING_CONFIGURE_PROJECT_VERSION));
// raylib's default exit key (Esc) closes the window outright -- too easy
// to hit by accident. Disabled; there's no keyboard shortcut for quitting.
SetExitKey(KEY_NULL);
Expand Down
4 changes: 2 additions & 2 deletions apps/compare_trajectories/mandeye_compare_trajectories.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "../lidar_odometry_step_1/lidar_odometry_utils.h"
#include <filesystem>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

namespace fs = std::filesystem;

Expand Down Expand Up @@ -988,7 +988,7 @@ bool initGL(int* argc, char** argv)
glutInit(argc, argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
glutInitWindowSize(window_width, window_height);
glutCreateWindow("mandeye trajectory compare data viewer " HDMAPPING_VERSION_STRING);
glutCreateWindow("mandeye trajectory compare data viewer " HDMAPPING_CONFIGURE_PROJECT_VERSION);
glutDisplayFunc(display);
glutMotionFunc(motion);

Expand Down
4 changes: 2 additions & 2 deletions apps/hd_mapper/hd_mapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <Core/transformations.h>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

Eigen::Vector3d GLWidgetGetOGLPos(int x, int y, float picking_plane_height);

Expand Down Expand Up @@ -302,7 +302,7 @@ bool initGL(int* argc, char** argv)
glutInit(argc, argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
glutInitWindowSize(window_width, window_height);
glutCreateWindow("hd_mapper " HDMAPPING_VERSION_STRING);
glutCreateWindow("hd_mapper " HDMAPPING_CONFIGURE_PROJECT_VERSION);
glutDisplayFunc(display);
glutMotionFunc(motion);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <Core/utils.hpp>

#include "toml_io.h"
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <chrono>
#include <ctime>
#include <mutex>
Expand All @@ -39,7 +39,7 @@
// https://github.com/JanuszBedkowski/mandeye_controller The output is a session proving trajekctory and point clouds that can be further
// processed by "multi_view_tls_registration" program.

std::string winTitle = std::string("drag_folder_with_mandeye_data_and_drop_here-precision_forestry ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("drag_folder_with_mandeye_data_and_drop_here-precision_forestry ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = {
"This program is first step in MANDEYE process.",
Expand Down
2 changes: 1 addition & 1 deletion apps/lidar_odometry_step_1/lidar_odometry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ void save_result(std::vector<WorkerData>& worker_data, LidarOdometryParams& para
j["poses_file_name"] = path2.string();
j["initial_poses_file_name"] = path.string();
j["out_poses_file_name"] = path2.string();
j["lidar_odometry_version"] = HDMAPPING_VERSION_STRING;
j["lidar_odometry_version"] = HDMAPPING_CONFIGURE_PROJECT_VERSION;
j["length of trajectory[m]"] = params.total_length_of_calculated_trajectory;
j["elapsed time seconds"] = elapsed_time_s;
if (params.save_index_pose)
Expand Down
2 changes: 1 addition & 1 deletion apps/lidar_odometry_step_1/lidar_odometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "lidar_odometry_utils.h"
#include "toml_io.h"
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <laszip/laszip_api.h>
#include <nlohmann/json.hpp>

Expand Down
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 @@ -19,7 +19,7 @@
#include <Core/utils.hpp>

#include "toml_io.h"
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>
#include <chrono>
#include <ctime>
#include <mutex>
Expand All @@ -38,7 +38,7 @@
// https://github.com/JanuszBedkowski/mandeye_controller The output is a session proving trajekctory and point clouds that can be further
// processed by "multi_view_tls_registration" program.

std::string winTitle = std::string("Step 1 (Lidar odometry) ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Step 1 (Lidar odometry) ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = {
"This program is first step in MANDEYE process.",
Expand Down
4 changes: 2 additions & 2 deletions apps/lidar_odometry_step_1/lidar_odometry_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <nlohmann/json.hpp>
#include <vqf.hpp>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include <Core/ndt.h>
#include <Core/structures.h>
Expand All @@ -43,7 +43,7 @@ using NDTBucketMapType2 = ankerl::unordered_dense::map<uint64_t, NDT::Bucket2>;
// Helper function for getting software version from CMake macros
inline std::string get_software_version()
{
return HDMAPPING_VERSION_STRING;
return HDMAPPING_CONFIGURE_PROJECT_VERSION;
}

struct RawCloudLoader; // raw_cloud_loader.h: raw point clouds loaded per file during step 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "../lidar_odometry_step_1/lidar_odometry_utils.h"

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include <filesystem>
#include <mutex>
Expand Down Expand Up @@ -1225,7 +1225,7 @@ bool initGL(int* argc, char** argv)
glutInit(argc, argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE);
glutInitWindowSize(window_width, window_height);
glutCreateWindow("livox_mid_360_intrinsic_calibration " HDMAPPING_VERSION_STRING);
glutCreateWindow("livox_mid_360_intrinsic_calibration " HDMAPPING_CONFIGURE_PROJECT_VERSION);
glutDisplayFunc(display);
glutMotionFunc(motion);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <filesystem>
#include <sstream>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include <mutex>

Expand All @@ -37,7 +37,7 @@

///////////////////////////////////////////////////////////////////////////////////

std::string winTitle = std::string("MR calibration ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("MR calibration ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = { "This program is optional step in MANDEYE process",
"",
Expand Down
4 changes: 2 additions & 2 deletions apps/mandeye_raw_data_viewer/mandeye_raw_data_viewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <cmath>
#include <filesystem>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include "tbb/tbb.h"
#include <mutex>
Expand All @@ -43,7 +43,7 @@

///////////////////////////////////////////////////////////////////////////////////

std::string winTitle = std::string("Raw data viewer ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Raw data viewer ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = { "This program is optional step in MANDEYE process",
"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "../lidar_odometry_step_1/lidar_odometry_utils.h"
#include <filesystem>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include <mutex>

Expand All @@ -37,7 +37,7 @@

///////////////////////////////////////////////////////////////////////////////////

std::string winTitle = std::string("Single session viewer ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Single session viewer ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = { "This program is optional step in MANDEYE process",
"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#endif

#include <HDMapping/Assert.h>
#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#ifdef _WIN32
#include "resource.h"
Expand All @@ -46,7 +46,7 @@
#include "multi_session_factor_graph.h"
#include "raylib_utils.h"

std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = {
"This program is third/final step in MANDEYE process",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <portable-file-dialogs.h>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#ifdef _WIN32
#include "resource.h"
Expand All @@ -28,7 +28,7 @@

#include "multi_session_factor_graph.h"

std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = {
"This program is third/final step in MANDEYE process",
Expand Down
4 changes: 2 additions & 2 deletions apps/multi_session_registration/raylib_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <RaylibWidgets/RayPlaneD.h>
#include <RaylibWidgets/WindowFit.h>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#include <algorithm>
#include <filesystem>
Expand Down Expand Up @@ -450,7 +450,7 @@ void cor_window()

void info_window(const std::vector<std::string>& infoLines, const std::vector<ShortcutEntry>& appShortcuts)
{
raylib_widgets::ShowInfoWindow(info_gui, infoLines, appShortcuts, HDMAPPING_VERSION_STRING, __DATE__);
raylib_widgets::ShowInfoWindow(info_gui, infoLines, appShortcuts, HDMAPPING_CONFIGURE_PROJECT_VERSION, __DATE__);
}

void drawMiniCompassWithRuler()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include <portable-file-dialogs.h>

#include <HDMapping/Version.hpp>
#include <HDMapping/HDMAPPING_ConfigureInfo.hpp>

#ifdef _WIN32
#include "resource.h"
Expand All @@ -37,7 +37,7 @@

#include "multi_session_factor_graph.h"

std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_VERSION_STRING;
std::string winTitle = std::string("Step 3 (Multi session registration) ") + HDMAPPING_CONFIGURE_PROJECT_VERSION;

std::vector<std::string> infoLines = {
"This program is third/final step in MANDEYE process",
Expand Down
Loading
Loading