Revision 28999371
Little cleanups.
scout/scoutsim/src/ghost_scout.cpp | ||
---|---|---|
131 | 131 |
my_pose.y = pos.y; |
132 | 132 |
my_pose.theta = orient; |
133 | 133 |
|
134 |
ROS_INFO("Scout position %f %f %f", pos.x, pos.y, orient); |
|
134 |
//ROS_INFO("Scout position %f %f %f", pos.x, pos.y, orient);
|
|
135 | 135 |
|
136 | 136 |
return my_pose; |
137 | 137 |
} |
scout/scoutsim/src/ghost_scout.h | ||
---|---|---|
90 | 90 |
unsigned char g, |
91 | 91 |
unsigned char b); |
92 | 92 |
|
93 |
std::string name; |
|
94 |
|
|
95 | 93 |
wxBitmap *path_bitmap; |
96 | 94 |
|
97 | 95 |
ros::NodeHandle node; |
... | ... | |
102 | 100 |
Vector2 pos; |
103 | 101 |
float start_x, start_y; |
104 | 102 |
float orient; |
103 |
std::string name; |
|
105 | 104 |
|
106 | 105 |
ros::Subscriber position; |
107 | 106 |
|
scout/scoutsim/src/sim_frame.cpp | ||
---|---|---|
319 | 319 |
// Runs every SCOUTSIM_REFRESH_RATE. |
320 | 320 |
void SimFrame::onUpdate(wxTimerEvent& evt) |
321 | 321 |
{ |
322 |
cout << frame_count << endl; |
|
323 | 322 |
ros::spinOnce(); |
324 | 323 |
|
325 | 324 |
teleop(); |
Also available in: Unified diff