Skip to content

Commit 475d08d

Browse files
Revert "Merge branch 'main' into tiziano/bonxai_minimal"
This reverts commit da104ce, reversing changes made to 9b84286.
1 parent 920fb8f commit 475d08d

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

cpp/kinematic_icp/pipeline/KinematicICP.hpp

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ class KinematicICP {
7575
config.use_adaptive_threshold,
7676
config.fixed_threshold),
7777
config_(config),
78-
local_map_(config.voxel_size, config.max_range, config.max_points_per_voxel) {}
78+
local_map_(config.voxel_size, config.max_range, config.max_points_per_voxel),
79+
preprocessor_(config.max_range, config.min_range, config.deskew, config.max_num_threads) {
80+
}
7981

8082
Vector3dVectorTuple RegisterFrame(const std::vector<Eigen::Vector3d> &frame,
8183
const std::vector<double> &timestamps,
@@ -98,21 +100,13 @@ class KinematicICP {
98100

99101
protected:
100102
Sophus::SE3d last_pose_;
101-
// Kinematic module
103+
// Kinematic Modules
102104
KinematicRegistration registration_;
103105
CorrespondenceThreshold correspondence_threshold_;
104106
Config config_;
105-
<<<<<<< HEAD
106107
SparseVoxelGrid local_map_;
107-
=======
108-
<<<<<<< HEAD
109-
// KISS-ICP pipeline modules
108+
// Kiss Module
110109
kiss_icp::Preprocessor preprocessor_;
111-
kiss_icp::VoxelHashMap local_map_;
112-
=======
113-
SparseVoxelGrid local_map_;
114-
>>>>>>> 01188b4 (At least replicate the functionalities of kiss map, need to test and)
115-
>>>>>>> 7630bc5 (At least replicate the functionalities of kiss map, need to test and)
116110
};
117111

118112
} // namespace kinematic_icp::pipeline

0 commit comments

Comments
 (0)