Skip to content

Commit 072b2b1

Browse files
committed
merge pull request ros#3 from YoheiKakiuchi/add_sensor_base: add SensorBase as base class for sensors
2 parents edf26f4 + a0d227e commit 072b2b1

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

urdf_model/include/urdf_model/model.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,6 @@ class ModelInterface
198198
LinkSharedPtr root_link_;
199199

200200

201-
202201
};
203202

204203
}

urdf_sensor/include/urdf_sensor/sensor.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,18 @@
7272

7373
namespace urdf{
7474

75-
class VisualSensor
75+
class SensorBase {
76+
public:
77+
enum {VISUAL, FORCE, TACTILE, IMU, GYRO, ACCELERATION, GPS} sensor_type;
78+
virtual ~SensorBase(void)
79+
{
80+
}
81+
};
82+
83+
class VisualSensor : public SensorBase
7684
{
7785
public:
78-
enum {CAMERA, RAY} type;
86+
enum {CAMERA, RAY, DEPTH} type;
7987
virtual ~VisualSensor(void)
8088
{
8189
}
@@ -148,8 +156,7 @@ class Sensor
148156
Pose origin;
149157

150158
/// sensor
151-
VisualSensorSharedPtr sensor;
152-
159+
SensorBaseSharedPtr sensor;
153160

154161
/// Parent link element name. A pointer is stored in parent_link_.
155162
std::string parent_link_name;

urdf_sensor/include/urdf_sensor/types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242

4343
namespace urdf{
4444

45-
class VisualSensor;
45+
class SensorBase;
4646

4747
// typedef shared pointers
48-
typedef boost::shared_ptr<VisualSensor> VisualSensorSharedPtr;
48+
typedef boost::shared_ptr<SensorBase> SensorBaseSharedPtr;
4949

5050
}
5151

0 commit comments

Comments
 (0)