Skip to content

Commit 524812c

Browse files
cassinajcassinaj
committed
dbot/common/ -> dbot/
1 parent e8590c5 commit 524812c

File tree

65 files changed

+59
-117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+59
-117
lines changed

‎CMakeLists.txt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set(dbot_LIBRARY ${PROJECT_NAME})
3636
set(dbot_LIBRARY_GPU ${dbot_LIBRARY}_gpu)
3737

3838
# parent scope variables; exported at the end
39-
set(dbot_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/src)
39+
set(dbot_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/source)
4040
set(dbot_LIBRARIES ${dbot_LIBRARY})
4141

4242
############################
@@ -121,7 +121,6 @@ if(catkin_FOUND)
121121
message(STATUS "Using catkin")
122122
catkin_package(
123123
INCLUDE_DIRS
124-
src
125124
${dbot_INCLUDE_DIRS}
126125
LIBRARIES
127126
${dbot_LIBRARIES}
@@ -144,25 +143,25 @@ endif(catkin_FOUND)
144143
############################
145144
include_directories(${dbot_INCLUDE_DIRS})
146145

147-
set(dbot_SOURCE_DIR src/${PROJECT_NAME})
146+
set(dbot_SOURCE_DIR source/${PROJECT_NAME})
148147

149148
file(GLOB_RECURSE dbot_HEADERS
150149
${dbot_SOURCE_DIR}/*.hpp
151150
${dbot_SOURCE_DIR}/*.h)
152151

153152
# Build dbot library
154153
set(dbot_SOURCES
155-
${dbot_SOURCE_DIR}/common/camera_data.cpp
156-
${dbot_SOURCE_DIR}/common/object_model.cpp
157-
${dbot_SOURCE_DIR}/common/object_file_reader.cpp
158-
${dbot_SOURCE_DIR}/common/rigid_body_renderer.cpp
159-
${dbot_SOURCE_DIR}/common/object_resource_identifier.cpp
160-
${dbot_SOURCE_DIR}/common/simple_camera_data_provider.cpp
161-
${dbot_SOURCE_DIR}/common/virtual_camera_data_provider.cpp
162-
${dbot_SOURCE_DIR}/common/simple_wavefront_object_loader.cpp
163-
${dbot_SOURCE_DIR}/common/simple_shader_provider.cpp
164-
${dbot_SOURCE_DIR}/common/default_shader_provider.cpp
165-
${dbot_SOURCE_DIR}/common/file_shader_provider.cpp
154+
${dbot_SOURCE_DIR}/camera_data.cpp
155+
${dbot_SOURCE_DIR}/object_model.cpp
156+
${dbot_SOURCE_DIR}/object_file_reader.cpp
157+
${dbot_SOURCE_DIR}/rigid_body_renderer.cpp
158+
${dbot_SOURCE_DIR}/object_resource_identifier.cpp
159+
${dbot_SOURCE_DIR}/simple_camera_data_provider.cpp
160+
${dbot_SOURCE_DIR}/virtual_camera_data_provider.cpp
161+
${dbot_SOURCE_DIR}/simple_wavefront_object_loader.cpp
162+
${dbot_SOURCE_DIR}/simple_shader_provider.cpp
163+
${dbot_SOURCE_DIR}/default_shader_provider.cpp
164+
${dbot_SOURCE_DIR}/file_shader_provider.cpp
166165
${dbot_SOURCE_DIR}/tracker/object_tracker.cpp
167166
${dbot_SOURCE_DIR}/tracker/rbc_particle_filter_object_tracker.cpp
168167
${dbot_SOURCE_DIR}/tracker/rms_gaussian_filter_object_tracker.cpp

‎src/dbot/builder/object_transition_model_builder.hpp renamed to ‎source/dbot/builder/object_transition_model_builder.hpp

File renamed without changes.

‎src/dbot/builder/rb_observation_model_builder.cpp renamed to ‎source/dbot/builder/rb_observation_model_builder.cpp

File renamed without changes.

‎src/dbot/builder/rb_observation_model_builder.h renamed to ‎source/dbot/builder/rb_observation_model_builder.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
#include <ros/ros.h>
3737
#include <ros/package.h>
3838

39-
#include <dbot/common/camera_data.hpp>
40-
#include <dbot/common/object_model.hpp>
41-
#include <dbot/common/file_shader_provider.hpp>
42-
#include <dbot/common/default_shader_provider.hpp>
43-
#include <dbot/common/rigid_body_renderer.hpp>
39+
#include <dbot/camera_data.hpp>
40+
#include <dbot/object_model.hpp>
41+
#include <dbot/file_shader_provider.hpp>
42+
#include <dbot/default_shader_provider.hpp>
43+
#include <dbot/rigid_body_renderer.hpp>
4444
#include <dbot/model/rao_blackwell_observation_model.hpp>
4545
#include <dbot/model/kinect_image_model.hpp>
4646

‎src/dbot/builder/rb_observation_model_builder.hpp renamed to ‎source/dbot/builder/rb_observation_model_builder.hpp

File renamed without changes.

‎src/dbot/builder/rbc_particle_filter_tracker_builder.cpp renamed to ‎source/dbot/builder/rbc_particle_filter_tracker_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*/
2323

24-
#include <dbot/common/simple_wavefront_object_loader.hpp>
24+
#include <dbot/simple_wavefront_object_loader.hpp>
2525
#include <dbot/builder/rbc_particle_filter_tracker_builder.hpp>
2626

2727

‎src/dbot/builder/rbc_particle_filter_tracker_builder.hpp renamed to ‎source/dbot/builder/rbc_particle_filter_tracker_builder.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
#include <exception>
3333

34-
#include <dbot/common/object_model_loader.hpp>
35-
#include <dbot/common/object_resource_identifier.hpp>
34+
#include <dbot/object_model_loader.hpp>
35+
#include <dbot/object_resource_identifier.hpp>
3636
#include <dbot/tracker/rbc_particle_filter_object_tracker.hpp>
3737
#include <dbot/builder/object_transition_model_builder.hpp>
3838
#include <dbot/builder/rb_observation_model_builder.h>

‎src/dbot/builder/rms_gaussian_filter_tracker_builder.cpp renamed to ‎source/dbot/builder/rms_gaussian_filter_tracker_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*/
2323

24-
#include <dbot/common/simple_wavefront_object_loader.hpp>
24+
#include <dbot/simple_wavefront_object_loader.hpp>
2525
#include <dbot/builder/rms_gaussian_filter_tracker_builder.hpp>
2626

2727
namespace dbot

‎src/dbot/builder/rms_gaussian_filter_tracker_builder.hpp renamed to ‎source/dbot/builder/rms_gaussian_filter_tracker_builder.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
#include <exception>
3333

34-
#include <dbot/common/camera_data.hpp>
35-
#include <dbot/common/object_resource_identifier.hpp>
34+
#include <dbot/camera_data.hpp>
35+
#include <dbot/object_resource_identifier.hpp>
3636
#include <dbot/tracker/rms_gaussian_filter_object_tracker.hpp>
3737
#include <dbot/builder/object_transition_model_builder.hpp>
3838

‎src/dbot/builder/state_transition_function_builder.hpp renamed to ‎source/dbot/builder/state_transition_function_builder.hpp

File renamed without changes.

0 commit comments

Comments
 (0)