Revision d140fd71
| ID | d140fd71ddd19ef38a0124cbbea1165874a5474d |
Added Sensors class that abstracts away sensors from behaviors. Stops creating
duplicated sensors for each scout.
| scout/libscout/src/BehaviorList.cpp | ||
|---|---|---|
| 1 | 1 |
#include "BehaviorList.h" |
| 2 | 2 |
|
| 3 |
BehaviorList::BehaviorList(std::string scoutname) |
|
| 3 |
|
|
| 4 |
BehaviorList::BehaviorList(std::string scoutname, Sensors * sensor) |
|
| 4 | 5 |
{
|
| 5 |
behavior_list.push_back((Behavior*)new draw_cw_circle(scoutname)); |
|
| 6 |
behavior_list.push_back((Behavior*)new draw_ccw_circle(scoutname)); |
|
| 7 |
behavior_list.push_back((Behavior*)new Odometry(scoutname)); |
|
| 8 |
behavior_list.push_back((Behavior*)new navigationMap(scoutname)); |
|
| 9 |
behavior_list.push_back((Behavior*)new Scheduler(scoutname)); |
|
| 10 |
behavior_list.push_back((Behavior*)new WH_Robot(scoutname)); |
|
| 11 |
behavior_list.push_back((Behavior*)new line_follow(scoutname)); |
|
| 12 |
behavior_list.push_back((Behavior*)new wl_test(scoutname)); |
|
| 6 |
behavior_list.push_back((Behavior*)new draw_cw_circle(scoutname,sensor));
|
|
| 7 |
behavior_list.push_back((Behavior*)new draw_ccw_circle(scoutname, sensor));
|
|
| 8 |
behavior_list.push_back((Behavior*)new Odometry(scoutname, sensor));
|
|
| 9 |
behavior_list.push_back((Behavior*)new navigationMap(scoutname, sensor));
|
|
| 10 |
behavior_list.push_back((Behavior*)new Scheduler(scoutname, sensor));
|
|
| 11 |
behavior_list.push_back((Behavior*)new WH_Robot(scoutname, sensor));
|
|
| 12 |
behavior_list.push_back((Behavior*)new line_follow(scoutname, sensor));
|
|
| 13 |
behavior_list.push_back((Behavior*)new wl_test(scoutname, sensor));
|
|
| 13 | 14 |
return; |
| 14 | 15 |
} |
| 15 | 16 |
|
Also available in: Unified diff