Skip to content

Commit

Permalink
Move proto files out of 2d/3d directories. (#1749)
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@wohe
wohe committed Sep 14, 2020
1 parent f2035b0 commit c541606
Show file tree
Hide file tree
Showing 39 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion cartographer/io/hybrid_grid_points_processor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cartographer/io/probability_grid_points_processor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions cartographer/mapping/2d/grid_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/2d/map_limits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/2d/probability_grid_range_data_inserter_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/2d/submap_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cartographer/mapping/2d/tsdf_range_data_inserter_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 changes: 1 addition & 1 deletion cartographer/mapping/2d/xy_index.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/3d/hybrid_grid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/3d/range_data_inserter_3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/3d/submap_3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/2d/local_trajectory_builder_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/2d/local_trajectory_builder_options_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/2d/normal_estimation_2d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions cartographer/mapping/internal/3d/local_trajectory_builder_3d.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/3d/local_trajectory_builder_3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/3d/local_trajectory_builder_options_3d.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/internal/3d/scan_matching/fast_correlative_scan_matcher_3d.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions cartographer/mapping/internal/constraints/constraint_builder_2d.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cartographer/mapping/internal/constraints/constraint_builder_3d.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 ...rapher/mapping/proto/2d/cell_limits.proto → ...rapher/mapping/proto/cell_limits_2d.proto
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions cartographer/mapping/proto/2d/grid_2d.proto → cartographer/mapping/proto/grid_2d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...er/mapping/proto/2d/grid_2d_options.proto → ...apher/mapping/proto/grid_2d_options.proto
View file
File renamed without changes.
0 ...rapher/mapping/proto/3d/hybrid_grid.proto → cartographer/mapping/proto/hybrid_grid.proto
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...local_trajectory_builder_options_2d.proto → ...local_trajectory_builder_options_2d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ...local_trajectory_builder_options_3d.proto → ...local_trajectory_builder_options_3d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...grapher/mapping/proto/2d/map_limits.proto → cartographer/mapping/proto/map_limits.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
0 ...oto/2d/normal_estimation_options_2d.proto → .../proto/normal_estimation_options_2d.proto
View file
File renamed without changes.
0 ...r/mapping/proto/2d/probability_grid.proto → ...pher/mapping/proto/probability_grid.proto
View file
File renamed without changes.
0 ...grid_range_data_inserter_options_2d.proto → ...grid_range_data_inserter_options_2d.proto
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions cartographer/mapping/proto/range_data_inserter_options.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
0 ...o/3d/range_data_inserter_options_3d.proto → ...roto/range_data_inserter_options_3d.proto
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions cartographer/mapping/proto/submap.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ...mapping/proto/2d/submaps_options_2d.proto → ...er/mapping/proto/submaps_options_2d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...mapping/proto/3d/submaps_options_3d.proto → ...er/mapping/proto/submaps_options_3d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions cartographer/mapping/proto/trajectory_builder_options.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
0 cartographer/mapping/proto/2d/tsdf_2d.proto → cartographer/mapping/proto/tsdf_2d.proto
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tsdf_range_data_inserter_options_2d.proto → ...tsdf_range_data_inserter_options_2d.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion cartographer/mapping/range_data_inserter_interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit c541606

Please sign in to comment.