Revision f09d002e
| ID | f09d002e49f709a5570f26d99d61ed92580b17a7 |
behaviors now overwrite teleop (see comments in scout.cpp for details)
| scout/scoutsim/src/sim_frame.cpp | ||
|---|---|---|
| 549 | 549 |
|
| 550 | 550 |
void SimFrame::updateScouts() |
| 551 | 551 |
{
|
| 552 |
std::string teleop_out = ""; |
|
| 553 | 552 |
|
| 554 | 553 |
if (last_scout_update.isZero()) |
| 555 | 554 |
{
|
| ... | ... | |
| 570 | 569 |
for (; it != end; ++it) |
| 571 | 570 |
{
|
| 572 | 571 |
|
| 573 |
//default to scout1 |
|
| 574 |
if (teleop_type != TELEOP_OFF) |
|
| 575 |
{
|
|
| 576 |
teleop_out = teleop_scoutname; |
|
| 577 |
} |
|
| 578 |
|
|
| 579 | 572 |
it->second->update(SIM_TIME_REFRESH_RATE, |
| 580 | 573 |
path_dc, sonar_dc, |
| 581 | 574 |
path_image, lines_image, walls_image, |
| 582 | 575 |
path_dc.GetBackground().GetColour(), |
| 583 | 576 |
sonar_dc.GetBackground().GetColour(), |
| 584 |
state,teleop_out);
|
|
| 577 |
state); |
|
| 585 | 578 |
} |
| 586 | 579 |
|
| 587 | 580 |
for (unsigned int i = 0; i < ghost_scouts.size(); ++i) |
Also available in: Unified diff