12345qiupeng
/
cartographer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move proto files out of 2d/3d directories. (#1749) 

This is to make it possible to use the proto definitions
from Python where the directory structure otherwise
prevents them from being imported in the usual way.

Signed-off-by: Wolfgang Hess <whess@lyft.com>
master
Wolfgang Hess 2020-09-14 12:17:15 +02:00 committed by GitHub
parent f2035b0877
commit c5416068dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cartographer/io/hybrid_grid_points_processor.h
View File

@ -11,7 +11,7 @@
#include "cartographer/io/points_processor.h"
#include "cartographer/mapping/3d/hybrid_grid.h"
#include "cartographer/mapping/3d/range_data_inserter_3d.h"
#include "cartographer/mapping/proto/3d/range_data_inserter_options_3d.pb.h"
#include "cartographer/mapping/proto/range_data_inserter_options_3d.pb.h"
namespace cartographer {
namespace io {

2
cartographer/io/probability_grid_points_processor.h
View File

@ -25,7 +25,7 @@
#include "cartographer/io/points_processor.h"
#include "cartographer/mapping/2d/probability_grid.h"
#include "cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h"
#include "cartographer/mapping/proto/2d/probability_grid_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/proto/probability_grid_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/proto/trajectory.pb.h"
#include "cartographer/mapping/value_conversion_tables.h"

4
cartographer/mapping/2d/grid_2d.h
View File

@ -22,9 +22,9 @@
#include "cartographer/mapping/2d/map_limits.h"
#include "cartographer/mapping/grid_interface.h"
#include "cartographer/mapping/probability_values.h"
#include "cartographer/mapping/proto/2d/grid_2d.pb.h"
#include "cartographer/mapping/proto/2d/submaps_options_2d.pb.h"
#include "cartographer/mapping/proto/grid_2d.pb.h"
#include "cartographer/mapping/proto/submap_visualization.pb.h"
#include "cartographer/mapping/proto/submaps_options_2d.pb.h"
#include "cartographer/mapping/value_conversion_tables.h"
namespace cartographer {

2
cartographer/mapping/2d/map_limits.h
View File

@ -24,7 +24,7 @@
#include "Eigen/Geometry"
#include "cartographer/common/math.h"
#include "cartographer/mapping/2d/xy_index.h"
#include "cartographer/mapping/proto/2d/map_limits.pb.h"
#include "cartographer/mapping/proto/map_limits.pb.h"
#include "cartographer/mapping/trajectory_node.h"
#include "cartographer/sensor/point_cloud.h"
#include "cartographer/sensor/range_data.h"

2
cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h
View File

@ -24,7 +24,7 @@
#include "cartographer/common/port.h"
#include "cartographer/mapping/2d/probability_grid.h"
#include "cartographer/mapping/2d/xy_index.h"
#include "cartographer/mapping/proto/2d/probability_grid_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/proto/probability_grid_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/range_data_inserter_interface.h"
#include "cartographer/sensor/point_cloud.h"
#include "cartographer/sensor/range_data.h"

2
cartographer/mapping/2d/submap_2d.h
View File

@ -24,9 +24,9 @@
#include "cartographer/common/lua_parameter_dictionary.h"
#include "cartographer/mapping/2d/grid_2d.h"
#include "cartographer/mapping/2d/map_limits.h"
#include "cartographer/mapping/proto/2d/submaps_options_2d.pb.h"
#include "cartographer/mapping/proto/serialization.pb.h"
#include "cartographer/mapping/proto/submap_visualization.pb.h"
#include "cartographer/mapping/proto/submaps_options_2d.pb.h"
#include "cartographer/mapping/range_data_inserter_interface.h"
#include "cartographer/mapping/submaps.h"
#include "cartographer/mapping/trajectory_node.h"

4
cartographer/mapping/2d/tsdf_range_data_inserter_2d.h
View File

@ -19,7 +19,7 @@
#include "cartographer/common/lua_parameter_dictionary.h"
#include "cartographer/mapping/2d/tsdf_2d.h"
#include "cartographer/mapping/proto/2d/tsdf_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/proto/tsdf_range_data_inserter_options_2d.pb.h"
#include "cartographer/mapping/range_data_inserter_interface.h"
#include "cartographer/sensor/point_cloud.h"
#include "cartographer/sensor/range_data.h"
@ -57,4 +57,4 @@ class TSDFRangeDataInserter2D : public RangeDataInserterInterface {
} // namespace mapping
} // namespace cartographer
#endif // CARTOGRAPHER_MAPPING_2D_TSDF_RANGE_DATA_INSERTER_2D_H_
#endif // CARTOGRAPHER_MAPPING_2D_TSDF_RANGE_DATA_INSERTER_2D_H_

2
cartographer/mapping/2d/xy_index.h
View File

@ -25,7 +25,7 @@
#include "Eigen/Core"
#include "cartographer/common/math.h"
#include "cartographer/common/port.h"
#include "cartographer/mapping/proto/2d/cell_limits.pb.h"
#include "cartographer/mapping/proto/cell_limits_2d.pb.h"
#include "glog/logging.h"
namespace cartographer {

2
cartographer/mapping/3d/hybrid_grid.h
View File

@ -28,7 +28,7 @@
#include "cartographer/common/math.h"
#include "cartographer/common/port.h"
#include "cartographer/mapping/probability_values.h"
#include "cartographer/mapping/proto/3d/hybrid_grid.pb.h"
#include "cartographer/mapping/proto/hybrid_grid.pb.h"
#include "cartographer/transform/transform.h"
#include "glog/logging.h"

2
cartographer/mapping/3d/range_data_inserter_3d.h
View File

@ -18,7 +18,7 @@
#define CARTOGRAPHER_MAPPING_3D_RANGE_DATA_INSERTER_3D_H_
#include "cartographer/mapping/3d/hybrid_grid.h"
#include "cartographer/mapping/proto/3d/range_data_inserter_options_3d.pb.h"
#include "cartographer/mapping/proto/range_data_inserter_options_3d.pb.h"
#include "cartographer/sensor/point_cloud.h"
#include "cartographer/sensor/range_data.h"

2
cartographer/mapping/3d/submap_3d.h
View File

@ -26,9 +26,9 @@
#include "cartographer/mapping/3d/hybrid_grid.h"
#include "cartographer/mapping/3d/range_data_inserter_3d.h"
#include "cartographer/mapping/id.h"
#include "cartographer/mapping/proto/3d/submaps_options_3d.pb.h"
#include "cartographer/mapping/proto/serialization.pb.h"
#include "cartographer/mapping/proto/submap_visualization.pb.h"
#include "cartographer/mapping/proto/submaps_options_3d.pb.h"
#include "cartographer/mapping/submaps.h"
#include "cartographer/sensor/range_data.h"
#include "cartographer/transform/rigid_transform.h"

2
cartographer/mapping/internal/2d/local_trajectory_builder_2d.h
View File

@ -27,7 +27,7 @@
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/mapping/internal/range_data_collator.h"
#include "cartographer/mapping/pose_extrapolator.h"
#include "cartographer/mapping/proto/2d/local_trajectory_builder_options_2d.pb.h"
#include "cartographer/mapping/proto/local_trajectory_builder_options_2d.pb.h"
#include "cartographer/metrics/family_factory.h"
#include "cartographer/sensor/imu_data.h"
#include "cartographer/sensor/internal/voxel_filter.h"

2
cartographer/mapping/internal/2d/local_trajectory_builder_options_2d.h
View File

@ -18,7 +18,7 @@
#define CARTOGRAPHER_MAPPING_INTERNAL_2D_LOCAL_TRAJECTORY_BUILDER_OPTIONS_2D_H_
#include "cartographer/common/lua_parameter_dictionary.h"
#include "cartographer/mapping/proto/2d/local_trajectory_builder_options_2d.pb.h"
#include "cartographer/mapping/proto/local_trajectory_builder_options_2d.pb.h"
namespace cartographer {
namespace mapping {

2
cartographer/mapping/internal/2d/normal_estimation_2d.h
View File

@ -19,7 +19,7 @@
#include <vector>
#include "cartographer/mapping/proto/2d/normal_estimation_options_2d.pb.h"
#include "cartographer/mapping/proto/normal_estimation_options_2d.pb.h"
#include "cartographer/sensor/point_cloud.h"
#include "cartographer/sensor/range_data.h"
#include "cartographer/transform/transform.h"

8
cartographer/mapping/internal/3d/local_trajectory_builder_3d.cc
View File

@ -21,10 +21,10 @@
#include "absl/memory/memory.h"
#include "cartographer/common/time.h"
#include "cartographer/mapping/internal/3d/scan_matching/rotational_scan_matcher.h"
#include "cartographer/mapping/proto/3d/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/mapping/proto/3d/submaps_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching//ceres_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching//real_time_correlative_scan_matcher_options.pb.h"
#include "cartographer/mapping/proto/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching/ceres_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching/real_time_correlative_scan_matcher_options.pb.h"
#include "cartographer/mapping/proto/submaps_options_3d.pb.h"
#include "cartographer/transform/timestamped_transform.h"
#include "glog/logging.h"

2
cartographer/mapping/internal/3d/local_trajectory_builder_3d.h
View File

@ -27,7 +27,7 @@
#include "cartographer/mapping/internal/motion_filter.h"
#include "cartographer/mapping/internal/range_data_collator.h"
#include "cartographer/mapping/pose_extrapolator_interface.h"
#include "cartographer/mapping/proto/3d/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/mapping/proto/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/metrics/family_factory.h"
#include "cartographer/sensor/imu_data.h"
#include "cartographer/sensor/internal/voxel_filter.h"

2
cartographer/mapping/internal/3d/local_trajectory_builder_options_3d.h
View File

@ -18,7 +18,7 @@
#define CARTOGRAPHER_MAPPING_INTERNAL_3D_LOCAL_TRAJECTORY_BUILDER_OPTIONS_3D_H_
#include "cartographer/common/lua_parameter_dictionary.h"
#include "cartographer/mapping/proto/3d/local_trajectory_builder_options_3d.pb.h"
#include "cartographer/mapping/proto/local_trajectory_builder_options_3d.pb.h"
namespace cartographer {
namespace mapping {

2
cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d.cc
View File

@ -25,7 +25,7 @@
#include "absl/memory/memory.h"
#include "cartographer/common/math.h"
#include "cartographer/mapping/internal/3d/scan_matching/low_resolution_matcher.h"
#include "cartographer/mapping/proto/scan_matching//fast_correlative_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching/fast_correlative_scan_matcher_options_3d.pb.h"
#include "cartographer/transform/transform.h"
#include "glog/logging.h"

4
cartographer/mapping/internal/constraints/constraint_builder_2d.cc
View File

@ -29,8 +29,8 @@
#include "absl/memory/memory.h"
#include "cartographer/common/math.h"
#include "cartographer/common/thread_pool.h"
#include "cartographer/mapping/proto/scan_matching//ceres_scan_matcher_options_2d.pb.h"
#include "cartographer/mapping/proto/scan_matching//fast_correlative_scan_matcher_options_2d.pb.h"
#include "cartographer/mapping/proto/scan_matching/ceres_scan_matcher_options_2d.pb.h"
#include "cartographer/mapping/proto/scan_matching/fast_correlative_scan_matcher_options_2d.pb.h"
#include "cartographer/metrics/counter.h"
#include "cartographer/metrics/gauge.h"
#include "cartographer/metrics/histogram.h"

4
cartographer/mapping/internal/constraints/constraint_builder_3d.cc
View File

@ -29,8 +29,8 @@
#include "absl/memory/memory.h"
#include "cartographer/common/math.h"
#include "cartographer/common/thread_pool.h"
#include "cartographer/mapping/proto/scan_matching//ceres_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching//fast_correlative_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching/ceres_scan_matcher_options_3d.pb.h"
#include "cartographer/mapping/proto/scan_matching/fast_correlative_scan_matcher_options_3d.pb.h"
#include "cartographer/metrics/counter.h"
#include "cartographer/metrics/gauge.h"
#include "cartographer/metrics/histogram.h"

0
cartographer/mapping/proto/2d/cell_limits.proto → cartographer/mapping/proto/cell_limits_2d.proto
View File

6
cartographer/mapping/proto/2d/grid_2d.proto → cartographer/mapping/proto/grid_2d.proto
View File

@ -16,9 +16,9 @@ syntax = "proto3";
package cartographer.mapping.proto;
import "cartographer/mapping/proto/2d/map_limits.proto";
import "cartographer/mapping/proto/2d/probability_grid.proto";
import "cartographer/mapping/proto/2d/tsdf_2d.proto";
import "cartographer/mapping/proto/map_limits.proto";
import "cartographer/mapping/proto/probability_grid.proto";
import "cartographer/mapping/proto/tsdf_2d.proto";
message Grid2D {
message CellBox {

0
cartographer/mapping/proto/2d/grid_2d_options.proto → cartographer/mapping/proto/grid_2d_options.proto
View File

0
cartographer/mapping/proto/3d/hybrid_grid.proto → cartographer/mapping/proto/hybrid_grid.proto
View File

2
cartographer/mapping/proto/2d/local_trajectory_builder_options_2d.proto → cartographer/mapping/proto/local_trajectory_builder_options_2d.proto
View File

@ -19,9 +19,9 @@ package cartographer.mapping.proto;
import "cartographer/mapping/proto/motion_filter_options.proto";
import "cartographer/mapping/proto/pose_extrapolator_options.proto";
import "cartographer/sensor/proto/adaptive_voxel_filter_options.proto";
import "cartographer/mapping/proto/2d/submaps_options_2d.proto";
import "cartographer/mapping/proto/scan_matching/ceres_scan_matcher_options_2d.proto";
import "cartographer/mapping/proto/scan_matching/real_time_correlative_scan_matcher_options.proto";
import "cartographer/mapping/proto/submaps_options_2d.proto";
// NEXT ID: 22
message LocalTrajectoryBuilderOptions2D {

2
cartographer/mapping/proto/3d/local_trajectory_builder_options_3d.proto → cartographer/mapping/proto/local_trajectory_builder_options_3d.proto
View File

@ -16,11 +16,11 @@ syntax = "proto3";
package cartographer.mapping.proto;
import "cartographer/mapping/proto/3d/submaps_options_3d.proto";
import "cartographer/mapping/proto/motion_filter_options.proto";
import "cartographer/mapping/proto/pose_extrapolator_options.proto";
import "cartographer/mapping/proto/scan_matching/ceres_scan_matcher_options_3d.proto";
import "cartographer/mapping/proto/scan_matching/real_time_correlative_scan_matcher_options.proto";
import "cartographer/mapping/proto/submaps_options_3d.proto";
import "cartographer/sensor/proto/adaptive_voxel_filter_options.proto";
import "cartographer/sensor/proto/sensor.proto";
import "cartographer/transform/proto/timestamped_transform.proto";

2
cartographer/mapping/proto/2d/map_limits.proto → cartographer/mapping/proto/map_limits.proto
View File

@ -14,7 +14,7 @@
syntax = "proto3";
import "cartographer/mapping/proto/2d/cell_limits.proto";
import "cartographer/mapping/proto/cell_limits_2d.proto";
import "cartographer/transform/proto/transform.proto";
package cartographer.mapping.proto;

0
cartographer/mapping/proto/2d/normal_estimation_options_2d.proto → cartographer/mapping/proto/normal_estimation_options_2d.proto
View File

0
cartographer/mapping/proto/2d/probability_grid.proto → cartographer/mapping/proto/probability_grid.proto
View File

0
cartographer/mapping/proto/2d/probability_grid_range_data_inserter_options_2d.proto → cartographer/mapping/proto/probability_grid_range_data_inserter_options_2d.proto
View File

4
cartographer/mapping/proto/range_data_inserter_options.proto
View File

@ -14,8 +14,8 @@
syntax = "proto3";
import "cartographer/mapping/proto/2d/probability_grid_range_data_inserter_options_2d.proto";
import "cartographer/mapping/proto/2d/tsdf_range_data_inserter_options_2d.proto";
import "cartographer/mapping/proto/probability_grid_range_data_inserter_options_2d.proto";
import "cartographer/mapping/proto/tsdf_range_data_inserter_options_2d.proto";
package cartographer.mapping.proto;

0
cartographer/mapping/proto/3d/range_data_inserter_options_3d.proto → cartographer/mapping/proto/range_data_inserter_options_3d.proto
View File

4
cartographer/mapping/proto/submap.proto
View File

@ -16,8 +16,8 @@ syntax = "proto3";
package cartographer.mapping.proto;
import "cartographer/mapping/proto/2d/grid_2d.proto";
import "cartographer/mapping/proto/3d/hybrid_grid.proto";
import "cartographer/mapping/proto/grid_2d.proto";
import "cartographer/mapping/proto/hybrid_grid.proto";
import "cartographer/transform/proto/transform.proto";
// Serialized state of a Submap2D.

2
cartographer/mapping/proto/2d/submaps_options_2d.proto → cartographer/mapping/proto/submaps_options_2d.proto
View File

@ -14,7 +14,7 @@
syntax = "proto3";
import "cartographer/mapping/proto/2d/grid_2d_options.proto";
import "cartographer/mapping/proto/grid_2d_options.proto";
import "cartographer/mapping/proto/range_data_inserter_options.proto";
package cartographer.mapping.proto;

2
cartographer/mapping/proto/3d/submaps_options_3d.proto → cartographer/mapping/proto/submaps_options_3d.proto
View File

@ -14,7 +14,7 @@
syntax = "proto3";
import "cartographer/mapping/proto/3d/range_data_inserter_options_3d.proto";
import "cartographer/mapping/proto/range_data_inserter_options_3d.proto";
package cartographer.mapping.proto;

4
cartographer/mapping/proto/trajectory_builder_options.proto
View File

@ -15,8 +15,8 @@
syntax = "proto3";
import "cartographer/transform/proto/transform.proto";
import "cartographer/mapping/proto/2d/local_trajectory_builder_options_2d.proto";
import "cartographer/mapping/proto/3d/local_trajectory_builder_options_3d.proto";
import "cartographer/mapping/proto/local_trajectory_builder_options_2d.proto";
import "cartographer/mapping/proto/local_trajectory_builder_options_3d.proto";
package cartographer.mapping.proto;

0
cartographer/mapping/proto/2d/tsdf_2d.proto → cartographer/mapping/proto/tsdf_2d.proto
View File

2
cartographer/mapping/proto/2d/tsdf_range_data_inserter_options_2d.proto → cartographer/mapping/proto/tsdf_range_data_inserter_options_2d.proto
View File

@ -16,7 +16,7 @@ syntax = "proto3";
package cartographer.mapping.proto;
import "cartographer/mapping/proto/2d/normal_estimation_options_2d.proto";
import "cartographer/mapping/proto/normal_estimation_options_2d.proto";
message TSDFRangeDataInserterOptions2D {
// Distance to the surface within the signed distance function is evaluated.

2
cartographer/mapping/range_data_inserter_interface.h
View File

@ -21,7 +21,7 @@
#include <vector>
#include "cartographer/mapping/grid_interface.h"
#include "cartographer/mapping/proto/2d/submaps_options_2d.pb.h"
#include "cartographer/mapping/proto/submaps_options_2d.pb.h"
#include "cartographer/sensor/range_data.h"
namespace cartographer {